fix: add better error messaging when initializing an already initialized project

packages/amplify-cli/src/__tests__/init-steps/s0-analyzeProject.test.ts

@@ -1,8 +1,9 @@
-import { $TSContext, stateManager } from '@aws-amplify/amplify-cli-core';
+import { $TSContext, AmplifyError, stateManager } from '@aws-amplify/amplify-cli-core';
 import { analyzeProject } from '../../init-steps/s0-analyzeProject';
 import { constructMockPluginPlatform } from '../extensions/amplify-helpers/mock-plugin-platform';
 import { CLIInput as CommandLineInput } from '../../domain/command-input';
 import { constructContext } from '../../context-manager';
+import * as fs from 'fs-extra';
 
 jest.spyOn(stateManager, 'getLocalAWSInfo').mockReturnValue({ envA: 'test', envB: 'test' });
 jest.spyOn(stateManager, 'getLocalEnvInfo').mockReturnValue({ defaultEditor: 'Visual Studio Code' });
@@ -75,4 +76,35 @@ describe('analyzeProject', () => {
     await analyzeProject(mockContext);
     expect(mockContext.exeInfo.isNewEnv).toBe(true);
   });
+
+  it('throws helpful error message when running subsequent init -y commands', async () => {
+    const emitErrorMock = jest.fn();
+
+    mockContext.amplify = {
+      confirmPrompt: jest.fn(),
+      getAllEnvs: jest.fn().mockReturnValue(['dev']),
+      pathManager: {
+        getProjectConfigFilePath: jest.fn().mockReturnValue('mockDirPath'),
+      },
+    };
+    mockContext.exeInfo = {
+      isNewProject: false,
+    };
+    mockContext.exeInfo.inputParams = {
+      amplify: {},
+      yes: true,
+    };
+    mockContext.usageData = {
+      emitError: emitErrorMock,
+    };
+
+    jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+
+    const amplifyError = new AmplifyError('ProjectInitError', {
+      message: `Amplify project is already initialized with environment name: dev`,
+      resolution: `To create a new environment run \`amplify add env\``,
+    });
+
+    await expect(analyzeProject(mockContext)).rejects.toThrow(amplifyError);
+  });
 });

packages/amplify-cli/src/init-steps/s0-analyzeProject.ts

@@ -220,8 +220,11 @@ const getDefaultEnv = (context: $TSContext): string | undefined => {
       resolution: INVALID_ENV_NAME_MSG,
     });
   }
-
-  if (isNewProject(context) || !context.amplify.getAllEnvs().includes(defaultEnv)) {
+  if (
+    isNewProject(context) ||
+    !context.amplify.getAllEnvs().includes(defaultEnv) ||
+    (context.exeInfo.inputParams && context.exeInfo.inputParams.yes)
+  ) {
     return defaultEnv;
   }
   return undefined;
@@ -241,8 +244,8 @@ const getEnvName = async (context: $TSContext): Promise<string> => {
     });
   } else if (context.exeInfo.inputParams && context.exeInfo.inputParams.yes) {
     throw new AmplifyError('ProjectInitError', {
-      message: `Invalid environment name: ${context.exeInfo.inputParams.amplify.envName}`,
-      resolution: INVALID_ENV_NAME_MSG,
+      message: `Amplify project is already initialized with environment name: ${getDefaultEnv(context)}`,
+      resolution: `To create a new environment run \`amplify add env\``,
     });
   }