From 449ce129b860ddc302e1e5270d5819ebe5aa27bf Mon Sep 17 00:00:00 2001
From: diegotry <33488603+diegotry@users.noreply.github.com>
Date: Wed, 17 Mar 2021 18:36:13 -0700
Subject: [PATCH] fix(codedeploy): Use aws-cli instead of awscli for yum
 (#13655)

Package name for yum is not awscli. This causes the command to have a return code different than 0, which fails the user-data script.

This change addresses the issue: https://github.com/aws/aws-cdk/issues/13654


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts | 7 ++++++-
 .../test/server/integ.deployment-group.expected.json       | 2 +-
 .../aws-codedeploy/test/server/test.deployment-group.ts    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts
index 32a3ccb3e40d1..ce93f699537c7 100644
--- a/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts
+++ b/packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts
@@ -364,7 +364,12 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
           'if [ $RUBY2_INSTALL -ne 0 ]; then',
           '$PKG_CMD install -y ruby',
           'fi',
-          '$PKG_CMD install -y awscli',
+          'AWS_CLI_PACKAGE_NAME=awscli',
+          'if [[ "$PKG_CMD" = "yum" ]];',
+          'then',
+          'AWS_CLI_PACKAGE_NAME=aws-cli',
+          'fi',
+          '$PKG_CMD install -y $AWS_CLI_PACKAGE_NAME',
           'TMP_DIR=`mktemp -d`',
           'cd $TMP_DIR',
           `aws s3 cp s3://aws-codedeploy-${cdk.Stack.of(this).region}/latest/install . --region ${cdk.Stack.of(this).region}`,
diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json b/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json
index e50bc6ef02f2b..1f5d3d109128d 100644
--- a/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json
+++ b/packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json
@@ -659,7 +659,7 @@
             "Fn::Join": [
               "",
               [
-                "#!/bin/bash\nset +e\nPKG_CMD=`which yum 2>/dev/null`\nset -e\nif [ -z \"$PKG_CMD\" ]; then\nPKG_CMD=apt-get\nelse\nPKG=CMD=yum\nfi\n$PKG_CMD update -y\nset +e\n$PKG_CMD install -y ruby2.0\nRUBY2_INSTALL=$?\nset -e\nif [ $RUBY2_INSTALL -ne 0 ]; then\n$PKG_CMD install -y ruby\nfi\n$PKG_CMD install -y awscli\nTMP_DIR=`mktemp -d`\ncd $TMP_DIR\naws s3 cp s3://aws-codedeploy-",
+                "#!/bin/bash\nset +e\nPKG_CMD=`which yum 2>/dev/null`\nset -e\nif [ -z \"$PKG_CMD\" ]; then\nPKG_CMD=apt-get\nelse\nPKG=CMD=yum\nfi\n$PKG_CMD update -y\nset +e\n$PKG_CMD install -y ruby2.0\nRUBY2_INSTALL=$?\nset -e\nif [ $RUBY2_INSTALL -ne 0 ]; then\n$PKG_CMD install -y ruby\nfi\nAWS_CLI_PACKAGE_NAME=awscli\nif [[ \"$PKG_CMD\" = \"yum\" ]];\nthen\nAWS_CLI_PACKAGE_NAME=aws-cli\nfi\n$PKG_CMD install -y $AWS_CLI_PACKAGE_NAME\nTMP_DIR=`mktemp -d`\ncd $TMP_DIR\naws s3 cp s3://aws-codedeploy-",
                 {
                   "Ref": "AWS::Region"
                 },
diff --git a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts
index aebb3aa8a074f..8d2dbe44cd604 100644
--- a/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts
+++ b/packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts
@@ -62,7 +62,7 @@ export = {
             'Fn::Join': [
               '',
               [
-                '#!/bin/bash\nset +e\nPKG_CMD=`which yum 2>/dev/null`\nset -e\nif [ -z "$PKG_CMD" ]; then\nPKG_CMD=apt-get\nelse\nPKG=CMD=yum\nfi\n$PKG_CMD update -y\nset +e\n$PKG_CMD install -y ruby2.0\nRUBY2_INSTALL=$?\nset -e\nif [ $RUBY2_INSTALL -ne 0 ]; then\n$PKG_CMD install -y ruby\nfi\n$PKG_CMD install -y awscli\nTMP_DIR=`mktemp -d`\ncd $TMP_DIR\naws s3 cp s3://aws-codedeploy-',
+                '#!/bin/bash\nset +e\nPKG_CMD=`which yum 2>/dev/null`\nset -e\nif [ -z "$PKG_CMD" ]; then\nPKG_CMD=apt-get\nelse\nPKG=CMD=yum\nfi\n$PKG_CMD update -y\nset +e\n$PKG_CMD install -y ruby2.0\nRUBY2_INSTALL=$?\nset -e\nif [ $RUBY2_INSTALL -ne 0 ]; then\n$PKG_CMD install -y ruby\nfi\nAWS_CLI_PACKAGE_NAME=awscli\nif [[ "$PKG_CMD" = "yum" ]];\nthen\nAWS_CLI_PACKAGE_NAME=aws-cli\nfi\n$PKG_CMD install -y $AWS_CLI_PACKAGE_NAME\nTMP_DIR=`mktemp -d`\ncd $TMP_DIR\naws s3 cp s3://aws-codedeploy-',
                 {
                   'Ref': 'AWS::Region',
                 },