[ubuntu] Move aws-sam-cli installation to the aws.sh script (actions#…

…3401)
dmitry-shibanov · May 17, 2021 · 952ee3e · 952ee3e
1 parent c4b6ffb
commit 952ee3e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 49 deletions.
diff --git a/images/linux/scripts/installers/aws-sam-cli.sh b/images/linux/scripts/installers/aws-sam-cli.sh
diff --git a/images/linux/scripts/installers/aws.sh b/images/linux/scripts/installers/aws.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 ################################################################################
 ##  File:  aws.sh
-##  Desc:  Installs the AWS CLI
+##  Desc:  Installs the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI
 ################################################################################
 
 # Source the helpers for use with the script
@@ -24,4 +24,11 @@ fi
 download_with_retries "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb" "/tmp" "session-manager-plugin.deb"
 apt install /tmp/session-manager-plugin.deb
 
+# Download & install the latest aws sam cli release
+zipName="aws-sam-cli-linux-x86_64.zip"
+zipUrl="https://github.com/aws/aws-sam-cli/releases/latest/download/${zipName}"
+download_with_retries $zipUrl "/tmp" $zipName
+unzip /tmp/${zipName} -d /tmp
+/tmp/install
+
 invoke_tests "CLI.Tools" "AWS"
diff --git a/images/linux/scripts/tests/CLI.Tools.Tests.ps1 b/images/linux/scripts/tests/CLI.Tools.Tests.ps1
@@ -25,9 +25,7 @@ Describe "AWS" {
     It "Session Manager Plugin for the AWS CLI" {
         session-manager-plugin | Out-String | Should -Match "plugin was installed successfully"
     }
-}
 
-Describe "AWS SAM CLI" {
     It "AWS SAM CLI" {
         "sam --version" | Should -ReturnZeroExitCode
     }

diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
@@ -223,10 +223,6 @@
             "package": "yamllint",
             "cmd": "yamllint"
         },
-        {
-            "package": "aws-sam-cli",
-            "cmd": "sam"
-        },
         {
             "package": "ansible-base",
             "cmd": "ansible"

diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
@@ -223,10 +223,6 @@
             "package": "yamllint",
             "cmd": "yamllint"
         },
-        {
-            "package": "aws-sam-cli",
-            "cmd": "sam"
-        },
         {
             "package": "ansible-base",
             "cmd": "ansible"

diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
@@ -265,16 +265,6 @@
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
         },
-        {
-            "type": "shell",
-            "scripts": [
-                "{{template_dir}}/scripts/installers/aws-sam-cli.sh"
-            ],
-            "environment_vars": [
-                "HELPER_SCRIPTS={{user `helper_script_folder`}}"
-            ],
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
         {
             "type": "shell",
             "scripts": [