kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1049 from PaulBarrie/feature/aws/add-cli-v2

Browse Source 
Feature:  allow to use AWS CLI v2
This commit is contained in:
Sam Alba 2021-10-18 20:48:21 -07:00 committed by GitHub
commit aa491ae67c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 156 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
docs/reference/aws/README.md
View File

@ -12,16 +12,15 @@ import "alpha.dagger.io/aws"
## aws.#CLI ## aws.#CLI
Re-usable aws-cli component
### aws.#CLI Inputs ### aws.#CLI Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.region* | `string` |AWS region | |*config.region* | `string` |AWS region |
|*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode | |*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"1.18" \| string` |- |
### aws.#CLI Outputs ### aws.#CLI Outputs
@ -43,3 +42,39 @@ AWS Config shared by all AWS packages
### aws.#Config Outputs ### aws.#Config Outputs
_No output._ _No output._
## aws.#V1
Configuration specific to CLI v1
### aws.#V1 Inputs
| Name | Type | Description |
| ------------- |:-------------: |:-------------: |
|*config.region* | `string` |AWS region |
|*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"1.18" \| string` |- |
### aws.#V1 Outputs
_No output._
## aws.#V2
Configuration specific to CLI v2
### aws.#V2 Inputs
| Name | Type | Description |
| ------------- |:-------------: |:-------------: |
|*config.region* | `string` |AWS region |
|*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"2.1.27" \| string` |- |
### aws.#V2 Outputs
_No output._

21
docs/reference/aws/ecr.md
View File

@ -16,16 +16,17 @@ Convert ECR credentials to Docker Login format
### ecr.#Credentials Inputs ### ecr.#Credentials Inputs
| Name | Type | Description | | Name | Type | Description |
| ------------- |:-------------: |:-------------: | | ------------- |:-------------: |:-------------: |
|*config.region* | `string` |AWS region | |*config.region* | `string` |AWS region |
|*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode | |*config.localMode* | `*false \| bool` |AWS localstack mode |
|*ctr.image.config.region* | `string` |AWS region | |*ctr.image.config.region* | `string` |AWS region |
|*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key | |*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key |
|*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key | |*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key |
|*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode | |*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode |
|*ctr.image.version* | `*"1.18" \| string` |- |
### ecr.#Credentials Outputs ### ecr.#Credentials Outputs

138
stdlib/aws/aws.cue
View File

@ -2,6 +2,7 @@
package aws package aws
import ( import (
"regexp"
"alpha.dagger.io/dagger" "alpha.dagger.io/dagger"
"alpha.dagger.io/dagger/op" "alpha.dagger.io/dagger/op"
"alpha.dagger.io/alpine" "alpha.dagger.io/alpine"
@ -19,10 +20,11 @@ import (
localMode: dagger.#Input & {*false | bool} localMode: dagger.#Input & {*false | bool}
} }
// Re-usable aws-cli component // Configuration specific to CLI v1
#CLI: { #V1: {
config: #Config config: #Config
package: [string]: string | bool package: [string]: string | bool
version: dagger.#Input & {*"1.18" | string}
#up: [ #up: [
op.#Load & { op.#Load & {
@ -31,52 +33,116 @@ import (
"package": bash: "=~5.1" "package": bash: "=~5.1"
"package": jq: "=~1.6" "package": jq: "=~1.6"
"package": curl: true "package": curl: true
"package": "aws-cli": "=~1.18" "package": "aws-cli": "=~\( version )"
if config.localMode != false {
package: "py3-pip": true
}
}
},
]
}
// Configuration specific to CLI v2
#V2: {
config: #Config
package: [string]: string | bool
version: dagger.#Input & {*"2.1.27" | string}
#up: [
op.#Load & {
from: alpine.#Image & {
"package": package
"package": bash: "=~5.1"
"package": jq: "=~1.6"
"package": curl: true
"package": binutils: true
if config.localMode != false { if config.localMode != false {
package: "py3-pip": true package: "py3-pip": true
} }
} }
}, },
//https://stackoverflow.com/a/61268529
op.#Exec & { op.#Exec & {
args: [ env: AWS_CLI_VERSION: version
"/bin/bash", args: ["/bin/bash", "--noprofile", "--norc", "-eo", "pipefail", "-c",
"--noprofile", #"""
"--norc", curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub
"-eo", curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.31-r0/glibc-2.31-r0.apk
"pipefail", curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.31-r0/glibc-bin-2.31-r0.apk
"-c", curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.31-r0/glibc-i18n-2.31-r0.apk
if config.localMode == false { apk add --no-cache glibc-2.31-r0.apk glibc-bin-2.31-r0.apk glibc-i18n-2.31-r0.apk
/usr/glibc-compat/bin/localedef -i en_US -f UTF-8 en_US.UTF-8
curl -s https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip -o awscliv2.zip
unzip awscliv2.zip > /dev/null
./aws/install
rm -rf awscliv2.zip aws /usr/local/aws-cli/v2/*/dist/aws_completer /usr/local/aws-cli/v2/*/dist/awscli/data/ac.index \
usr/local/aws-cli/v2/*/dist/awscli/examples glibc-*.apk
"""#]
},
]
}
#CLI: {
config: #Config
package: [string]: string | bool
version: dagger.#Input & {*"1.18" | string}
_isV2: regexp.Match("^2.*$", version)
#up: [
op.#Load & {
if _isV2 == false {
from: #V1 & {
"config": config
"package": package
"version": version
}
}
if _isV2 == true {
from: #V2 & {
"config": config
"package": package
"version": version
}
}
},
op.#Exec & {
if config.localMode == false {
args: ["/bin/bash", "--noprofile", "--norc", "-eo", "pipefail", "-c",
#""" #"""
aws configure set aws_access_key_id "$(cat /run/secrets/access_key)" aws configure set aws_access_key_id "$(cat /run/secrets/access_key)"
aws configure set aws_secret_access_key "$(cat /run/secrets/secret_key)" aws configure set aws_secret_access_key "$(cat /run/secrets/secret_key)"
aws configure set default.region "$AWS_DEFAULT_REGION" aws configure set default.region "$AWS_DEFAULT_REGION"
aws configure set default.cli_pager "" aws configure set default.cli_pager ""
aws configure set default.output "json" aws configure set default.output "json"
"""# """#]
}, }
if config.localMode != false { if config.localMode == true {
args: [ "/bin/bash", "--noprofile", "--norc", "-eo", "pipefail", "-c",
#""" #"""
# Download awscli v3 and override aws # Download awscli v3 and override aws
pip install awscli-local==0.14 pip install awscli-local==0.14
mv /usr/bin/awslocal /usr/bin/aws mv /usr/bin/awslocal /usr/bin/aws
# Configure # Configure
mkdir -p ~/.aws/ mkdir -p ~/.aws/
# Set up ~/.aws/config # Set up ~/.aws/config
echo "[default]" > ~/.aws/config echo "[default]" > ~/.aws/config
echo "region = $AWS_DEFAULT_REGION" >> ~/.aws/config echo "region = $AWS_DEFAULT_REGION" >> ~/.aws/config
echo "cli_pager =" >> ~/.aws/config echo "cli_pager =" >> ~/.aws/config
echo "output = json" >> ~/.aws/config echo "output = json" >> ~/.aws/config
# Set up ~/.aws/credentials # Set up ~/.aws/credentials
echo "[default]" > ~/.aws/credentials echo "[default]" > ~/.aws/credentials
echo "aws_access_key_id = $(cat /run/secrets/access_key)" >> ~/.aws/credentials echo "aws_access_key_id = $(cat /run/secrets/access_key)" >> ~/.aws/credentials
echo "aws_secret_access_key = $(cat /run/secrets/secret_key)" >> ~/.aws/credentials echo "aws_secret_access_key = $(cat /run/secrets/secret_key)" >> ~/.aws/credentials
"""# """#]
}, }
]
mount: "/run/secrets/access_key": secret: config.accessKey mount: "/run/secrets/access_key": secret: config.accessKey
mount: "/run/secrets/secret_key": secret: config.secretKey mount: "/run/secrets/secret_key": secret: config.secretKey
env: AWS_DEFAULT_REGION: config.region env: AWS_DEFAULT_REGION: config.region