Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Ubuntu] Move AWS SAM CLI installation to the aws.sh script #3401

Merged
merged 1 commit into from
May 17, 2021
Merged

[Ubuntu] Move AWS SAM CLI installation to the aws.sh script #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions images/linux/scripts/installers/aws-sam-cli.sh
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion images/linux/scripts/installers/aws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
2 changes: 0 additions & 2 deletions images/linux/scripts/tests/CLI.Tools.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 0 additions & 4 deletions images/linux/toolsets/toolset-1804.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@
"package": "yamllint",
"cmd": "yamllint"
},
{
"package": "aws-sam-cli",
"cmd": "sam"
},
{
"package": "ansible-base",
"cmd": "ansible"
Expand Down
4 changes: 0 additions & 4 deletions images/linux/toolsets/toolset-2004.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@
"package": "yamllint",
"cmd": "yamllint"
},
{
"package": "aws-sam-cli",
"cmd": "sam"
},
{
"package": "ansible-base",
"cmd": "ansible"
Expand Down
10 changes: 0 additions & 10 deletions images/linux/ubuntu1604.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down