Use AWS_DEFAULT_REGION vs AWS_REGION

See: aws/aws-cli#735 (comment)
zoomhub · Mar 9, 2022 · be3f9f0 · be3f9f0
1 parent a4398fa
commit be3f9f0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/zoomhub.yml b/.github/workflows/zoomhub.yml
@@ -50,7 +50,8 @@ jobs:
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      AWS_REGION: "us-east-2"
+      # See: https://github.com/aws/aws-cli/issues/735#issuecomment-39395188
+      AWS_DEFAULT_REGION: "us-east-2"
       ZH_API_PASSWORD_DEVELOPMENT: ${{ secrets.ZH_API_PASSWORD_DEVELOPMENT }}
       ZH_API_USERNAME_DEVELOPMENT: ${{ secrets.ZH_API_USERNAME_DEVELOPMENT }}
       ZH_API_PASSWORD_STAGING: ${{ secrets.ZH_API_PASSWORD_STAGING }}

diff --git a/ops/aws/deploy-processContent.sh b/ops/aws/deploy-processContent.sh
@@ -49,7 +49,6 @@ fi
 
 update_code_output=$(
   aws lambda update-function-code \
-    --region $AWS_REGION \
     --zip-file fileb://function-processContent.zip \
     --function-name processContent
 )
@@ -61,7 +60,6 @@ update_configuration_output=$(
   aws lambda update-function-configuration \
     --function-name processContent \
     --memory-size $MEMORY_SIZE \
-    --region $AWS_REGION \
     --description "$(date +%FT%T%z)-$ZH_ENV-memory-$MEMORY_SIZE" \
     --environment "Variables={NUM_CONCURRENT_UPLOADS=$NUM_CONCURRENT_UPLOADS,ROOT_PATH=$ROOT_PATH,S3_CACHE_BUCKET=$S3_CACHE_BUCKET,TMPDIR=$TMPDIR,VIPS_DISC_THRESHOLD=$VIPS_DISC_THRESHOLD,ZH_API_PASSWORD=$ZH_API_PASSWORD,ZH_API_USERNAME=$ZH_API_USERNAME}" \
     --revision-id  $(jq --raw-output '.RevisionId' <<< "$update_code_output")
@@ -70,14 +68,12 @@ update_configuration_output=$(
 publish_output=$(
   aws lambda publish-version \
       --function-name processContent \
-      --region $AWS_REGION \
       --code-sha256 $(jq --raw-output '.CodeSha256' <<< "$update_code_output") \
       --revision-id $(jq --raw-output '.RevisionId' <<< "$update_configuration_output")
 )
 
 aws lambda update-alias \
     --function-name processContent \
-    --region $AWS_REGION \
     --function-version $(jq --raw-output '.Version' <<< "$publish_output") \
     --revision-id $(jq --raw-output '.RevisionId' <<< "$publish_output") \
     --name $ZH_ENV