fix: ensure AWS_REGION matches CLI_REGION in all tests (#12837)

* chore: noop trigger cb * chore: noop trigger cb * chore: add beforeeach to other setup-tests files
aws-amplify · Jun 23, 2023 · 7be43e4 · 7be43e4
1 parent fd18195
commit 7be43e4
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/packages/amplify-console-integration-tests/src/setup-tests.ts b/packages/amplify-console-integration-tests/src/setup-tests.ts
@@ -9,3 +9,13 @@ removeYarnPaths();
 
 const JEST_TIMEOUT = 1000 * 60 * 60; // 1 hour
 jest.setTimeout(JEST_TIMEOUT);
+
+beforeEach(async () => {
+  if (process.env.CLI_REGION) {
+    console.log(`CLI_REGION set to: ${process.env.CLI_REGION}. Overwriting AWS_REGION and AWS_DEFAULT_REGION`);
+    process.env.AWS_REGION = process.env.CLI_REGION;
+    process.env.AWS_DEFAULT_REGION = process.env.CLI_REGION;
+  } else {
+    console.log('No CLI_REGION variable found');
+  }
+});
diff --git a/packages/amplify-e2e-tests/src/setup-tests.ts b/packages/amplify-e2e-tests/src/setup-tests.ts
@@ -18,3 +18,13 @@ jest.setTimeout(JEST_TIMEOUT);
 if (process.env.CIRCLECI) {
   jest.retryTimes(1);
 }
+
+beforeEach(async () => {
+  if (process.env.CLI_REGION) {
+    console.log(`CLI_REGION set to: ${process.env.CLI_REGION}. Overwriting AWS_REGION and AWS_DEFAULT_REGION`);
+    process.env.AWS_REGION = process.env.CLI_REGION;
+    process.env.AWS_DEFAULT_REGION = process.env.CLI_REGION;
+  } else {
+    console.log('No CLI_REGION variable found');
+  }
+});
diff --git a/packages/amplify-migration-tests/src/setup-tests.ts b/packages/amplify-migration-tests/src/setup-tests.ts
@@ -13,3 +13,13 @@ jest.setTimeout(JEST_TIMEOUT);
 if (process.env.CIRCLECI) {
   jest.retryTimes(1);
 }
+
+beforeEach(async () => {
+  if (process.env.CLI_REGION) {
+    console.log(`CLI_REGION set to: ${process.env.CLI_REGION}. Overwriting AWS_REGION and AWS_DEFAULT_REGION`);
+    process.env.AWS_REGION = process.env.CLI_REGION;
+    process.env.AWS_DEFAULT_REGION = process.env.CLI_REGION;
+  } else {
+    console.log('No CLI_REGION variable found');
+  }
+});