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

Add AWS region with propagate-aws-auth-tokens option #192

Merged
merged 3 commits into from
Mar 14, 2022
Merged

Add AWS region with propagate-aws-auth-tokens option #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec222e
Add AWS region with the auth tokens
iress-willygo Feb 3, 2022
8e7c541
Merge branch 'buildkite-plugins:master' into add-aws-region
iress-willygo Mar 11, 2022
3864fb7
Add env var to README
iress-willygo Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Note that only pipeline variables will automatically be propagated (what you see

Whether or not to automatically propagate aws authentication environment variables into the docker container. Avoiding the need to be specified with `environment`. This is useful for example if you are using an assume role plugin.

Will propagate `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, and `AWS_SESSION_TOKEN`, only if they are set already.
Will propagate `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `AWS_SESSION_TOKEN`, `AWS_REGION` and `AWS_DEFAULT_REGION`, only if they are set already.

### `propagate-uid-gid` (optional, boolean)

Expand Down
6 changes: 6 additions & 0 deletions hooks/command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,12 @@ if [[ "${BUILDKITE_PLUGIN_DOCKER_PROPAGATE_AWS_AUTH_TOKENS:-false}" =~ ^(true|on
if [[ -n "${AWS_SESSION_TOKEN:-}" ]] ; then
args+=( --env "AWS_SESSION_TOKEN" )
fi
if [[ -n "${AWS_REGION:-}" ]] ; then
args+=( --env "AWS_REGION" )
fi
if [[ -n "${AWS_DEFAULT_REGION:-}" ]] ; then
args+=( --env "AWS_DEFAULT_REGION" )
fi
fi

if [[ "${BUILDKITE_PLUGIN_DOCKER_ALWAYS_PULL:-false}" =~ ^(true|on|1)$ ]] ; then
Expand Down
6 changes: 4 additions & 2 deletions tests/command.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,9 +698,11 @@ EOF
export AWS_ACCESS_KEY_ID="AKIAIOSFODNN7EXAMPLE"
export AWS_SECRET_ACCESS_KEY="wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
export AWS_SESSION_TOKEN="AQoEXAMPLEH4aoAH0gNCAPy...truncated...zrkuWJOgQs8IZZaIv2BXIa2R4Olgk"
export AWS_REGION="ap-southeast-2"
export AWS_DEFAULT_REGION="ap-southeast-2"

stub docker \
"run -it --rm --init --volume $PWD:/workdir --workdir /workdir --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --label com.buildkite.job-id=1-2-3-4 image:tag /bin/sh -e -c 'echo hello world' : echo ran command in docker"
"run -it --rm --init --volume $PWD:/workdir --workdir /workdir --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY --env AWS_SESSION_TOKEN --env AWS_REGION --env AWS_DEFAULT_REGION --label com.buildkite.job-id=1-2-3-4 image:tag /bin/sh -e -c 'echo hello world' : echo ran command in docker"

run $PWD/hooks/command

Expand Down Expand Up @@ -790,4 +792,4 @@ EOF
assert_output --partial "ran command in docker"

unstub docker
}
}