fix: check for local env file and then fall back on exeinfo

aws-amplify · Jan 28, 2021 · 85de8ac · 85de8ac
1 parent 4653062
commit 85de8ac
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/packages/amplify-cli/src/__tests__/get-tags.test.ts b/packages/amplify-cli/src/__tests__/get-tags.test.ts
@@ -11,6 +11,7 @@ describe('getTags', () => {
   jest.setMock('amplify-cli-core', {
     stateManager: {
       isTagFilePresent: jest.fn().mockReturnValue(false),
+      localEnvInfoExists: jest.fn().mockReturnValue(false),
     },
     HydrateTags,
   });

diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/get-tags.ts b/packages/amplify-cli/src/extensions/amplify-helpers/get-tags.ts
@@ -2,13 +2,24 @@ import { stateManager, Tag, HydrateTags } from 'amplify-cli-core';
 import { Context } from '../../domain/context';
 
 export function getTags(context: Context): Tag[] {
+  let tags: Tag[];
+  let envInfo: any;
+  let projectConfig: any;
   if (stateManager.isTagFilePresent()) {
-    return stateManager.getHydratedTags();
+    tags = stateManager.getProjectTags();
   } else {
-    const { envName } = context.exeInfo.localEnvInfo;
-    const { projectName } = context.exeInfo.projectConfig;
-    return HydrateTags(initialTags, { envName, projectName });
+    tags = initialTags;
   }
+  if (stateManager.localEnvInfoExists() && stateManager.projectConfigExists()) {
+    envInfo = stateManager.getProjectConfig();
+    projectConfig = stateManager.getLocalEnvInfo();
+  } else {
+    envInfo = context.exeInfo.localEnvInfo;
+    projectConfig = context.exeInfo.projectConfig;
+  }
+  const { envName } = envInfo;
+  const { projectName } = projectConfig;
+  return HydrateTags(tags, { envName, projectName });
 }
 
 const initialTags: Tag[] = [