Skip to content

Commit 9420e2d

Browse files
diegotryElad Ben-Israel
authored andcommitted
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: #13654 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 9370bc9 commit 9420e2d

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,12 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
364364
'if [ $RUBY2_INSTALL -ne 0 ]; then',
365365
'$PKG_CMD install -y ruby',
366366
'fi',
367-
'$PKG_CMD install -y awscli',
367+
'AWS_CLI_PACKAGE_NAME=awscli',
368+
'if [[ "$PKG_CMD" = "yum" ]];',
369+
'then',
370+
'AWS_CLI_PACKAGE_NAME=aws-cli',
371+
'fi',
372+
'$PKG_CMD install -y $AWS_CLI_PACKAGE_NAME',
368373
'TMP_DIR=`mktemp -d`',
369374
'cd $TMP_DIR',
370375
`aws s3 cp s3://aws-codedeploy-${cdk.Stack.of(this).region}/latest/install . --region ${cdk.Stack.of(this).region}`,

packages/@aws-cdk/aws-codedeploy/test/server/integ.deployment-group.expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@
659659
"Fn::Join": [
660660
"",
661661
[
662-
"#!/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-",
662+
"#!/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-",
663663
{
664664
"Ref": "AWS::Region"
665665
},

packages/@aws-cdk/aws-codedeploy/test/server/test.deployment-group.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export = {
6262
'Fn::Join': [
6363
'',
6464
[
65-
'#!/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-',
65+
'#!/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-',
6666
{
6767
'Ref': 'AWS::Region',
6868
},

0 commit comments

Comments
 (0)