Skip to content

Commit 09b652b

Browse files
dhotcoloradodhotcolorado
authored
Merge branch 'main' into fix-5810-feature-default-isolation
2 parents b51798a + f4555de commit 09b652b

751 files changed

Lines changed: 44447 additions & 10426 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/cloud-nuke/config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ S3:
22
timeout: 1h
33
include:
44
names_regex:
5+
- "^terragrunt-test-[a-zA-Z0-9]{6}.*"
56
- "^terragrunt-test-bucket-[a-zA-Z0-9]{6}.*"
7+
- "^terragrunt-terralith-tfstate-[a-zA-Z0-9]{6}.*"
8+
- "^terragrunt-terralith-project-[a-zA-Z0-9]{6}.*"
9+
- "^terragrunt-getter-test-[a-zA-Z0-9]{6}.*"
10+
- "^terragrunt-cas-test-[a-zA-Z0-9]{6}.*"
611

712
VPC:
813
include:

‎.github/scripts/setup/generate-secrets.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ set -euo pipefail
1212
: "${AWS_SECRET_ACCESS_KEY:?AWS_SECRET_ACCESS_KEY is not set}"
1313
: "${AWS_TEST_S3_ASSUME_ROLE:?AWS_TEST_S3_ASSUME_ROLE is not set}"
1414
: "${AWS_TEST_OIDC_ROLE_ARN:?AWS_TEST_OIDC_ROLE_ARN is not set}"
15+
: "${AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN:?AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN is not set}"
16+
: "${AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN:?AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN is not set}"
1517

1618
: "${GCLOUD_SERVICE_KEY:?GCLOUD_SERVICE_KEY is not set}"
1719
: "${GOOGLE_CLOUD_PROJECT:?GOOGLE_CLOUD_PROJECT is not set}"
@@ -54,6 +56,10 @@ for SECRET in $SECRETS; do
5456
printf "export AWS_TEST_S3_ASSUME_ROLE='%s'\n" "${AWS_TEST_S3_ASSUME_ROLE}" >>"$ENV_FILE"
5557
elif [[ "$SECRET" == "AWS_TEST_OIDC_ROLE_ARN" && -n "${AWS_TEST_OIDC_ROLE_ARN}" ]]; then
5658
printf "export AWS_TEST_OIDC_ROLE_ARN='%s'\n" "${AWS_TEST_OIDC_ROLE_ARN}" >>"$ENV_FILE"
59+
elif [[ "$SECRET" == "AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN" && -n "${AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN}" ]]; then
60+
printf "export AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN='%s'\n" "${AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN}" >>"$ENV_FILE"
61+
elif [[ "$SECRET" == "AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN" && -n "${AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN}" ]]; then
62+
printf "export AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN='%s'\n" "${AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN}" >>"$ENV_FILE"
5763
fi
5864
done
5965

‎.github/workflows/cloud-nuke.yml‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
- cron: "0 * * * *" # Runs every hour
55
workflow_dispatch:
66

7-
87
jobs:
98
run_cloud_nuke:
109
permissions:
@@ -18,15 +17,15 @@ jobs:
1817

1918
- name: Install cloud-nuke
2019
run: |
21-
wget -O /usr/local/bin/cloud-nuke \
22-
--header="Authorization: Bearer ${GITHUB_TOKEN}" \
23-
"https://github.com/gruntwork-io/cloud-nuke/releases/download/v${VERSION}/cloud-nuke_linux_amd64"
20+
wget -O /usr/local/bin/cloud-nuke \
21+
--header="Authorization: Bearer ${GITHUB_TOKEN}" \
22+
"https://github.com/gruntwork-io/cloud-nuke/releases/download/v${VERSION}/cloud-nuke_linux_amd64"
2423
25-
chmod +x /usr/local/bin/cloud-nuke
24+
chmod +x /usr/local/bin/cloud-nuke
2625
env:
27-
# Authenticate to reduce the likelihood of hitting rate limit issues.
28-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29-
VERSION: 0.49.0
26+
# Authenticate to reduce the likelihood of hitting rate limit issues.
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
VERSION: 0.49.0
3029

