fix: block init if amplify app creation fails

packages/amplify-provider-awscloudformation/src/__tests__/amplify-service-manager.test.ts

@@ -0,0 +1,40 @@
+import { Amplify } from 'aws-sdk';
+import { stateManager } from 'amplify-cli-core';
+import { getConfiguredAmplifyClient } from '../aws-utils/aws-amplify';
+import { checkAmplifyServiceIAMPermission } from '../amplify-service-permission-check';
+import { init } from '../amplify-service-manager';
+
+jest.mock('../aws-utils/aws-amplify');
+jest.mock('../amplify-service-permission-check');
+
+const amplifyClientStub = ({
+  createApp: jest.fn().mockReturnValue({
+    promise: jest.fn().mockRejectedValue({
+      code: 'LimitExceededException',
+    }),
+  }),
+} as unknown) as Amplify;
+const getConfiguredAmplifyClientMock = getConfiguredAmplifyClient as jest.MockedFunction<typeof getConfiguredAmplifyClient>;
+getConfiguredAmplifyClientMock.mockResolvedValue(amplifyClientStub);
+
+const checkAmplifyServiceIAMPermissionMock = checkAmplifyServiceIAMPermission as jest.MockedFunction<
+  typeof checkAmplifyServiceIAMPermission
+>;
+checkAmplifyServiceIAMPermissionMock.mockResolvedValue(true);
+
+jest.spyOn(stateManager, 'teamProviderInfoExists').mockReturnValue(false);
+
+describe('init', () => {
+  it('throws ProjectInitError if Amplify app limit has been reached', async () => {
+    const amplifyServiceParamsStub = {
+      context: {},
+      awsConfigInfo: {},
+      projectName: 'test-project',
+      envName: 'test',
+      stackName: 'test-stack-name',
+    };
+    await expect(init(amplifyServiceParamsStub)).rejects.toMatchInlineSnapshot(
+      `[ProjectInitError: You have reached the Amplify App limit for this account and region]`,
+    );
+  });
+});

packages/amplify-provider-awscloudformation/src/amplify-service-manager.js

@@ -11,6 +11,7 @@ const { checkAmplifyServiceIAMPermission } = require('./amplify-service-permissi
 const { stateManager, AmplifyFault, AmplifyError } = require('amplify-cli-core');
 const { fileLogger } = require('./utils/aws-logger');
 const { loadConfigurationForEnv } = require('./configuration-manager');
+const { printer } = require('amplify-prompts');
 const logger = fileLogger('amplify-service-manager');
 
 async function init(amplifyServiceParams) {
@@ -56,10 +57,14 @@ async function init(amplifyServiceParams) {
       context.print.info(`Amplify AppID found: ${inputAmplifyAppId}. Amplify App name is: ${getAppResult.app.name}`);
       amplifyAppId = inputAmplifyAppId;
     } catch (e) {
-      throw new AmplifyError('ProjectNotFoundError', {
-        message: `Amplify AppID ${inputAmplifyAppId} not found.`,
-        resolution: `Please ensure your local profile matches the AWS account or region in which the Amplify app exists.`,
-      }, e)
+      throw new AmplifyError(
+        'ProjectNotFoundError',
+        {
+          message: `Amplify AppID ${inputAmplifyAppId} not found.`,
+          resolution: `Please ensure your local profile matches the AWS account or region in which the Amplify app exists.`,
+        },
+        e,
+      );
     }
   }
 
@@ -128,17 +133,24 @@ async function init(amplifyServiceParams) {
       }
     } catch (e) {
       if (e.code === 'LimitExceededException') {
-        // Do nothing
-      } else if (
-        e.code === 'BadRequestException' &&
-        e.message.includes('Rate exceeded while calling CreateApp, please slow down or try again later.')
-      ) {
-        // Do nothing
-      } else {
-        throw new AmplifyFault('ProjectInitFault', {
-          message: e.message,
-        }, e);
+        throw new AmplifyError(
+          'ProjectInitError',
+          {
+            message: 'You have reached the Amplify App limit for this account and region',
+            resolution:
+              'Use a different account or region with fewer apps, or request a service limit increase: https://docs.aws.amazon.com/general/latest/gr/amplify.html#service-quotas-amplify',
+          },
+          e,
+        );
       }
+      throw amplifyFaultWithTroubleshootingLink(
+        'ProjectInitFault',
+        {
+          message: e.message,
+          stack: e.stack,
+        },
+        e,
+      );
     }
   }
 
@@ -229,9 +241,13 @@ async function deleteEnv(context, envName, awsConfigInfo) {
         if (ex.code === 'NotFoundException') {
           context.print.warning(ex.message);
         } else {
-          throw new AmplifyFault('ProjectDeleteFault', {
-            message: ex.message,
-          }, ex);
+          throw new AmplifyFault(
+            'ProjectDeleteFault',
+            {
+              message: ex.message,
+            },
+            ex,
+          );
         }
       }
     }
@@ -316,9 +332,13 @@ async function postPushCheck(context) {
         ) {
           // Do nothing
         } else {
-          throw new AmplifyFault('ProjectInitFault', {
-            message: e.message,
-          }, e);
+          throw new AmplifyFault(
+            'ProjectInitFault',
+            {
+              message: e.message,
+            },
+            e,
+          );
         }
       }
     }
@@ -343,7 +363,6 @@ async function postPushCheck(context) {
   const tpi = stateManager.getTeamProviderInfo();
   tpi[envName][ProviderName][AmplifyAppIdLabel] = amplifyAppId;
   stateManager.setTeamProviderInfo(undefined, tpi);
-
 }
 
 async function SelectFromExistingAppId(context, appIdsInTheSameLocalProjectAndRegion) {