updated S3 set up (#4632)

Enterprise-CMCS · Mar 22, 2023 · db18926 · db18926
1 parent 72fba6d
commit db18926
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1248,14 +1248,14 @@ jobs:
             sudo apt-get -qq install jq -y
             pip install --quiet awscli
             ./aws.sh \
+              --AWS_REGION "${<< parameters.env >>_API_AWS_REGION}" \
               --API_AWS_ACCESS_KEY_ID "${<< parameters.env >>_API_AWS_ACCESS_KEY_ID}" \
               --API_AWS_SECRET_ACCESS_KEY "${<< parameters.env >>_API_AWS_SECRET_ACCESS_KEY}" \
               --API_DATABASE_URL "${<< parameters.env >>_API_DATABASE_URL}" \
               --API_FILE_S3_BUCKET "${<< parameters.env >>_API_FILE_S3_BUCKET}" \
               --API_PBKDF2_ITERATIONS "${<< parameters.env >>_API_PBKDF2_ITERATIONS}" \
               --API_PORT "${<< parameters.env >>_API_PORT}" \
               --API_SESSION_SECRET "${<< parameters.env >>_API_SESSION_SECRET}" \
-              --AWS_REGION "${<< parameters.env >>_API_AWS_REGION}" \
               --AWS_SECURITY_GROUP "${<< parameters.env >>_API_AWS_SECURITY_GROUP}" \
               --AWS_SUBNET "${<< parameters.env >>_API_AWS_SUBNET}" \
               --AWS_TARGET_GROUP "${<< parameters.env >>_API_AWS_TARGET_GROUP}" \

diff --git a/api/files/s3.js b/api/files/s3.js
@@ -4,6 +4,10 @@ const config = {
   apiVersion: '2006-03-01'
 };
 
+if (process.env.AWS_REGION) {
+  config.region = process.env.AWS_REGION;
+}
+
 export const getFile = async (id, { S3 = awsS3 } = {}) => {
   if (!process.env.FILE_S3_BUCKET) {
     return Promise.reject(new Error('No S3 bucket specified'));

diff --git a/bin/prod-deploy/aws.sh b/bin/prod-deploy/aws.sh
@@ -176,6 +176,7 @@ function addBuildUrlToUserData() {
 # it into the user-data script.
 #
 # Expects global variables:
+#   AWS_REGION - AWS region used for read/write to S3
 #   API_AWS_ACCESS_KEY_ID - AWS key used for read/write to S3
 #   API_AWS_SECRET_ACCESS_KEY - AWS key used for read/write to S3
 #   API_PORT - port the API should listen on
@@ -193,6 +194,7 @@ function addEcosystemToUserData() {
       error_file: '/app/api/logs/eAPD-API-error-0.log',
       out_file: '/app/api/logs/eAPD-API-out-0.log',
       env: {
+        AWS_REGION: '$AWS_REGION',
         AWS_ACCESS_KEY_ID: '$API_AWS_ACCESS_KEY_ID',
         AWS_SECRET_ACCESS_KEY: '$API_AWS_SECRET_ACCESS_KEY',
         AUTH_LOCK_FAILED_ATTEMPTS_COUNT: 5,