chore: address comments

aws-amplify · Oct 13, 2022 · 8e81b40 · 8e81b40
1 parent e63f0ce
commit 8e81b40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/amplify-cli/src/attach-backend.ts b/packages/amplify-cli/src/attach-backend.ts
@@ -101,9 +101,12 @@ const onSuccess = async (context: $TSContext): Promise<void> => {
     await initializeEnv(context, stateManager.getCurrentMeta());
   }
   // move Hooks folder from backup to original amplify folder
-  const HooksDirPath = pathManager.getHooksDirPath(projectPath);
-  const HooksBackupDirPath = path.join(backupAmplifyDirPath, 'hooks');
-  fs.moveSync(HooksBackupDirPath, HooksDirPath, { overwrite: true });
+  const hooksDirPath = pathManager.getHooksDirPath(projectPath);
+  const hooksBackupDirPath = path.join(backupAmplifyDirPath, 'hooks');
+  // hooks folder shouldnt be present , if it is then we overrite with the given Customer folder from amplify backup
+  if (fs.existsSync(hooksBackupDirPath)) {
+    fs.moveSync(hooksBackupDirPath, hooksDirPath, { overwrite: true });
+  }
   removeBackupAmplifyFolder();
 };
 

diff --git a/packages/amplify-e2e-core/src/init/amplifyPull.ts b/packages/amplify-e2e-core/src/init/amplifyPull.ts
@@ -116,7 +116,7 @@ export const amplifyPullNonInteractive = (
       configLevel: 'project',
       useProfile: true,
       // eslint-disable-next-line spellcheck/spell-checker
-      profileName: 'default',
+      profileName: 'amplify-integ-test-user',
     },
   };
   const args = [