3130
- name: Authenticate to AWS
3231
uses: aws-actions/configure-aws-credentials@99214aa6889fcddfa57764031d71add364327e59 # v6
@@ -36,14 +35,28 @@ jobs:
3635

3736
- name: Run cloud-nuke
3837
run: |
39-
cloud-nuke aws \
40-
--force \
41-
--log-level debug \
42-
--resource-type s3 \
43-
--resource-type vpc \
44-
--resource-type ec2 \
45-
--resource-type dynamodb \
46-
--region us-east-1 \
47-
--region us-west-2 \
48-
--older-than 1h \
49-
--config .github/cloud-nuke/config.yml
38+
cloud-nuke aws \
39+
--force \
40+
--log-level debug \
41+
--resource-type s3 \
42+
--resource-type vpc \
43+
--resource-type ec2 \
44+
--resource-type dynamodb \
45+
--region us-east-1 \
46+
--region us-west-2 \
47+
--region global \
48+
--older-than 1h \
49+
--config .github/cloud-nuke/config.yml
50+
51+
# cloud-nuke's S3 client only reaches buckets in one region; second pass covers us-west-2
52+
- name: Run cloud-nuke (S3 in us-west-2)
53+
run: |
54+
cloud-nuke aws \
55+
--force \
56+
--log-level debug \
57+
--resource-type s3 \
58+
--region global \
59+
--older-than 1h \
60+
--config .github/cloud-nuke/config.yml
61+
env:
62+
CLOUD_NUKE_AWS_GLOBAL_REGION: us-west-2

‎.github/workflows/integration-test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
- name: "Setup Docker"
158158
if: runner.os == 'Linux'
159159
id: set-up-docker
160-
uses: docker/setup-docker-action@0234bb73ccb40f0c430b795634f9247e2b5c2d23 # v5
160+
uses: docker/setup-docker-action@6d7cfa65f60a9dda7b46e5513fa982536f3c9877 # v5
161161

162162
- name: "Save space on node"
163163
if: runner.os != 'Windows'
@@ -185,6 +185,8 @@ jobs:
185185
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
186186
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
187187
AWS_TEST_OIDC_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_ROLE_ARN }}
188+
AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN }}
189+
AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN }}
188190
GCLOUD_SERVICE_KEY: ${{ secrets.GCLOUD_SERVICE_KEY }}
189191
GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
190192
GOOGLE_COMPUTE_ZONE: ${{ secrets.GOOGLE_COMPUTE_ZONE }}

‎.github/workflows/oidc-integration-test.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
tags: awsoidc
2626
run: '^TestAws'
2727
# We leave the key and secret on so that cleanup steps can use them.
28-
secrets: [AWS_TEST_OIDC_ROLE_ARN, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY]
28+
secrets: [AWS_TEST_OIDC_ROLE_ARN, AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN, AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY]
2929
setup_scripts:
3030
- .github/scripts/setup/tofu-switch.sh
3131
steps:
@@ -58,6 +58,8 @@ jobs:
5858
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5959
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
6060
AWS_TEST_OIDC_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_ROLE_ARN }}
61+
AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_CHAIN_SOURCE_ROLE_ARN }}
62+
AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN: ${{ secrets.AWS_TEST_OIDC_CHAIN_TARGET_ROLE_ARN }}
6163
GCLOUD_SERVICE_KEY: ${{ secrets.GCLOUD_SERVICE_KEY }}
6264
GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
6365
GOOGLE_COMPUTE_ZONE: ${{ secrets.GOOGLE_COMPUTE_ZONE }}

‎.licensei.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ approved = [
55
"isc",
66
"mpl-2.0",
77
"mit",
8+
"ofl-1.1",
89
]
910

1011
ignored = [

0 commit comments

Comments
 (0)