Skip to content

Commit 4064222

Browse files
authored
Fix regions and add clarity in Lambda Layer release workflow (#1196)
*Issue #, if available:* - Original issue in Python Lambda release aws-observability/aws-otel-python-instrumentation#458 - The new regions should be added to the default list, not the commercial region env variable *Description of changes:* - Cherry-pick #1185 from main ``` Remove new regions from COMMERCIAL_REGIONS Rename COMMERCIAL_REGIONS to LEGACY_COMMERCIAL_REGIONS Add comments for clarity ``` By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 1eea193 commit 4064222

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/release-lambda.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ on:
1212
default: 'us-east-1, us-east-2, us-west-1, us-west-2, ap-south-1, ap-northeast-3, ap-northeast-2, ap-southeast-1, ap-southeast-2, ap-northeast-1, ca-central-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, eu-north-1, sa-east-1, af-south-1, ap-east-1, ap-south-2, ap-southeast-3, ap-southeast-4, eu-central-2, eu-south-1, eu-south-2, il-central-1, me-central-1, me-south-1, ap-southeast-5, ap-southeast-7, mx-central-1, ca-west-1, cn-north-1, cn-northwest-1'
1313

1414
env:
15-
COMMERCIAL_REGIONS: us-east-1, us-east-2, us-west-1, us-west-2, ap-south-1, ap-northeast-3, ap-northeast-2, ap-southeast-1, ap-southeast-2, ap-northeast-1, ca-central-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, eu-north-1, sa-east-1, ap-southeast-5, ap-southeast-7, mx-central-1, ca-west-1, cn-north-1, cn-northwest-1
15+
# Legacy list of commercial regions to deploy to. New regions should NOT be added here, and instead should be added to the `aws_region` default input to the workflow.
16+
LEGACY_COMMERCIAL_REGIONS: us-east-1, us-east-2, us-west-1, us-west-2, ap-south-1, ap-northeast-3, ap-northeast-2, ap-southeast-1, ap-southeast-2, ap-northeast-1, ca-central-1, eu-central-1, eu-west-1, eu-west-2, eu-west-3, eu-north-1, sa-east-1
1617
LAYER_NAME: AWSOpenTelemetryDistroJava
1718

1819
permissions:
@@ -67,21 +68,21 @@ jobs:
6768
steps:
6869
- name: role arn
6970
env:
70-
COMMERCIAL_REGIONS: ${{ env.COMMERCIAL_REGIONS }}
71+
LEGACY_COMMERCIAL_REGIONS: ${{ env.LEGACY_COMMERCIAL_REGIONS }}
7172
run: |
72-
COMMERCIAL_REGIONS_ARRAY=(${COMMERCIAL_REGIONS//,/ })
73+
LEGACY_COMMERCIAL_REGIONS_ARRAY=(${LEGACY_COMMERCIAL_REGIONS//,/ })
7374
FOUND=false
74-
for REGION in "${COMMERCIAL_REGIONS_ARRAY[@]}"; do
75+
for REGION in "${LEGACY_COMMERCIAL_REGIONS_ARRAY[@]}"; do
7576
if [[ "$REGION" == "${{ matrix.aws_region }}" ]]; then
7677
FOUND=true
7778
break
7879
fi
7980
done
8081
if [ "$FOUND" = true ]; then
81-
echo "Found ${{ matrix.aws_region }} in COMMERCIAL_REGIONS"
82+
echo "Found ${{ matrix.aws_region }} in LEGACY_COMMERCIAL_REGIONS"
8283
SECRET_KEY="LAMBDA_LAYER_RELEASE"
8384
else
84-
echo "Not found ${{ matrix.aws_region }} in COMMERCIAL_REGIONS"
85+
echo "Not found ${{ matrix.aws_region }} in LEGACY_COMMERCIAL_REGIONS"
8586
SECRET_KEY="${{ matrix.aws_region }}_LAMBDA_LAYER_RELEASE"
8687
fi
8788
SECRET_KEY=${SECRET_KEY//-/_}

0 commit comments

Comments
 (0)