From 984c0f8548cec80d0e14269757cd49b031403097 Mon Sep 17 00:00:00 2001
From: Zachary Goldberg <117126550+goldbez@users.noreply.github.com>
Date: Wed, 16 Nov 2022 10:56:54 -0800
Subject: [PATCH 01/30] fix(cli): fix grammar in pull warning message (#11407)

---
 .../src/commands/utils/notifyMissingPackages.ts               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/amplify-util-uibuilder/src/commands/utils/notifyMissingPackages.ts b/packages/amplify-util-uibuilder/src/commands/utils/notifyMissingPackages.ts
index aca6db217ee..bbbffd8a975 100644
--- a/packages/amplify-util-uibuilder/src/commands/utils/notifyMissingPackages.ts
+++ b/packages/amplify-util-uibuilder/src/commands/utils/notifyMissingPackages.ts
@@ -33,11 +33,11 @@ export const notifyMissingPackages = (context: $TSContext): void => {
     const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
     if (!packageIsInstalled) {
       printer.warn(
-        `UIBuilder components required "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`,
+        `UIBuilder components require "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`,
       );
     } else if (!rangeSubset(packageJson.dependencies[dependency.dependencyName], dependency.supportedSemVerPattern)) {
       printer.warn(
-        `UIBuilder components requires version "${dependency.supportedSemVerPattern}" of "${
+        `UIBuilder components require version "${dependency.supportedSemVerPattern}" of "${
           dependency.dependencyName
         }". You currently are on version "${packageJson.dependencies[dependency.dependencyName]}". Run \`npm install "${
           dependency.dependencyName

From 5ebbc72bb2e6a8e72387182747d6b1e7d0f7bccd Mon Sep 17 00:00:00 2001
From: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Date: Wed, 16 Nov 2022 14:58:12 -0500
Subject: [PATCH 02/30] chore: migrate notifications category to
 amplify-prompter (#11401)

* chore: migrate notifications category to amplify-prompter
---
 .../package.json                              |  4 --
 .../src/__tests__/apns-cert-config.test.ts    | 16 +++--
 .../src/__tests__/apns-key-config.test.ts     | 25 ++++----
 .../src/__tests__/channel-apns.test.ts        | 55 +++++++++--------
 .../src/__tests__/channel-fcm.test.ts         | 61 +++++++++++--------
 .../src/apns-cert-config.ts                   | 22 +++----
 .../src/apns-key-config.ts                    | 38 ++++--------
 .../src/channel-apns.ts                       | 36 ++++-------
 .../src/channel-email.ts                      | 49 ++++-----------
 .../src/channel-fcm.ts                        | 55 ++++-------------
 .../src/channel-sms.ts                        | 21 ++-----
 .../src/validate-filepath.ts                  |  9 ++-
 12 files changed, 149 insertions(+), 242 deletions(-)

diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json
index 517a04b6ad7..5740ff8d5f9 100644
--- a/packages/amplify-category-notifications/package.json
+++ b/packages/amplify-category-notifications/package.json
@@ -27,14 +27,10 @@
     "amplify-prompts": "2.6.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
-    "inquirer": "^7.3.3",
     "lodash": "^4.17.21",
     "ora": "^4.0.3",
     "promise-sequential": "^1.1.1"
   },
-  "devDependencies": {
-    "mockirer": "^2.0.1"
-  },
   "jest": {
     "testURL": "http://localhost",
     "transform": {
diff --git a/packages/amplify-category-notifications/src/__tests__/apns-cert-config.test.ts b/packages/amplify-category-notifications/src/__tests__/apns-cert-config.test.ts
index a4624ac49ff..3249b5ed4bc 100644
--- a/packages/amplify-category-notifications/src/__tests__/apns-cert-config.test.ts
+++ b/packages/amplify-category-notifications/src/__tests__/apns-cert-config.test.ts
@@ -1,14 +1,11 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable spellcheck/spell-checker */
+import { prompter } from 'amplify-prompts';
 import * as apnsCertConfig from '../apns-cert-config';
 import * as p12decoder from '../apns-cert-p12decoder';
 import { ICertificateInfo } from '../apns-cert-p12decoder';
 
-const inquirer = require('inquirer');
-const mockirer = require('mockirer');
-
 jest.mock('../apns-cert-p12decoder');
+jest.mock('amplify-prompts');
+const prompterMock = prompter as jest.Mocked<typeof prompter>;
 
 describe('apns-cert-config', () => {
   const mockFilePath = 'mock_p12_file_path';
@@ -21,14 +18,15 @@ describe('apns-cert-config', () => {
   const mockP12DecoderReturn = {};
 
   beforeAll(() => {
-    mockirer(inquirer, mockAnswers);
     const p12DecoderMock = p12decoder as jest.Mocked<typeof p12decoder>;
     p12DecoderMock.run.mockReturnValue(mockP12DecoderReturn as unknown as ICertificateInfo);
   });
 
-  beforeEach(() => {});
-
   test('p12decoder invoked', async () => {
+    prompterMock.input
+      .mockResolvedValueOnce(mockFilePath)
+      .mockResolvedValueOnce(mockPassword);
+
     const result = await apnsCertConfig.run(undefined);
     expect(p12decoder.run).toBeCalledWith(mockAnswers);
     expect(result).toBe(mockP12DecoderReturn);
diff --git a/packages/amplify-category-notifications/src/__tests__/apns-key-config.test.ts b/packages/amplify-category-notifications/src/__tests__/apns-key-config.test.ts
index 5ab850cf0b4..539df3b55ff 100644
--- a/packages/amplify-category-notifications/src/__tests__/apns-key-config.test.ts
+++ b/packages/amplify-category-notifications/src/__tests__/apns-key-config.test.ts
@@ -1,37 +1,38 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable spellcheck/spell-checker */
+import { prompter } from 'amplify-prompts';
 import * as p8decoder from '../apns-cert-p8decoder';
 import * as apnsKeyConfig from '../apns-key-config';
 
-const inquirer = require('inquirer');
-const mockirer = require('mockirer');
-
 jest.mock('../apns-cert-p8decoder');
+jest.mock('amplify-prompts');
+const prompterMock = prompter as jest.Mocked<typeof prompter>;
+
 describe('apns-key-config', () => {
   const mockBundleId = 'mockBundleId';
   const mockTeamId = 'mockTeamId';
   const mockTokenKeyId = 'mockTokenKeyId';
   const mockFilePath = 'mock_p8_file_path';
+  const mockP8DecoderReturn = 'mockP8DecoderReturn';
   const mockKeyConfig = {
     BundleId: mockBundleId,
     TeamId: mockTeamId,
     TokenKeyId: mockTokenKeyId,
-    P8FilePath: mockFilePath,
+    TokenKey: mockP8DecoderReturn,
   };
-  const mockP8DecoderReturn = 'mockP8DecoderReturn';
 
   beforeAll(() => {
-    mockirer(inquirer, mockKeyConfig);
     const p8DecoderMock = p8decoder as jest.Mocked<typeof p8decoder>;
     p8DecoderMock.run.mockReturnValue(mockP8DecoderReturn);
   });
 
-  beforeEach(() => {});
-
   test('p8decoder invoked', async () => {
+    prompterMock.input
+      .mockResolvedValueOnce(mockBundleId)
+      .mockResolvedValueOnce(mockTeamId)
+      .mockResolvedValueOnce(mockTokenKeyId)
+      .mockResolvedValueOnce(mockFilePath);
+
     const result = await apnsKeyConfig.run(undefined);
     expect(p8decoder.run).toBeCalledWith(mockFilePath);
-    expect(result).toBe(mockKeyConfig);
+    expect(result).toMatchObject(mockKeyConfig);
   });
 });
diff --git a/packages/amplify-category-notifications/src/__tests__/channel-apns.test.ts b/packages/amplify-category-notifications/src/__tests__/channel-apns.test.ts
index 571fa725cd8..761ebf877d6 100644
--- a/packages/amplify-category-notifications/src/__tests__/channel-apns.test.ts
+++ b/packages/amplify-category-notifications/src/__tests__/channel-apns.test.ts
@@ -1,10 +1,7 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable jest/no-conditional-expect */
-/* eslint-disable @typescript-eslint/no-empty-function */
-/* eslint-disable spellcheck/spell-checker */
 import {
   $TSAny, $TSContext, AmplifyCategories, AmplifyFault, AmplifySupportedService, IContextPrint,
 } from 'amplify-cli-core';
+import { prompter } from 'amplify-prompts';
 import * as configureKey from '../apns-key-config';
 import * as configureCertificate from '../apns-cert-config';
 
@@ -13,12 +10,11 @@ import { ICertificateInfo } from '../apns-cert-p12decoder';
 import { ChannelAction, ChannelConfigDeploymentType, IChannelAPIResponse } from '../channel-types';
 import { ChannelType } from '../notifications-backend-cfg-channel-api';
 
-const inquirer = require('inquirer');
-const mockirer = require('mockirer');
-
 const channelName = 'APNS';
 jest.mock('../apns-key-config');
 jest.mock('../apns-cert-config');
+jest.mock('amplify-prompts');
+const prompterMock = prompter as jest.Mocked<typeof prompter>;
 
 class NoErrorThrownError extends Error {}
 // wrapper to avoid conditional error checks
@@ -112,52 +108,59 @@ describe('channel-APNS', () => {
     configureCertificateMock.run.mockImplementation(async () => mockCertificateConfig as ICertificateInfo);
   });
 
-  beforeEach(() => {});
-
   test('configure', async () => {
     mockChannelOutput.Enabled = true;
-    mockirer(inquirer, { disableChannel: true });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(true);
     await channelAPNS.configure(mockContext).then(() => {
       expect(mockPinpointClient.updateApnsChannel).toBeCalled();
     });
 
     mockChannelOutput.Enabled = true;
-    mockirer(inquirer, { disableChannel: false });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(false);
     await channelAPNS.configure(mockContext).then(() => {
       expect(mockPinpointClient.updateApnsChannel).toBeCalled();
     });
 
     mockChannelOutput.Enabled = false;
-    mockirer(inquirer, { enableChannel: true });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(true);
+    prompterMock.pick
+      .mockResolvedValueOnce('Certificate');
     await channelAPNS.configure(mockContext).then(() => {
       expect(mockPinpointClient.updateApnsChannel).toBeCalled();
     });
   });
 
   test('enable', async () => {
-    mockirer(inquirer, { DefaultAuthenticationMethod: 'Certificate' });
-    await channelAPNS.enable(mockContext, 'successMessage').then(data => {
-      expect(mockPinpointClient.updateApnsChannel).toBeCalled();
-      expect(mockPinpointClient.updateApnsSandboxChannel).toBeCalled();
-      expect(data).toEqual(mockAPNSChannelResponseData(true, ChannelAction.ENABLE, mockPinpointResponseData.APNSChannelResponse));
-    });
+    prompterMock.pick
+      .mockResolvedValueOnce('Certificate');
 
-    mockirer(inquirer, { DefaultAuthenticationMethod: 'Key' });
-    await channelAPNS.enable(mockContext, 'successMessage').then(data => {
-      expect(mockPinpointClient.updateApnsChannel).toBeCalled();
-      expect(mockPinpointClient.updateApnsSandboxChannel).toBeCalled();
-      expect(data).toEqual(mockAPNSChannelResponseData(true, ChannelAction.ENABLE, mockPinpointResponseData.APNSChannelResponse));
-    });
+    const disableData = await channelAPNS.enable(mockContext, 'successMessage');
+    expect(mockPinpointClient.updateApnsChannel).toBeCalled();
+    expect(mockPinpointClient.updateApnsSandboxChannel).toBeCalled();
+    expect(disableData).toEqual(mockAPNSChannelResponseData(true, ChannelAction.ENABLE, mockPinpointResponseData.APNSChannelResponse));
+
+    prompterMock.pick
+      .mockResolvedValueOnce('Key');
+    const enableData = await channelAPNS.enable(mockContext, 'successMessage');
+    expect(mockPinpointClient.updateApnsChannel).toBeCalled();
+    expect(mockPinpointClient.updateApnsSandboxChannel).toBeCalled();
+    expect(enableData).toEqual(mockAPNSChannelResponseData(true, ChannelAction.ENABLE, mockPinpointResponseData.APNSChannelResponse));
   });
 
   // eslint-disable-next-line jest/no-focused-tests
   test('enable unsuccessful', async () => {
-    mockirer(inquirer, { DefaultAuthenticationMethod: 'Certificate' });
+    prompterMock.pick
+      .mockResolvedValueOnce('Certificate');
+
     const errCert: AmplifyFault = await getError(async () => channelAPNS.enable(mockContextReject as unknown as $TSContext, 'successMessage'));
     expect(mockContextReject.exeInfo.pinpointClient.updateApnsChannel).toBeCalled();
     expect(errCert?.downstreamException?.message).toContain(mockPinpointResponseErr.message);
 
-    mockirer(inquirer, { DefaultAuthenticationMethod: 'Key' });
+    prompterMock.pick
+      .mockResolvedValueOnce('Key');
     const errKey: AmplifyFault = await getError(async () => channelAPNS.enable(mockContextReject as unknown as $TSContext, 'successMessage'));
     expect(mockPinpointClient.updateApnsChannel).toBeCalled();
     expect(errKey?.downstreamException?.message).toContain(mockPinpointResponseErr.message);
diff --git a/packages/amplify-category-notifications/src/__tests__/channel-fcm.test.ts b/packages/amplify-category-notifications/src/__tests__/channel-fcm.test.ts
index 57df93dad20..498a4a5a066 100644
--- a/packages/amplify-category-notifications/src/__tests__/channel-fcm.test.ts
+++ b/packages/amplify-category-notifications/src/__tests__/channel-fcm.test.ts
@@ -1,25 +1,26 @@
 /* eslint-disable spellcheck/spell-checker */
 import {
-  $TSContext, $TSAny, AmplifyCategories, AmplifySupportedService,
+  $TSContext, $TSAny, AmplifyCategories, AmplifySupportedService, AmplifyFault,
 } from 'amplify-cli-core';
-import inquirer from 'inquirer';
+import { prompter } from 'amplify-prompts';
 import * as channelFCM from '../channel-fcm';
 import { ChannelAction, ChannelConfigDeploymentType, IChannelAPIResponse } from '../channel-types';
 import { ChannelType } from '../notifications-backend-cfg-channel-api';
 
-const channelName = 'FCM';
-
-const mockInquirer = (answers : $TSAny): $TSAny => {
-  (inquirer as any).prompt = async (prompts:$TSAny):Promise<$TSAny> => {
-    [].concat(prompts).forEach(prompt => {
-      if (!((prompt as unknown as any).name in answers) && typeof (prompt as unknown as any).default !== 'undefined') {
-        // eslint-disable-next-line no-param-reassign
-        answers[(prompt as unknown as any).name] = (prompt as unknown as any).default;
-      }
-    });
-    return answers;
-  };
+const apiKey = 'ApiKey-abc123';
+jest.mock('amplify-prompts');
+const prompterMock = prompter as jest.Mocked<typeof prompter>;
+
+class NoErrorThrownError extends Error {}
+const getError = async <TError>(call: () => unknown): Promise<TError> => {
+  try {
+    await call();
+    throw new NoErrorThrownError();
+  } catch (error: unknown) {
+    return error as TError;
+  }
 };
+const channelName = 'FCM';
 
 const mockPinpointResponseData = (status: boolean, action : ChannelAction): IChannelAPIResponse => ({
   action,
@@ -48,7 +49,7 @@ const mockContext = (output: $TSAny, client: $TSAny): $TSContext => ({
   },
 }) as unknown as $TSContext;
 
-const mockContextReject = (output:$TSAny, clientReject:$TSAny):$TSAny => ({
+const mockContextReject = (output: $TSAny, clientReject: $TSAny): $TSAny => ({
   exeInfo: {
     serviceMeta: {
       output,
@@ -84,27 +85,34 @@ describe('channel-FCM', () => {
 
   test('configure', async () => {
     mockChannelEnabledOutput.Enabled = true;
-    mockInquirer({ disableChannel: true });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(true);
+    prompterMock.input
+      .mockResolvedValueOnce(apiKey);
+
     const mockContextObj = mockContext(mockChannelEnabledOutput, mockPinpointClient);
     await channelFCM.configure(mockContextObj).then(() => {
       expect(mockPinpointClient.updateGcmChannel).toBeCalled();
     });
 
     mockChannelEnabledOutput.Enabled = true;
-    mockInquirer({ disableChannel: false });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(false);
     await channelFCM.configure(mockContext(mockChannelEnabledOutput, mockPinpointClient)).then(() => {
       expect(mockPinpointClient.updateGcmChannel).toBeCalled();
     });
 
     mockChannelEnabledOutput.Enabled = false;
-    mockInquirer({ enableChannel: true });
+    prompterMock.yesOrNo
+      .mockResolvedValueOnce(true);
     await channelFCM.configure(mockContext(mockChannelEnabledOutput, mockPinpointClient)).then(() => {
       expect(mockPinpointClient.updateGcmChannel).toBeCalled();
     });
   });
 
   test('enable', async () => {
-    mockInquirer({ ApiKey: 'ApiKey-abc123' });
+    prompterMock.input
+      .mockResolvedValueOnce(apiKey);
     const mockContextObj = mockContext(mockChannelEnabledOutput, mockPinpointClient);
     const data = await channelFCM.enable(mockContextObj, 'successMessage');
     expect(mockPinpointClient.updateGcmChannel).toBeCalled();
@@ -112,13 +120,14 @@ describe('channel-FCM', () => {
   });
 
   test('enable with newline', async () => {
-    mockInquirer({ ApiKey: 'ApiKey-abc123\n' });
+    prompterMock.input
+      .mockResolvedValueOnce(`${apiKey}\n`);
     const data = await channelFCM.enable(mockContext(mockChannelEnabledOutput, mockPinpointClient), 'successMessage');
     expect(mockPinpointClient.updateGcmChannel).toBeCalledWith(
       {
         ApplicationId: undefined,
         GCMChannelRequest: {
-          ApiKey: 'ApiKey-abc123',
+          ApiKey: apiKey,
           Enabled: true,
         },
       },
@@ -127,9 +136,13 @@ describe('channel-FCM', () => {
   });
 
   test('enable unsuccessful', async () => {
-    mockInquirer({ ApiKey: 'ApiKey-abc123' });
-    await expect(channelFCM.enable(mockContextReject(mockServiceOutput, mockPinpointClientReject), 'successMessage')).rejects.toThrowError('Failed to enable the FCM channel');
-    expect(mockPinpointClient.updateGcmChannel).toBeCalled();
+    prompterMock.input
+      .mockResolvedValueOnce(apiKey);
+
+    const context = mockContextReject(mockServiceOutput, mockPinpointClientReject);
+    const errCert: AmplifyFault = await getError(async () => channelFCM.enable(context as unknown as $TSContext, 'successMessage'));
+    expect(context.exeInfo.pinpointClient.updateGcmChannel).toBeCalled();
+    expect(errCert?.downstreamException?.message).toContain(mockPinpointResponseErr.message);
   });
 
   test('disable', async () => {
diff --git a/packages/amplify-category-notifications/src/apns-cert-config.ts b/packages/amplify-category-notifications/src/apns-cert-config.ts
index 7884aa6431c..bceaf698ae3 100644
--- a/packages/amplify-category-notifications/src/apns-cert-config.ts
+++ b/packages/amplify-category-notifications/src/apns-cert-config.ts
@@ -1,5 +1,5 @@
 import { $TSAny } from 'amplify-cli-core';
-import inquirer from 'inquirer';
+import { prompter } from 'amplify-prompts';
 import { run as p12decoderRun, ICertificateInfo } from './apns-cert-p12decoder';
 import { validateFilePath } from './validate-filepath';
 
@@ -11,20 +11,12 @@ export const run = async (channelInput: $TSAny): Promise<ICertificateInfo> => {
     return p12decoderRun(channelInput);
   }
 
-  const questions = [
-    {
-      name: 'P12FilePath',
-      type: 'input',
-      message: 'The certificate file path (.p12): ',
-      validate: validateFilePath,
-    },
-    {
-      name: 'P12FilePassword',
-      type: 'input',
-      message: 'The certificate password (if any): ',
-    },
-  ];
+  const p12FilePath = await prompter.input('The certificate file path (.p12): ', { validate: validateFilePath });
+  const p12FilePassword = await prompter.input('The certificate password (if any): ');
+  const answers = {
+    P12FilePath: p12FilePath,
+    P12FilePassword: p12FilePassword,
+  };
 
-  const answers = await inquirer.prompt(questions);
   return p12decoderRun(answers);
 };
diff --git a/packages/amplify-category-notifications/src/apns-key-config.ts b/packages/amplify-category-notifications/src/apns-key-config.ts
index 19f25c2c547..436d1df75d7 100644
--- a/packages/amplify-category-notifications/src/apns-key-config.ts
+++ b/packages/amplify-category-notifications/src/apns-key-config.ts
@@ -1,5 +1,5 @@
 import { $TSAny } from 'amplify-cli-core';
-import inquirer from 'inquirer';
+import { prompter } from 'amplify-prompts';
 import { validateFilePath } from './validate-filepath';
 import { run as p8decoderRun } from './apns-cert-p8decoder';
 /**
@@ -7,33 +7,21 @@ import { run as p8decoderRun } from './apns-cert-p8decoder';
  */
 export const run = async (channelInput: $TSAny) : Promise<$TSAny> => {
   let keyConfig;
+
   if (channelInput) {
     keyConfig = channelInput;
   } else {
-    const questions = [
-      {
-        name: 'BundleId',
-        type: 'input',
-        message: 'The bundle id used for APNs Tokens: ',
-      },
-      {
-        name: 'TeamId',
-        type: 'input',
-        message: 'The team id used for APNs Tokens: ',
-      },
-      {
-        name: 'TokenKeyId',
-        type: 'input',
-        message: 'The key id used for APNs Tokens: ',
-      },
-      {
-        name: 'P8FilePath',
-        type: 'input',
-        message: 'The key file path (.p8): ',
-        validate: validateFilePath,
-      },
-    ];
-    keyConfig = await inquirer.prompt(questions);
+    const bundleId = await prompter.input('The bundle id used for APNs Tokens: ');
+    const teamId = await prompter.input('The team id used for APNs Tokens: ');
+    const tokenKeyId = await prompter.input('The key id used for APNs Tokens: ');
+    const p8FilePath = await prompter.input('The key file path (.p8): ', { validate: validateFilePath });
+
+    keyConfig = {
+      BundleId: bundleId,
+      TeamId: teamId,
+      TokenKeyId: tokenKeyId,
+      P8FilePath: p8FilePath,
+    };
   }
 
   keyConfig.TokenKey = p8decoderRun(keyConfig.P8FilePath);
diff --git a/packages/amplify-category-notifications/src/channel-apns.ts b/packages/amplify-category-notifications/src/channel-apns.ts
index 8771fcce273..e33ace655e8 100644
--- a/packages/amplify-category-notifications/src/channel-apns.ts
+++ b/packages/amplify-category-notifications/src/channel-apns.ts
@@ -1,13 +1,11 @@
 /* eslint-disable no-param-reassign */
-/* eslint-disable spellcheck/spell-checker */
-import inquirer, { QuestionCollection } from 'inquirer';
 import ora from 'ora';
 import fs from 'fs-extra';
 import {
   $TSAny, $TSContext, AmplifyFault,
 } from 'amplify-cli-core';
 
-import { printer } from 'amplify-prompts';
+import { byValue, printer, prompter } from 'amplify-prompts';
 import * as configureKey from './apns-key-config';
 import * as configureCertificate from './apns-cert-config';
 import { ChannelAction, IChannelAPIResponse, ChannelConfigDeploymentType } from './channel-types';
@@ -26,26 +24,16 @@ export const configure = async (context: $TSContext): Promise<IChannelAPIRespons
   let response: IChannelAPIResponse|undefined;
   if (isChannelEnabled) {
     printer.info(`The ${channelName} channel is currently enabled`);
-    const answer = await inquirer.prompt({
-      name: 'disableChannel',
-      type: 'confirm',
-      message: `Do you want to disable the ${channelName} channel`,
-      default: false,
-    });
-    if (answer.disableChannel) {
+    const disableChannel = await prompter.yesOrNo(`Do you want to disable the ${channelName} channel`, false);
+    if (disableChannel) {
       response = await disable(context);
     } else {
       const successMessage = `The ${channelName} channel has been successfully updated.`;
       response = await enable(context, successMessage);
     }
   } else {
-    const answer = await inquirer.prompt({
-      name: 'enableChannel',
-      type: 'confirm',
-      message: `Do you want to enable the ${channelName} channel`,
-      default: true,
-    });
-    if (answer.enableChannel) {
+    const enableChannel = await prompter.yesOrNo(`Do you want to enable the ${channelName} channel`, true);
+    if (enableChannel) {
       response = await enable(context, undefined);
     }
   }
@@ -73,14 +61,14 @@ export const enable = async (context: $TSContext, successMessage: string | undef
     if (context.exeInfo.serviceMeta.output[channelName]) {
       channelOutput = context.exeInfo.serviceMeta.output[channelName];
     }
-    const question: QuestionCollection<{ [x: string]: unknown; }> = {
-      name: 'DefaultAuthenticationMethod',
-      type: 'list',
-      message: 'Choose authentication method used for APNs',
-      choices: ['Certificate', 'Key'],
-      default: channelOutput.DefaultAuthenticationMethod || 'Certificate',
+    const authMethod = await prompter.pick(
+      'Select the authentication method for the APNS channel',
+      ['Certificate', 'Key'],
+      { initial: byValue(channelOutput.DefaultAuthenticationMethod || 'Certificate') },
+    );
+    answers = {
+      DefaultAuthenticationMethod: authMethod,
     };
-    answers = await inquirer.prompt(question);
   }
 
   if (answers.DefaultAuthenticationMethod === 'Key') {
diff --git a/packages/amplify-category-notifications/src/channel-email.ts b/packages/amplify-category-notifications/src/channel-email.ts
index a08a0023cfc..930a780b6b7 100644
--- a/packages/amplify-category-notifications/src/channel-email.ts
+++ b/packages/amplify-category-notifications/src/channel-email.ts
@@ -1,10 +1,9 @@
 import {
   $TSAny, $TSContext, AmplifyError, AmplifyFault,
 } from 'amplify-cli-core';
-import { printer } from 'amplify-prompts';
+import { printer, prompter } from 'amplify-prompts';
 
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
-import inquirer from 'inquirer';
 import ora from 'ora';
 import { ChannelAction, ChannelConfigDeploymentType } from './channel-types';
 import { buildPinpointChannelResponseSuccess } from './pinpoint-helper';
@@ -22,26 +21,16 @@ export const configure = async (context: $TSContext):Promise<void> => {
 
   if (isChannelEnabled) {
     printer.info(`The ${channelName} channel is currently enabled`);
-    const answer = await inquirer.prompt({
-      name: 'disableChannel',
-      type: 'confirm',
-      message: `Do you want to disable the ${channelName} channel`,
-      default: false,
-    });
-    if (answer.disableChannel) {
+    const disableChannel = await prompter.yesOrNo(`Do you want to disable the ${channelName} channel`, false);
+    if (disableChannel) {
       await disable(context);
     } else {
       const successMessage = `The ${channelName} channel has been successfully updated.`;
       await enable(context, successMessage);
     }
   } else {
-    const answer = await inquirer.prompt({
-      name: 'enableChannel',
-      type: 'confirm',
-      message: `Do you want to enable the ${channelName} channel`,
-      default: true,
-    });
-    if (answer.enableChannel) {
+    const enableChannel = await prompter.yesOrNo(`Do you want to enable the ${channelName} channel`, true);
+    if (enableChannel) {
       await enable(context, undefined);
     }
   }
@@ -57,31 +46,15 @@ export const enable = async (context:$TSContext, successMessage: string|undefine
   if (context.exeInfo.pinpointInputParams?.[channelName]) {
     answers = validateInputParams(context.exeInfo.pinpointInputParams[channelName]);
   } else {
-    let channelOutput:$TSAny = {};
+    let channelOutput: $TSAny = {};
     if (context.exeInfo.serviceMeta.output[channelName]) {
       channelOutput = context.exeInfo.serviceMeta.output[channelName];
     }
-    const questions = [
-      {
-        name: 'FromAddress',
-        type: 'input',
-        message: "The 'From' Email address used to send emails",
-        default: channelOutput.FromAddress,
-      },
-      {
-        name: 'Identity',
-        type: 'input',
-        message: 'The ARN of an identity verified with SES',
-        default: channelOutput.Identity,
-      },
-      {
-        name: 'RoleArn',
-        type: 'input',
-        message: "The ARN of an IAM Role used to submit events to Mobile notifications' event ingestion service",
-        default: channelOutput.RoleArn,
-      },
-    ];
-    answers = await inquirer.prompt(questions);
+    answers = {
+      FromAddress: await prompter.input(`The 'From' Email address used to send emails`, { initial: channelOutput.FromAddress }),
+      Identity: await prompter.input('The ARN of an identity verified with SES', { initial: channelOutput.Identity }),
+      RoleArn: await prompter.input(`The ARN of an IAM Role used to submit events to Mobile notifications' event ingestion service`, { initial: channelOutput.RoleArn }),
+    };
   }
 
   const params = {
diff --git a/packages/amplify-category-notifications/src/channel-fcm.ts b/packages/amplify-category-notifications/src/channel-fcm.ts
index c613d92e423..a551d73fd79 100644
--- a/packages/amplify-category-notifications/src/channel-fcm.ts
+++ b/packages/amplify-category-notifications/src/channel-fcm.ts
@@ -1,8 +1,7 @@
 import {
   $TSAny, $TSContext, AmplifyError, AmplifyFault,
 } from 'amplify-cli-core';
-import { printer } from 'amplify-prompts';
-import inquirer from 'inquirer';
+import { printer, prompter } from 'amplify-prompts';
 import ora from 'ora';
 import { ChannelAction, ChannelConfigDeploymentType, IChannelAPIResponse } from './channel-types';
 import { buildPinpointChannelResponseSuccess } from './pinpoint-helper';
@@ -20,26 +19,16 @@ export const configure = async (context: $TSContext): Promise<void> => {
 
   if (isChannelEnabled) {
     printer.info(`The ${channelName} channel is currently enabled`);
-    const answer = await inquirer.prompt({
-      name: 'disableChannel',
-      type: 'confirm',
-      message: `Do you want to disable the ${channelName} channel`,
-      default: false,
-    });
-    if (answer.disableChannel) {
+    const disableChannel = await prompter.yesOrNo(`Do you want to disable the ${channelName} channel`, false);
+    if (disableChannel) {
       await disable(context);
     } else {
       const successMessage = `The ${channelName} channel has been successfully updated.`;
       await enable(context, successMessage);
     }
   } else {
-    const answer = await inquirer.prompt({
-      name: 'enableChannel',
-      type: 'confirm',
-      message: `Do you want to enable the ${channelName} channel`,
-      default: true,
-    });
-    if (answer.enableChannel) {
+    const enableChannel = await prompter.yesOrNo(`Do you want to enable the ${channelName} channel`, true);
+    if (enableChannel) {
       await enable(context, undefined);
     }
   }
@@ -59,15 +48,9 @@ export const enable = async (context: $TSContext, successMessage: string | undef
     if (context.exeInfo.serviceMeta.output[channelName]) {
       channelOutput = context.exeInfo.serviceMeta.output[channelName];
     }
-    const questions = [
-      {
-        name: 'ApiKey',
-        type: 'input',
-        message: 'ApiKey',
-        default: channelOutput.ApiKey,
-      },
-    ];
-    answers = trimAnswers(await inquirer.prompt(questions));
+    answers = {
+      ApiKey: await prompter.input('ApiKey', { initial: channelOutput.ApiKey, transform: input => input.trim() }),
+    };
   }
 
   const params = {
@@ -121,15 +104,9 @@ export const disable = async (context: $TSContext): Promise<$TSAny> => {
     if (context.exeInfo.serviceMeta.output[channelName]) {
       channelOutput = context.exeInfo.serviceMeta.output[channelName];
     }
-    const questions = [
-      {
-        name: 'ApiKey',
-        type: 'input',
-        message: 'ApiKey',
-        default: channelOutput.ApiKey,
-      },
-    ];
-    answers = trimAnswers(await inquirer.prompt(questions));
+    answers = {
+      ApiKey: await prompter.input('ApiKey', { initial: channelOutput.ApiKey, transform: input => input.trim() }),
+    };
   }
 
   const params = {
@@ -183,13 +160,3 @@ export const pull = async (context: $TSContext, pinpointApp: $TSAny):Promise<$TS
     return undefined;
   }
 };
-
-const trimAnswers = (answers: Record<string, $TSAny>): Record<string, $TSAny> => {
-  for (const [key, value] of Object.entries(answers)) {
-    if (typeof answers[key] === 'string') {
-      // eslint-disable-next-line no-param-reassign
-      answers[key] = value.trim();
-    }
-  }
-  return answers;
-};
diff --git a/packages/amplify-category-notifications/src/channel-sms.ts b/packages/amplify-category-notifications/src/channel-sms.ts
index de108b51402..2b23db7adb5 100644
--- a/packages/amplify-category-notifications/src/channel-sms.ts
+++ b/packages/amplify-category-notifications/src/channel-sms.ts
@@ -1,7 +1,6 @@
 import { $TSAny, $TSContext, AmplifyFault } from 'amplify-cli-core';
-import inquirer from 'inquirer';
 import ora from 'ora';
-import { printer } from 'amplify-prompts';
+import { printer, prompter } from 'amplify-prompts';
 import { ChannelAction, ChannelConfigDeploymentType } from './channel-types';
 import { buildPinpointChannelResponseSuccess } from './pinpoint-helper';
 
@@ -18,23 +17,13 @@ export const configure = async (context : $TSContext):Promise<void> => {
 
   if (isChannelEnabled) {
     printer.info(`The ${channelName} channel is currently enabled`);
-    const answer = await inquirer.prompt({
-      name: 'disableChannel',
-      type: 'confirm',
-      message: `Do you want to disable the ${channelName} channel`,
-      default: false,
-    });
-    if (answer.disableChannel) {
+    const disableChannel = await prompter.yesOrNo(`Do you want to disable the ${channelName} channel`, false);
+    if (disableChannel) {
       await disable(context);
     }
   } else {
-    const answer = await inquirer.prompt({
-      name: 'enableChannel',
-      type: 'confirm',
-      message: `Do you want to enable the ${channelName} channel`,
-      default: true,
-    });
-    if (answer.enableChannel) {
+    const enableChannel = await prompter.yesOrNo(`Do you want to enable the ${channelName} channel`, true);
+    if (enableChannel) {
       await enable(context);
     }
   }
diff --git a/packages/amplify-category-notifications/src/validate-filepath.ts b/packages/amplify-category-notifications/src/validate-filepath.ts
index 1e817f6645e..c4c5974bd5b 100644
--- a/packages/amplify-category-notifications/src/validate-filepath.ts
+++ b/packages/amplify-category-notifications/src/validate-filepath.ts
@@ -5,10 +5,9 @@ import * as fs from 'fs-extra';
  * @param filePath - path to file
  * @returns true on success
  */
-export const validateFilePath = (filePath: string): boolean|string => {
-  let result = false;
-  if (filePath) {
-    result = fs.existsSync(filePath);
+export const validateFilePath = (filePath: string): string | true => {
+  if (filePath && fs.existsSync(filePath)) {
+    return true;
   }
-  return result || 'file path must be valid';
+  return 'file path must be valid';
 };

From e01894e5b3ed71163e647ada63515d8de8aa3d92 Mon Sep 17 00:00:00 2001
From: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Date: Wed, 16 Nov 2022 18:58:42 -0500
Subject: [PATCH 03/30] fix: suppress errors when browser launch fails (#11406)

* fix: catch failure to launch browser and redirect to use login key

* chore: replace ora with amplify spinner from prompts module

* test: add unit test to detect that spinner starts and stops with launch error

* chore: change sync promise to sync try/catch, add info log with login url to catch

* fix: change wording in message
---
 .../src/__tests__/admin-login.test.ts         | 54 +++++++++++++++++++
 .../src/admin-login.ts                        | 21 +++++---
 2 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 packages/amplify-provider-awscloudformation/src/__tests__/admin-login.test.ts

diff --git a/packages/amplify-provider-awscloudformation/src/__tests__/admin-login.test.ts b/packages/amplify-provider-awscloudformation/src/__tests__/admin-login.test.ts
new file mode 100644
index 00000000000..5cbc3527872
--- /dev/null
+++ b/packages/amplify-provider-awscloudformation/src/__tests__/admin-login.test.ts
@@ -0,0 +1,54 @@
+import { $TSContext } from 'amplify-cli-core';
+import { adminLoginFlow } from '../admin-login';
+import { AmplifySpinner } from 'amplify-prompts';
+
+jest.mock('amplify-cli-core', () => {
+  return {
+    open: jest.fn().mockReturnValue(Promise.reject('some spawn error')),
+  }
+});
+
+jest.mock('../utils/admin-login-server', () => {
+  return {
+    AdminLoginServer: jest.fn().mockReturnValue({
+      startServer: jest.fn().mockImplementation((callback) => {
+        callback();
+      }),
+      shutdown: jest.fn(),
+    })
+  }
+});
+
+describe('adminLoginFlow', () => {
+  let contextStub: $TSContext;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    contextStub = ({
+      amplify: {
+        getEnvInfo: () => {
+          return {
+            envName: 'dev'
+          }
+        }
+      },
+    } as unknown) as $TSContext;
+  });
+
+  it('catches errors when fails to launch browser', async () => {
+    const appId = 'appid';
+    const region = 'us-east-2';
+
+    const spinnerStartMock = jest.spyOn(AmplifySpinner.prototype, 'start');
+    const spinnerStopMock = jest.spyOn(AmplifySpinner.prototype, 'stop');
+
+    await adminLoginFlow(contextStub, appId, undefined, region);
+
+    expect(spinnerStartMock).toBeCalledTimes(1);
+    expect(spinnerStartMock).toBeCalledWith('Manually enter your CLI login key:\n');
+
+    expect(spinnerStopMock).toBeCalledTimes(1);
+    expect(spinnerStopMock).toBeCalledWith("Successfully received Amplify Studio tokens.");
+  });
+});
diff --git a/packages/amplify-provider-awscloudformation/src/admin-login.ts b/packages/amplify-provider-awscloudformation/src/admin-login.ts
index de6fe2a5448..cb62b0d1301 100644
--- a/packages/amplify-provider-awscloudformation/src/admin-login.ts
+++ b/packages/amplify-provider-awscloudformation/src/admin-login.ts
@@ -1,11 +1,10 @@
-import ora from 'ora';
 import util from 'util';
 import readline from 'readline';
 import { Writable } from 'stream';
 import {
   $TSContext, AmplifyError, AMPLIFY_DOCS_URL, open,
 } from 'amplify-cli-core';
-import { printer } from 'amplify-prompts';
+import { printer, AmplifySpinner } from 'amplify-prompts';
 import { adminVerifyUrl, adminBackendMap, isAmplifyAdminApp } from './utils/admin-helpers';  // eslint-disable-line
 import { AdminLoginServer } from './utils/admin-login-server';
 import { AdminAuthPayload } from './utils/auth-types';
@@ -27,11 +26,16 @@ export const adminLoginFlow = async (context: $TSContext, appId: string, envName
   }
 
   const url = adminVerifyUrl(appId, envName, region);
-  printer.info(`Opening link: ${url}`);
-  await open(url, { wait: false }).catch(e => {
-    printer.error(`Failed to open web browser: ${e?.message || e}`);
-  });
-  const spinner = ora('Confirm login in the browser or manually paste in your CLI login key:\n').start();
+  const spinner = new AmplifySpinner();
+
+  try {
+    await open(url, { wait: false });
+    printer.info(`Opening link: ${url}`);
+    spinner.start('Confirm login in the browser or manually paste in your CLI login key:\n');
+  } catch(_) {
+    printer.info(`Could not open ${url} in the current environment`)
+    spinner.start('Manually enter your CLI login key:\n');
+  }
 
   try {
     // spawn express server locally to get credentials
@@ -122,7 +126,8 @@ export const adminLoginFlow = async (context: $TSContext, appId: string, envName
         cancelGetTokenViaServer();
         cancelGetTokenViaPrompt();
       });
-    spinner.succeed('Successfully received Amplify Studio tokens.');
+
+    spinner.stop('Successfully received Amplify Studio tokens.');
   } catch (e) {
     spinner.stop();
     printer.error(`Failed to authenticate with Amplify Studio: ${e?.message || e}`);

From 1a133377ea9d9deb05827457f35c0e9b6092477b Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Wed, 16 Nov 2022 18:17:36 -0800
Subject: [PATCH 04/30] chore: updated pagination to ensure account selection
 (#11418)

---
 packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
index c52f0fb2546..04783eb1709 100644
--- a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
+++ b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
@@ -624,7 +624,14 @@ const getAccountsToCleanup = async (): Promise<AWSAccountInfo[]> => {
   });
   try {
     const orgAccounts = await orgApi.listAccounts().promise();
-    const accountCredentialPromises = orgAccounts.Accounts.map(async account => {
+    const allAccounts = orgAccounts.Accounts;
+    let nextToken = orgAccounts.NextToken;
+    while(nextToken){
+      const nextPage = await orgApi.listAccounts({"NextToken": nextToken }).promise();
+      allAccounts.push(...nextPage.Accounts);
+      nextToken = nextPage.NextToken;
+    }
+    const accountCredentialPromises = allAccounts.map(async account => {
       if (account.Id === parentAccountIdentity.Account) {
         return {
           accessKeyId: process.env.AWS_ACCESS_KEY_ID,

From 5c4104686a1e2ac96a25c02ffec40f34cea70769 Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Wed, 16 Nov 2022 19:57:58 -0800
Subject: [PATCH 05/30] fix: add human readable names to artifact files
 (#11420)

---
 .../amplify-e2e-core/src/nexpect-reporter.js    | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/amplify-e2e-core/src/nexpect-reporter.js b/packages/amplify-e2e-core/src/nexpect-reporter.js
index 3391e9f2b04..4ce3366afee 100644
--- a/packages/amplify-e2e-core/src/nexpect-reporter.js
+++ b/packages/amplify-e2e-core/src/nexpect-reporter.js
@@ -64,15 +64,28 @@ class AmplifyCLIExecutionReporter {
     fs.ensureDirSync(publicPath);
 
     const processedResults = results.testResults.map(result => {
+      // result is Array of TestResult: https://github.com/facebook/jest/blob/ac57282299c383320845fb9a026719de7ed3ee5e/packages/jest-test-result/src/types.ts#L90
       const resultCopy = { ...result };
       delete resultCopy.CLITestRunner;
       return {
         ...resultCopy,
+        // each test result has an array of 'AssertionResult'
         testResults: result.testResults.map(r => {
           const recordings = mergeCliLog(r, result.CLITestRunner.logs.children, r.ancestorTitles);
 
-          const recordingWithPath = recordings.map(r => {
-            const castFile = `${uuid()}.cast`;
+          const recordingWithPath = recordings.map((r, index) => {
+            // the first command is always 'amplify', but r.cmd is the full path to the cli.. so this is more readable
+            const commandAndParams = ['amplify'];
+            if(r.params){
+              commandAndParams.push(...r.params);
+            }
+            let sanitizedSections = [];
+            for(let section of commandAndParams){
+              // this ensures only alphanumeric values are in the file name
+              sanitizedSections.push(section.replace(/[^a-z0-9]/gi, '_').toLowerCase());
+            }
+            const suffix = sanitizedSections.join('_');
+            const castFile = `${new Date().getTime()}_${index}_${suffix}.cast`;
             const castFilePath = path.join(publicPath, castFile);
             fs.writeFileSync(castFilePath, r.recording);
             const rCopy = { ...r };

From 6ec60136922b2b9e2e1b68ef83574b0431330b9d Mon Sep 17 00:00:00 2001
From: josef <josef.aidt@gmail.com>
Date: Thu, 17 Nov 2022 07:20:50 -0800
Subject: [PATCH 06/30] chore(e2e): add babel project tests (#11054)

* chore(e2e): add babel project tests

* chore(e2e): add e2e-core as a devDependency

* chore(e2e): improve test description

* chore: hardcoded workspace package version

* chore(amplify-e2e-tests): move initProject to beforeAll, add assertion
---
 .../src/__tests__/with-babel-config.test.ts   | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/with-babel-config.test.ts

diff --git a/packages/amplify-e2e-tests/src/__tests__/with-babel-config.test.ts b/packages/amplify-e2e-tests/src/__tests__/with-babel-config.test.ts
new file mode 100644
index 00000000000..4800356b0bd
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/with-babel-config.test.ts
@@ -0,0 +1,61 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { spawnSync } from 'child_process';
+import {
+  initJSProjectWithProfile,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  nspawn as spawn,
+  getCLIPath,
+} from '@aws-amplify/amplify-e2e-core';
+
+describe('project with babel config', () => {
+  let projectRoot: string;
+  let packageJsonPath: string;
+  let babelConfigPath: string;
+  const projName = 'withBabelConfig';
+  const envName = 'dev';
+
+  beforeAll(async () => {
+    projectRoot = await createNewProjectDir(projName);
+    packageJsonPath = path.join(projectRoot, 'package.json');
+    babelConfigPath = path.join(projectRoot, 'babel.config.json');
+
+    // write package.json
+    const packageJson = {
+      name: projName,
+      version: '0.1.0',
+      private: true,
+      devDependencies: {
+        '@babel/core': '^7.19.1',
+      },
+    };
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+
+    // write babel config
+    const babelConfig = {
+      presets: ['es2015'],
+    };
+    fs.writeFileSync(babelConfigPath, JSON.stringify(babelConfig, null, 2));
+
+    // install babel dependencies
+    spawnSync('npm', ['install'], { cwd: projectRoot });
+
+    // init project
+    await initJSProjectWithProfile(projectRoot, { name: projName, envName });
+  });
+
+  afterAll(async () => {
+    await deleteProject(projectRoot);
+    deleteProjectDir(projectRoot);
+  });
+
+  /**
+   * This test is to ensure the CLI is able to read aws-exports.js when a babel config file is present
+   * @see {module:@aws-amplify/amplify-frontend-javascript/lib/frontend-config-creator.js:getCurrentAWSExports}
+   */
+  it('should be able to checkout env (reads aws-exports)', async () => {
+    expect(() => spawn(getCLIPath(), ['env', 'checkout', envName], { cwd: projectRoot, stripColors: true })).not.toThrow();
+  });
+});

From 0c05c631a49930d642e7e182ad699e4bf077b068 Mon Sep 17 00:00:00 2001
From: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Date: Thu, 17 Nov 2022 10:21:23 -0500
Subject: [PATCH 07/30] docs: add recommendation of pull request breakdown to
 contributing guides (#11412)

---
 CONTRIBUTING.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a45160b30f9..b528fa627ae 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -102,7 +102,7 @@ and print out errors that need manual attention.
 
 Pull requests are welcome!
 
-You should open an issue to discuss your pull request, unless it's a trivial change. It's best to ensure that your proposed change would be accepted so that you don't waste your own time. If you would like to implement support for a significant feature that is not yet available, please talk to us beforehand to avoid any duplication of effort.
+You should open an issue to discuss your pull request, unless it's a trivial change. It's best to ensure that your proposed change would be accepted so that you don't waste your own time. If you would like to implement support for a significant feature that is not yet available, please talk to us beforehand to avoid any duplication of effort. Additionally, please be mindful of the length of the pull request - if your change requires more than 12 file changes, consider breaking the change down into smaller, non-dependent changes. This includes any changes that may be added as a result of the linter.
 
 Pull requests should be opened against **_dev_**.
 
@@ -135,7 +135,6 @@ When filing a bug, please try to be as detailed as possible. In addition to the
 - Any modifications you've made relevant to the bug
 - Anything unusual about your environment or deployment
 
-
 Guidelines for bug reports:
 
 - Check to see if a [duplicate or closed issue](https://github.com/aws-amplify/amplify-cli/issues?q=is%3Aissue+) already exists!
@@ -144,10 +143,8 @@ Guidelines for bug reports:
 - Format any code snippets using [Markdown](https://docs.github.com/en/github/writing-on-github/creating-and-highlighting-code-blocks) syntax
 - If you're not using the latest version of the CLI, see if the issue still persists after upgrading - this helps to isolate regressions!
 
-
 Finally, thank you for taking the time to read this, and taking the time to write a good bug report.
 
-
 ## Commits
 
 Commit messages should follow the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) specification. For example:
@@ -165,6 +162,7 @@ Valid commit types are as follows:
 - `refactor`
 - `style`
 - `test`
+
 ### Git Hooks
 
 You will notice the extra actions carried out when you run the `git commit` or `git push` commands on this monorepo, that's because the following git hooks are configured using [husky](https://github.com/typicode/husky/tree/main) (you can see them in the root [package.json](https://github.com/aws-amplify/amplify-cli/blob/f2ac2b27b6b0dbf0c52edbc696c35b71f539c944/package.json#L61) file):
@@ -192,6 +190,7 @@ The "pre-commit" hook runs the [verify-commit](https://github.com/aws-amplify/am
 #### "pre-push" hook:
 
 The "pre-push" hook will build test files and run the  `split-e2e-tests` script to ensure the correct configuration file is generated for our CICD workflow.
+
 ## Tests
 
 Please ensure that your change still passes unit tests, and ideally integration/UI tests. It's OK if you're still working on tests at the time that you submit, but be prepared to be asked about them. Wherever possible, pull requests should contain tests as appropriate. Bugfixes should contain tests that exercise the corrected behavior (i.e., the test should fail without the bugfix and pass with it), and new features should be accompanied by tests exercising the feature.

From 72f67c4a7c9b7acd9dec3cb2396813af6ef39e81 Mon Sep 17 00:00:00 2001
From: aws-amplify-bot <aws@amazon.com>
Date: Thu, 17 Nov 2022 17:49:53 +0000
Subject: [PATCH 08/30] chore(release): Publish latest [ci skip]

 - amplify-app@4.3.5
 - @aws-amplify/amplify-appsync-simulator@2.8.0
 - amplify-category-analytics@4.2.1
 - @aws-amplify/amplify-category-auth@2.13.1
 - @aws-amplify/amplify-category-custom@2.5.5
 - amplify-category-function@4.2.1
 - amplify-category-geo@2.10.0
 - amplify-category-hosting@3.4.5
 - amplify-category-interactions@4.1.5
 - amplify-category-notifications@2.21.1
 - amplify-category-predictions@4.2.1
 - @aws-amplify/amplify-category-storage@3.6.1
 - amplify-category-xr@3.3.5
 - amplify-cli-core@3.4.0
 - @aws-amplify/cli-extensibility-helper@2.4.5
 - @aws-amplify/cli@10.5.0
 - @aws-amplify/cli-internal@10.5.0
 - amplify-console-hosting@2.3.5
 - @aws-amplify/amplify-console-integration-tests@2.6.0
 - amplify-container-hosting@2.5.6
 - amplify-dotnet-function-template-provider@2.3.5
 - amplify-dynamodb-simulator@2.5.1
 - @aws-amplify/amplify-e2e-core@4.5.0
 - amplify-e2e-tests@3.15.0
 - @aws-amplify/amplify-environment-parameters@1.2.1
 - amplify-frontend-ios@3.5.5
 - amplify-frontend-javascript@3.7.1
 - amplify-go-function-runtime-provider@2.3.5
 - @aws-amplify/amplify-graphiql-explorer@2.5.1
 - amplify-graphql-migration-tests@2.3.4
 - amplify-headless-interface@1.16.0
 - amplify-java-function-runtime-provider@2.3.5
 - @aws-amplify/amplify-migration-tests@5.2.1
 - amplify-nodejs-function-runtime-provider@2.3.5
 - amplify-nodejs-function-template-provider@2.6.0
 - @aws-amplify/amplify-opensearch-simulator@1.1.0
 - amplify-prompts@2.6.1
 - amplify-provider-awscloudformation@6.9.1
 - amplify-python-function-runtime-provider@2.4.5
 - amplify-util-headless-input@1.9.7
 - amplify-util-mock@4.7.0
 - @aws-amplify/amplify-util-uibuilder@1.6.1
---
 packages/amplify-app/CHANGELOG.md             |  8 +++
 packages/amplify-app/package.json             |  6 +-
 .../amplify-appsync-simulator/CHANGELOG.md    | 17 ++++++
 .../amplify-appsync-simulator/package.json    | 10 ++--
 .../amplify-category-analytics/CHANGELOG.md   | 11 ++++
 .../amplify-category-analytics/package.json   |  8 +--
 packages/amplify-category-auth/CHANGELOG.md   | 11 ++++
 packages/amplify-category-auth/package.json   | 14 ++---
 packages/amplify-category-custom/CHANGELOG.md |  8 +++
 packages/amplify-category-custom/package.json |  6 +-
 .../amplify-category-function/CHANGELOG.md    |  8 +++
 .../amplify-category-function/package.json    |  8 +--
 packages/amplify-category-geo/CHANGELOG.md    | 11 ++++
 packages/amplify-category-geo/package.json    | 10 ++--
 .../amplify-category-hosting/CHANGELOG.md     |  8 +++
 .../amplify-category-hosting/package.json     |  4 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../CHANGELOG.md                              | 11 ++++
 .../package.json                              |  8 +--
 .../amplify-category-predictions/CHANGELOG.md |  8 +++
 .../amplify-category-predictions/package.json |  4 +-
 .../amplify-category-storage/CHANGELOG.md     |  8 +++
 .../amplify-category-storage/package.json     | 12 ++--
 packages/amplify-category-xr/CHANGELOG.md     |  8 +++
 packages/amplify-category-xr/package.json     |  4 +-
 packages/amplify-cli-core/CHANGELOG.md        | 26 +++++++++
 packages/amplify-cli-core/package.json        |  4 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  6 +-
 packages/amplify-cli-npm/CHANGELOG.md         | 11 ++++
 packages/amplify-cli-npm/package.json         |  4 +-
 packages/amplify-cli/CHANGELOG.md             | 32 ++++++++++
 packages/amplify-cli/package.json             | 58 +++++++++----------
 packages/amplify-console-hosting/CHANGELOG.md |  8 +++
 packages/amplify-console-hosting/package.json |  6 +-
 .../CHANGELOG.md                              | 17 ++++++
 .../package.json                              |  6 +-
 .../amplify-container-hosting/CHANGELOG.md    |  8 +++
 .../amplify-container-hosting/package.json    |  4 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../amplify-dynamodb-simulator/CHANGELOG.md   |  8 +++
 .../amplify-dynamodb-simulator/package.json   |  4 +-
 packages/amplify-e2e-core/CHANGELOG.md        | 20 +++++++
 packages/amplify-e2e-core/package.json        |  6 +-
 packages/amplify-e2e-tests/CHANGELOG.md       | 21 +++++++
 packages/amplify-e2e-tests/package.json       | 14 ++---
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 packages/amplify-frontend-ios/CHANGELOG.md    |  8 +++
 packages/amplify-frontend-ios/package.json    |  4 +-
 .../amplify-frontend-javascript/CHANGELOG.md  |  8 +++
 .../amplify-frontend-javascript/package.json  |  4 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../amplify-graphiql-explorer/CHANGELOG.md    |  8 +++
 .../amplify-graphiql-explorer/package.json    |  2 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../amplify-headless-interface/CHANGELOG.md   | 12 ++++
 .../amplify-headless-interface/package.json   |  2 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 packages/amplify-migration-tests/CHANGELOG.md |  8 +++
 packages/amplify-migration-tests/package.json |  4 +-
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../CHANGELOG.md                              | 11 ++++
 .../package.json                              |  4 +-
 .../amplify-opensearch-simulator/CHANGELOG.md | 17 ++++++
 .../amplify-opensearch-simulator/package.json |  8 +--
 packages/amplify-prompts/CHANGELOG.md         |  8 +++
 packages/amplify-prompts/package.json         |  2 +-
 .../CHANGELOG.md                              | 17 ++++++
 .../package.json                              | 12 ++--
 .../CHANGELOG.md                              |  8 +++
 .../package.json                              |  4 +-
 .../amplify-util-headless-input/CHANGELOG.md  |  8 +++
 .../amplify-util-headless-input/package.json  |  4 +-
 packages/amplify-util-mock/CHANGELOG.md       | 21 +++++++
 packages/amplify-util-mock/package.json       | 20 +++----
 packages/amplify-util-uibuilder/CHANGELOG.md  | 11 ++++
 packages/amplify-util-uibuilder/package.json  |  6 +-
 84 files changed, 632 insertions(+), 155 deletions(-)
 create mode 100644 packages/amplify-opensearch-simulator/CHANGELOG.md

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
index d7c66358ea4..9877e7e6016 100644
--- a/packages/amplify-app/CHANGELOG.md
+++ b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@4.3.4...amplify-app@4.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [4.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@4.3.3...amplify-app@4.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-app
diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
index bfc3f5f4ea9..4eb1e75f61f 100644
--- a/packages/amplify-app/package.json
+++ b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "3.4.0",
     "amplify-frontend-flutter": "1.3.5",
-    "amplify-frontend-ios": "3.5.4",
-    "amplify-frontend-javascript": "3.7.0",
+    "amplify-frontend-ios": "3.5.5",
+    "amplify-frontend-javascript": "3.7.1",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
index d2e03c234ea..a2ae7b0a23d 100644
--- a/packages/amplify-appsync-simulator/CHANGELOG.md
+++ b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.8.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.7.0...@aws-amplify/amplify-appsync-simulator@2.8.0) (2022-11-17)
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-cli/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-cli/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-cli/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-cli/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-cli/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-cli/issues/11089) [#11324](https://github.com/aws-amplify/amplify-cli/issues/11324)
+
+
+
+
+
 # [2.7.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-appsync-simulator@2.6.2...@aws-amplify/amplify-appsync-simulator@2.7.0) (2022-10-27)
 
 
diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
index cf94339fd99..2f84f1552aa 100644
--- a/packages/amplify-appsync-simulator/package.json
+++ b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "test": "jest --logHeapUsage --forceExit"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "amplify-velocity-template": "1.4.8",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
@@ -57,7 +57,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.0",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.1",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",
@@ -85,4 +85,4 @@
       "node"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/CHANGELOG.md
index 2809e00fd3f..ae63ce50382 100644
--- a/packages/amplify-category-analytics/CHANGELOG.md
+++ b/packages/amplify-category-analytics/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@4.2.0...amplify-category-analytics@4.2.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* add function access to analytics ([#11276](https://github.com/aws-amplify/amplify-cli/issues/11276)) ([3939d41](https://github.com/aws-amplify/amplify-cli/commit/3939d41b2aca6cf64bd0a36a32ff0d45ae954eaf))
+
+
+
+
+
 # [4.2.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@4.1.3...amplify-category-analytics@4.2.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
index 4e6e71fa20d..82fa95c9179 100644
--- a/packages/amplify-category-analytics/package.json
+++ b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-analytics",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -21,9 +21,9 @@
     "test": "jest --logHeapUsage"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "uuid": "^8.3.2"
diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
index 62ca829d6f7..d02089565ab 100644
--- a/packages/amplify-category-auth/CHANGELOG.md
+++ b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.13.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@2.13.0...@aws-amplify/amplify-category-auth@2.13.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* uploading multiple auth trigger files ([#11254](https://github.com/aws-amplify/amplify-cli/issues/11254)) ([#11267](https://github.com/aws-amplify/amplify-cli/issues/11267)) ([b7bdcec](https://github.com/aws-amplify/amplify-cli/commit/b7bdcec939ac71c4f70ae87ece8c2a7995d4ae72))
+
+
+
+
+
 # [2.13.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-auth@2.12.4...@aws-amplify/amplify-category-auth@2.13.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
index 86dc6ac3d5a..9c07d15e30c 100644
--- a/packages/amplify-category-auth/package.json
+++ b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -27,16 +27,16 @@
     "generateSchemas": "ts-node ./scripts/generateAuthSchemas.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "@aws-amplify/cli-extensibility-helper": "2.4.4",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "@aws-amplify/cli-extensibility-helper": "2.4.5",
     "@aws-cdk/aws-cognito": "~1.172.0",
     "@aws-cdk/aws-iam": "~1.172.0",
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
-    "amplify-cli-core": "3.3.0",
-    "amplify-headless-interface": "1.15.0",
-    "amplify-prompts": "2.6.0",
-    "amplify-util-headless-input": "1.9.6",
+    "amplify-cli-core": "3.4.0",
+    "amplify-headless-interface": "1.16.0",
+    "amplify-prompts": "2.6.1",
+    "amplify-util-headless-input": "1.9.7",
     "amplify-util-import": "2.3.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-category-custom/CHANGELOG.md b/packages/amplify-category-custom/CHANGELOG.md
index d5a387d11fa..a8fd7cb0c27 100644
--- a/packages/amplify-category-custom/CHANGELOG.md
+++ b/packages/amplify-category-custom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-custom@2.5.4...@aws-amplify/amplify-category-custom@2.5.5) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
 ## [2.5.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-custom@2.5.3...@aws-amplify/amplify-category-custom@2.5.4) (2022-10-27)
 
 **Note:** Version bump only for package @aws-amplify/amplify-category-custom
diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
index 3533d3866c7..fb972e121cf 100644
--- a/packages/amplify-category-custom/package.json
+++ b/packages/amplify-category-custom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-custom",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "access": "public"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "glob": "^7.2.0",
diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
index 8172c30b06f..d467ebc69be 100644
--- a/packages/amplify-category-function/CHANGELOG.md
+++ b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-function@4.2.0...amplify-category-function@4.2.1) (2022-11-17)
+
+**Note:** Version bump only for package amplify-category-function
+
+
+
+
+
 # [4.2.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-function@4.1.3...amplify-category-function@4.2.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
index 924447d8314..3c729acce27 100644
--- a/packages/amplify-category-function/package.json
+++ b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-function",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -22,10 +22,10 @@
     "aws"
   ],
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "amplify-cli-core": "3.3.0",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
-    "amplify-prompts": "2.6.0",
+    "amplify-prompts": "2.6.1",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-category-geo/CHANGELOG.md b/packages/amplify-category-geo/CHANGELOG.md
index 62a983634cc..db5847d5e0b 100644
--- a/packages/amplify-category-geo/CHANGELOG.md
+++ b/packages/amplify-category-geo/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.10.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-geo@2.9.0...amplify-category-geo@2.10.0) (2022-11-17)
+
+
+### Features
+
+* **category-geo:** add two new map styles 2022.10 ([#11262](https://github.com/aws-amplify/amplify-cli/issues/11262)) ([77a473e](https://github.com/aws-amplify/amplify-cli/commit/77a473ed78a945681d98b2c14822474aef966dcf))
+
+
+
+
+
 # [2.9.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-geo@2.8.3...amplify-category-geo@2.9.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
index 05d7508910e..92adbd8e329 100644
--- a/packages/amplify-category-geo/package.json
+++ b/packages/amplify-category-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-geo",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
     "ajv": "^6.12.6",
-    "amplify-cli-core": "3.3.0",
-    "amplify-headless-interface": "1.15.0",
-    "amplify-prompts": "2.6.0",
-    "amplify-util-headless-input": "1.9.6",
+    "amplify-cli-core": "3.4.0",
+    "amplify-headless-interface": "1.16.0",
+    "amplify-prompts": "2.6.1",
+    "amplify-util-headless-input": "1.9.7",
     "aws-sdk": "^2.1233.0",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/CHANGELOG.md
index c58b66bbcaa..c1fe425f861 100644
--- a/packages/amplify-category-hosting/CHANGELOG.md
+++ b/packages/amplify-category-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.4.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-hosting@3.4.4...amplify-category-hosting@3.4.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-category-hosting
+
+
+
+
+
 ## [3.4.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-hosting@3.4.3...amplify-category-hosting@3.4.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-category-hosting
diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json
index bbc26c35a6b..f4e4d5f4db7 100644
--- a/packages/amplify-category-hosting/package.json
+++ b/packages/amplify-category-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-hosting",
-  "version": "3.4.4",
+  "version": "3.4.5",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "test": "jest --logHeapUsage --coverage"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
diff --git a/packages/amplify-category-interactions/CHANGELOG.md b/packages/amplify-category-interactions/CHANGELOG.md
index 9b287fa3e76..eb02e815e6e 100644
--- a/packages/amplify-category-interactions/CHANGELOG.md
+++ b/packages/amplify-category-interactions/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.1.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-interactions@4.1.4...amplify-category-interactions@4.1.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-category-interactions
+
+
+
+
+
 ## [4.1.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-interactions@4.1.3...amplify-category-interactions@4.1.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-category-interactions
diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json
index 79d56956625..c7310ee190f 100644
--- a/packages/amplify-category-interactions/package.json
+++ b/packages/amplify-category-interactions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-interactions",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "description": "amplify-cli interactions plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && yarn copyfiles -u 4 src/provider-utils/awscloudformation/function-template-dir/*.ejs lib/provider-utils/awscloudformation/function-template-dir/"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "fs-extra": "^8.1.0",
     "fuzzy": "^0.1.3",
     "inquirer": "^7.3.3",
diff --git a/packages/amplify-category-notifications/CHANGELOG.md b/packages/amplify-category-notifications/CHANGELOG.md
index db671acf332..77974ba0ce5 100644
--- a/packages/amplify-category-notifications/CHANGELOG.md
+++ b/packages/amplify-category-notifications/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.21.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-notifications@2.21.0...amplify-category-notifications@2.21.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* trigger analytics migration on update/configure notifications ([#11285](https://github.com/aws-amplify/amplify-cli/issues/11285)) ([0972ef9](https://github.com/aws-amplify/amplify-cli/commit/0972ef9d10e86871d9fa6ca737c20399adf9b6f3))
+
+
+
+
+
 # [2.21.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-notifications@2.20.3...amplify-category-notifications@2.21.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json
index 517a04b6ad7..c9511ffe2aa 100644
--- a/packages/amplify-category-notifications/package.json
+++ b/packages/amplify-category-notifications/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-notifications",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "description": "amplify-cli notifications plugin",
   "repository": {
     "type": "git",
@@ -22,9 +22,9 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
diff --git a/packages/amplify-category-predictions/CHANGELOG.md b/packages/amplify-category-predictions/CHANGELOG.md
index 9dce0839a9e..033340d0586 100644
--- a/packages/amplify-category-predictions/CHANGELOG.md
+++ b/packages/amplify-category-predictions/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-predictions@4.2.0...amplify-category-predictions@4.2.1) (2022-11-17)
+
+**Note:** Version bump only for package amplify-category-predictions
+
+
+
+
+
 # [4.2.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-predictions@4.1.3...amplify-category-predictions@4.2.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json
index 31eb79d1cf7..b01adaf13d8 100644
--- a/packages/amplify-category-predictions/package.json
+++ b/packages/amplify-category-predictions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-predictions",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "amplify-cli predictions plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && copyfiles -u 4 src/provider-utils/awscloudformation/triggers/**/*.ejs lib/provider-utils/awscloudformation/triggers/"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-category-storage/CHANGELOG.md b/packages/amplify-category-storage/CHANGELOG.md
index 00d8e8875ce..300420d158f 100644
--- a/packages/amplify-category-storage/CHANGELOG.md
+++ b/packages/amplify-category-storage/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.6.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-storage@3.6.0...@aws-amplify/amplify-category-storage@3.6.1) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-storage
+
+
+
+
+
 # [3.6.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-category-storage@3.5.3...@aws-amplify/amplify-category-storage@3.6.0) (2022-10-27)
 
 
diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
index 01b4544cc11..fd445c2c9a0 100644
--- a/packages/amplify-category-storage/package.json
+++ b/packages/amplify-category-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-storage",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "amplify-cli storage plugin",
   "repository": {
     "type": "git",
@@ -26,16 +26,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "@aws-amplify/cli-extensibility-helper": "2.4.4",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "@aws-amplify/cli-extensibility-helper": "2.4.5",
     "@aws-cdk/aws-dynamodb": "~1.172.0",
     "@aws-cdk/aws-iam": "~1.172.0",
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/aws-s3": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
-    "amplify-cli-core": "3.3.0",
-    "amplify-headless-interface": "1.15.0",
-    "amplify-prompts": "2.6.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-headless-interface": "1.16.0",
+    "amplify-prompts": "2.6.1",
     "amplify-util-import": "2.3.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
diff --git a/packages/amplify-category-xr/CHANGELOG.md b/packages/amplify-category-xr/CHANGELOG.md
index 36d98c19662..8dcfc81f8d2 100644
--- a/packages/amplify-category-xr/CHANGELOG.md
+++ b/packages/amplify-category-xr/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-xr@3.3.4...amplify-category-xr@3.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-category-xr
+
+
+
+
+
 ## [3.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-xr@3.3.3...amplify-category-xr@3.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-category-xr
diff --git a/packages/amplify-category-xr/package.json b/packages/amplify-category-xr/package.json
index 80cf4941bd3..8747c835347 100644
--- a/packages/amplify-category-xr/package.json
+++ b/packages/amplify-category-xr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-xr",
-  "version": "3.3.4",
+  "version": "3.3.5",
   "description": "amplify-cli xr plugin",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "chalk": "^4.1.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3"
diff --git a/packages/amplify-cli-core/CHANGELOG.md b/packages/amplify-cli-core/CHANGELOG.md
index 08a851969ab..7a1d8921297 100644
--- a/packages/amplify-cli-core/CHANGELOG.md
+++ b/packages/amplify-cli-core/CHANGELOG.md
@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.4.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-cli-core@3.3.0...amplify-cli-core@3.4.0) (2022-11-17)
+
+
+### Bug Fixes
+
+* change reference to Amplify Admin UI to Amplify Studio ([dbdc861](https://github.com/aws-amplify/amplify-cli/commit/dbdc861d710ef1c8d04fd375b163fbf016992491))
+* override dependency for auth ([#11255](https://github.com/aws-amplify/amplify-cli/issues/11255)) ([690a2f7](https://github.com/aws-amplify/amplify-cli/commit/690a2f71cdb3b40db0935dbca0095349dbdc2a7a))
+* uploading multiple auth trigger files ([#11254](https://github.com/aws-amplify/amplify-cli/issues/11254)) ([#11267](https://github.com/aws-amplify/amplify-cli/issues/11267)) ([b7bdcec](https://github.com/aws-amplify/amplify-cli/commit/b7bdcec939ac71c4f70ae87ece8c2a7995d4ae72))
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-cli/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-cli/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-cli/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-cli/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+* enable auto-naming indexes for new project ([#11348](https://github.com/aws-amplify/amplify-cli/issues/11348)) ([a8fad87](https://github.com/aws-amplify/amplify-cli/commit/a8fad872dc8e4b701f6203d730500a16312a28aa))
+* enable cpk feature flag for new projects ([#11373](https://github.com/aws-amplify/amplify-cli/issues/11373)) ([d3dd3e8](https://github.com/aws-amplify/amplify-cli/commit/d3dd3e8ec5f77fde60068e742a1141bf90dce7eb))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-cli/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-cli/issues/11089) [#11324](https://github.com/aws-amplify/amplify-cli/issues/11324)
+
+
+
+
+
 # [3.3.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-cli-core@3.2.2...amplify-cli-core@3.3.0) (2022-10-27)
 
 
diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
index b5863d4c1be..50ca9307bf3 100644
--- a/packages/amplify-cli-core/package.json
+++ b/packages/amplify-cli-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-cli-core",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "Amplify CLI Core",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
     "@aws-amplify/graphql-transformer-interfaces": "^1.14.9",
     "ajv": "^6.12.6",
     "amplify-cli-logger": "1.2.1",
-    "amplify-prompts": "2.6.0",
+    "amplify-prompts": "2.6.1",
     "chalk": "^4.1.1",
     "ci-info": "^2.0.0",
     "cloudform-types": "^4.2.0",
diff --git a/packages/amplify-cli-extensibility-helper/CHANGELOG.md b/packages/amplify-cli-extensibility-helper/CHANGELOG.md
index f4446fb24ac..3775a23af40 100644
--- a/packages/amplify-cli-extensibility-helper/CHANGELOG.md
+++ b/packages/amplify-cli-extensibility-helper/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-extensibility-helper@2.4.4...@aws-amplify/cli-extensibility-helper@2.4.5) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/cli-extensibility-helper
+
+
+
+
+
 ## [2.4.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-extensibility-helper@2.4.3...@aws-amplify/cli-extensibility-helper@2.4.4) (2022-10-27)
 
 **Note:** Version bump only for package @aws-amplify/cli-extensibility-helper
diff --git a/packages/amplify-cli-extensibility-helper/package.json b/packages/amplify-cli-extensibility-helper/package.json
index 1112f478e8d..38bdc2bb835 100644
--- a/packages/amplify-cli-extensibility-helper/package.json
+++ b/packages/amplify-cli-extensibility-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-extensibility-helper",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Amplify CLI Extensibility Helper utility package",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-custom": "2.5.4",
+    "@aws-amplify/amplify-category-custom": "2.5.5",
     "@aws-cdk/aws-apigateway": "~1.172.0",
     "@aws-cdk/aws-appsync": "~1.172.0",
     "@aws-cdk/aws-cognito": "~1.172.0",
@@ -37,7 +37,7 @@
     "@aws-cdk/aws-lambda": "~1.172.0",
     "@aws-cdk/aws-s3": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
-    "amplify-cli-core": "3.3.0"
+    "amplify-cli-core": "3.4.0"
   },
   "jest": {
     "transform": {
diff --git a/packages/amplify-cli-npm/CHANGELOG.md b/packages/amplify-cli-npm/CHANGELOG.md
index e3418e4d0f3..67b3062e24c 100644
--- a/packages/amplify-cli-npm/CHANGELOG.md
+++ b/packages/amplify-cli-npm/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@10.4.1...@aws-amplify/cli@10.5.0) (2022-11-17)
+
+
+### Features
+
+* no op version bump ([#11325](https://github.com/aws-amplify/amplify-cli/issues/11325)) ([ffe42c5](https://github.com/aws-amplify/amplify-cli/commit/ffe42c5425aa331ba9c6caf0976011b7aa4b95ca))
+
+
+
+
+
 ## [10.4.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@10.4.0...@aws-amplify/cli@10.4.1) (2022-11-11)
 
 **Note:** Version bump only for package @aws-amplify/cli
diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json
index eca3fa5a6b1..5b26df6f5d5 100644
--- a/packages/amplify-cli-npm/package.json
+++ b/packages/amplify-cli-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli",
-  "version": "10.4.1",
+  "version": "10.5.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@aws-amplify/cli-internal": "10.4.1",
+    "@aws-amplify/cli-internal": "10.5.0",
     "@types/tar": "^6.1.1",
     "rimraf": "^3.0.2"
   }
diff --git a/packages/amplify-cli/CHANGELOG.md b/packages/amplify-cli/CHANGELOG.md
index 1fe8d5fa640..5ea129538cb 100644
--- a/packages/amplify-cli/CHANGELOG.md
+++ b/packages/amplify-cli/CHANGELOG.md
@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [10.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@10.4.1...@aws-amplify/cli-internal@10.5.0) (2022-11-17)
+
+
+### Bug Fixes
+
+* stop timer on early push resources exit ([#11287](https://github.com/aws-amplify/amplify-cli/issues/11287)) ([ac06cb2](https://github.com/aws-amplify/amplify-cli/commit/ac06cb27b1d9e83a09b2f7ac99571f0d8825a64e))
+* updates to error handler print format ([#11311](https://github.com/aws-amplify/amplify-cli/issues/11311)) ([0ac69bb](https://github.com/aws-amplify/amplify-cli/commit/0ac69bb5edbbeef13602d97650f55333f9e5c547))
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-cli/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-cli/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-cli/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-cli/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-cli/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-cli/issues/11089) [#11324](https://github.com/aws-amplify/amplify-cli/issues/11324)
+
+
+
+## 10.3.2 (2022-10-25)
+
+
+### Bug Fixes
+
+* keeps hooks intact when attaching backend ([#11179](https://github.com/aws-amplify/amplify-cli/issues/11179)) ([41caa91](https://github.com/aws-amplify/amplify-cli/commit/41caa9149680b2ca712addbbacd5234b12c4c13f))
+
+
+
+
+
 ## [10.4.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@10.4.0...@aws-amplify/cli-internal@10.4.1) (2022-11-11)
 
 **Note:** Version bump only for package @aws-amplify/cli-internal
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index 44190720dd9..ea239df583f 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-internal",
-  "version": "10.4.1",
+  "version": "10.5.0",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -34,46 +34,46 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-api": "^4.0.9",
-    "@aws-amplify/amplify-category-auth": "2.13.0",
-    "@aws-amplify/amplify-category-custom": "2.5.4",
-    "@aws-amplify/amplify-category-storage": "3.6.0",
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "@aws-amplify/amplify-util-uibuilder": "1.6.0",
+    "@aws-amplify/amplify-category-auth": "2.13.1",
+    "@aws-amplify/amplify-category-custom": "2.5.5",
+    "@aws-amplify/amplify-category-storage": "3.6.1",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "@aws-amplify/amplify-util-uibuilder": "1.6.1",
     "@aws-amplify/graphql-auth-transformer": "^1.1.4",
     "@aws-cdk/cloudformation-diff": "~1.172.0",
-    "amplify-app": "4.3.4",
-    "amplify-category-analytics": "4.2.0",
-    "amplify-category-function": "4.2.0",
-    "amplify-category-geo": "2.9.0",
-    "amplify-category-hosting": "3.4.4",
-    "amplify-category-interactions": "4.1.4",
-    "amplify-category-notifications": "2.21.0",
-    "amplify-category-predictions": "4.2.0",
-    "amplify-category-xr": "3.3.4",
-    "amplify-cli-core": "3.3.0",
+    "amplify-app": "4.3.5",
+    "amplify-category-analytics": "4.2.1",
+    "amplify-category-function": "4.2.1",
+    "amplify-category-geo": "2.10.0",
+    "amplify-category-hosting": "3.4.5",
+    "amplify-category-interactions": "4.1.5",
+    "amplify-category-notifications": "2.21.1",
+    "amplify-category-predictions": "4.2.1",
+    "amplify-category-xr": "3.3.5",
+    "amplify-cli-core": "3.4.0",
     "amplify-cli-logger": "1.2.1",
     "amplify-cli-shared-interfaces": "1.1.0",
     "amplify-codegen": "^3.3.2",
-    "amplify-console-hosting": "2.3.4",
-    "amplify-container-hosting": "2.5.5",
+    "amplify-console-hosting": "2.3.5",
+    "amplify-container-hosting": "2.5.6",
     "amplify-dotnet-function-runtime-provider": "1.6.10",
-    "amplify-dotnet-function-template-provider": "2.3.4",
+    "amplify-dotnet-function-template-provider": "2.3.5",
     "amplify-frontend-android": "3.4.0",
     "amplify-frontend-flutter": "1.3.5",
-    "amplify-frontend-ios": "3.5.4",
-    "amplify-frontend-javascript": "3.7.0",
-    "amplify-go-function-runtime-provider": "2.3.4",
+    "amplify-frontend-ios": "3.5.5",
+    "amplify-frontend-javascript": "3.7.1",
+    "amplify-go-function-runtime-provider": "2.3.5",
     "amplify-go-function-template-provider": "1.3.14",
-    "amplify-java-function-runtime-provider": "2.3.4",
+    "amplify-java-function-runtime-provider": "2.3.5",
     "amplify-java-function-template-provider": "1.5.14",
-    "amplify-nodejs-function-runtime-provider": "2.3.4",
-    "amplify-nodejs-function-template-provider": "2.5.4",
-    "amplify-prompts": "2.6.0",
-    "amplify-provider-awscloudformation": "6.9.0",
-    "amplify-python-function-runtime-provider": "2.4.4",
+    "amplify-nodejs-function-runtime-provider": "2.3.5",
+    "amplify-nodejs-function-template-provider": "2.6.0",
+    "amplify-prompts": "2.6.1",
+    "amplify-provider-awscloudformation": "6.9.1",
+    "amplify-python-function-runtime-provider": "2.4.5",
     "amplify-python-function-template-provider": "1.3.16",
     "amplify-util-import": "2.3.0",
-    "amplify-util-mock": "4.6.1",
+    "amplify-util-mock": "4.7.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
     "ci-info": "^2.0.0",
diff --git a/packages/amplify-console-hosting/CHANGELOG.md b/packages/amplify-console-hosting/CHANGELOG.md
index 1823c3684c3..ec508981b54 100644
--- a/packages/amplify-console-hosting/CHANGELOG.md
+++ b/packages/amplify-console-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-console-hosting@2.3.4...amplify-console-hosting@2.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-console-hosting
+
+
+
+
+
 ## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-console-hosting@2.3.3...amplify-console-hosting@2.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-console-hosting
diff --git a/packages/amplify-console-hosting/package.json b/packages/amplify-console-hosting/package.json
index 4d7ab5b4d01..e02cb73cdb0 100644
--- a/packages/amplify-console-hosting/package.json
+++ b/packages/amplify-console-hosting/package.json
@@ -1,14 +1,14 @@
 {
   "name": "amplify-console-hosting",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "cli plugin for AWS Amplify Console hosting",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "amplify-cli-core": "3.3.0",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "amplify-cli-core": "3.4.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.1",
     "cli-table3": "^0.6.0",
diff --git a/packages/amplify-console-integration-tests/CHANGELOG.md b/packages/amplify-console-integration-tests/CHANGELOG.md
index f5f726787b4..51ce22f1428 100644
--- a/packages/amplify-console-integration-tests/CHANGELOG.md
+++ b/packages/amplify-console-integration-tests/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0](https://github.com/aws-amplify/amplify-console-integration-tests/compare/@aws-amplify/amplify-console-integration-tests@2.5.0...@aws-amplify/amplify-console-integration-tests@2.6.0) (2022-11-17)
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-console-integration-tests/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-console-integration-tests/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-console-integration-tests/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-console-integration-tests/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-console-integration-tests/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-console-integration-tests/issues/11089) [#11324](https://github.com/aws-amplify/amplify-console-integration-tests/issues/11324)
+
+
+
+
+
 # [2.5.0](https://github.com/aws-amplify/amplify-console-integration-tests/compare/@aws-amplify/amplify-console-integration-tests@2.4.3...@aws-amplify/amplify-console-integration-tests@2.5.0) (2022-10-27)
 
 
diff --git a/packages/amplify-console-integration-tests/package.json b/packages/amplify-console-integration-tests/package.json
index 704028bcb44..b83bad9df56 100644
--- a/packages/amplify-console-integration-tests/package.json
+++ b/packages/amplify-console-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-console-integration-tests",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -21,9 +21,9 @@
     "setup-profile": "ts-node ./src/setup-profile.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-e2e-core": "4.4.0",
+    "@aws-amplify/amplify-e2e-core": "4.5.0",
     "@types/ini": "^1.3.30",
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "aws-sdk": "^2.1233.0",
     "dotenv": "^8.2.0",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-container-hosting/CHANGELOG.md b/packages/amplify-container-hosting/CHANGELOG.md
index 910833e986f..ae7c98d127e 100644
--- a/packages/amplify-container-hosting/CHANGELOG.md
+++ b/packages/amplify-container-hosting/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.6](https://github.com/aws-amplify/amplify-cli/compare/amplify-container-hosting@2.5.5...amplify-container-hosting@2.5.6) (2022-11-17)
+
+**Note:** Version bump only for package amplify-container-hosting
+
+
+
+
+
 ## [2.5.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-container-hosting@2.5.4...amplify-container-hosting@2.5.5) (2022-11-11)
 
 **Note:** Version bump only for package amplify-container-hosting
diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
index 8e3d5ef88af..74d7d59a837 100644
--- a/packages/amplify-container-hosting/package.json
+++ b/packages/amplify-container-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-container-hosting",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "amplify-cli hosting plugin for containers",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@aws-amplify/amplify-category-api": "^4.0.9",
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "mime-types": "^2.1.26",
diff --git a/packages/amplify-dotnet-function-template-provider/CHANGELOG.md b/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
index 0790d6d05bb..9a736b41579 100644
--- a/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
+++ b/packages/amplify-dotnet-function-template-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-dotnet-function-template-provider@2.3.4...amplify-dotnet-function-template-provider@2.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-dotnet-function-template-provider
+
+
+
+
+
 ## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-dotnet-function-template-provider@2.3.3...amplify-dotnet-function-template-provider@2.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-dotnet-function-template-provider
diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
index 602498d1795..ec7e7a8c1cf 100644
--- a/packages/amplify-dotnet-function-template-provider/package.json
+++ b/packages/amplify-dotnet-function-template-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-dotnet-function-template-provider",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": ".NET Core templates supplied by the Amplify Team",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "graphql-transformer-core": "^7.6.6"
   },
diff --git a/packages/amplify-dynamodb-simulator/CHANGELOG.md b/packages/amplify-dynamodb-simulator/CHANGELOG.md
index 0a161802ca5..93b99b2a2fd 100644
--- a/packages/amplify-dynamodb-simulator/CHANGELOG.md
+++ b/packages/amplify-dynamodb-simulator/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-dynamodb-simulator@2.5.0...amplify-dynamodb-simulator@2.5.1) (2022-11-17)
+
+**Note:** Version bump only for package amplify-dynamodb-simulator
+
+
+
+
+
 # [2.5.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-dynamodb-simulator@2.4.3...amplify-dynamodb-simulator@2.5.0) (2022-10-27)
 
 
diff --git a/packages/amplify-dynamodb-simulator/package.json b/packages/amplify-dynamodb-simulator/package.json
index 1dd1d43c0d4..ea496b7af9f 100644
--- a/packages/amplify-dynamodb-simulator/package.json
+++ b/packages/amplify-dynamodb-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-dynamodb-simulator",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "DynamoDB emulator nodejs wrapper",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test": "jest --logHeapUsage"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "aws-sdk": "^2.1233.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",
diff --git a/packages/amplify-e2e-core/CHANGELOG.md b/packages/amplify-e2e-core/CHANGELOG.md
index c9411c4fef3..61bbb529e8f 100644
--- a/packages/amplify-e2e-core/CHANGELOG.md
+++ b/packages/amplify-e2e-core/CHANGELOG.md
@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-e2e-core@4.4.0...@aws-amplify/amplify-e2e-core@4.5.0) (2022-11-17)
+
+
+### Bug Fixes
+
+* add default ref for unauthrole for imported auth ([#10848](https://github.com/aws-amplify/amplify-cli/issues/10848)) ([bd71707](https://github.com/aws-amplify/amplify-cli/commit/bd717077a9fe88adf66244d621aa48d7157387a8))
+* eliminate circular dependency when generating CMS assets ([#11304](https://github.com/aws-amplify/amplify-cli/issues/11304)) ([2d7e8d0](https://github.com/aws-amplify/amplify-cli/commit/2d7e8d0e6549f680a979b9cdfb0cd28bf98fb349))
+* keeps hooks intact when attaching backend ([#11179](https://github.com/aws-amplify/amplify-cli/issues/11179)) ([41caa91](https://github.com/aws-amplify/amplify-cli/commit/41caa9149680b2ca712addbbacd5234b12c4c13f))
+* parse true and false strings from env vars ([#11386](https://github.com/aws-amplify/amplify-cli/issues/11386)) ([5ed67f5](https://github.com/aws-amplify/amplify-cli/commit/5ed67f52001429b05fb902d9ec2e06960cf2a3ad))
+* uploading multiple auth trigger files ([#11254](https://github.com/aws-amplify/amplify-cli/issues/11254)) ([#11267](https://github.com/aws-amplify/amplify-cli/issues/11267)) ([b7bdcec](https://github.com/aws-amplify/amplify-cli/commit/b7bdcec939ac71c4f70ae87ece8c2a7995d4ae72))
+
+
+### Features
+
+* Nodejs graphql IAM template ([#10997](https://github.com/aws-amplify/amplify-cli/issues/10997)) ([880f7eb](https://github.com/aws-amplify/amplify-cli/commit/880f7eb3996133b31c0f498136a66488d1c8ceeb))
+
+
+
+
+
 # [4.4.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-e2e-core@4.3.0...@aws-amplify/amplify-e2e-core@4.4.0) (2022-10-27)
 
 
diff --git a/packages/amplify-e2e-core/package.json b/packages/amplify-e2e-core/package.json
index 5587cdfdf0e..cb6da6f5837 100644
--- a/packages/amplify-e2e-core/package.json
+++ b/packages/amplify-e2e-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-e2e-core",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -22,8 +22,8 @@
     "clean": "rimraf ./lib tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
-    "amplify-headless-interface": "1.15.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-headless-interface": "1.16.0",
     "aws-sdk": "^2.1233.0",
     "chalk": "^4.1.1",
     "dotenv": "^8.2.0",
diff --git a/packages/amplify-e2e-tests/CHANGELOG.md b/packages/amplify-e2e-tests/CHANGELOG.md
index e5b31153483..099c9516fa2 100644
--- a/packages/amplify-e2e-tests/CHANGELOG.md
+++ b/packages/amplify-e2e-tests/CHANGELOG.md
@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.15.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-e2e-tests@3.14.0...amplify-e2e-tests@3.15.0) (2022-11-17)
+
+
+### Bug Fixes
+
+* add default ref for unauthrole for imported auth ([#10848](https://github.com/aws-amplify/amplify-cli/issues/10848)) ([bd71707](https://github.com/aws-amplify/amplify-cli/commit/bd717077a9fe88adf66244d621aa48d7157387a8))
+* add function access to analytics ([#11276](https://github.com/aws-amplify/amplify-cli/issues/11276)) ([3939d41](https://github.com/aws-amplify/amplify-cli/commit/3939d41b2aca6cf64bd0a36a32ff0d45ae954eaf))
+* eliminate circular dependency when generating CMS assets ([#11304](https://github.com/aws-amplify/amplify-cli/issues/11304)) ([2d7e8d0](https://github.com/aws-amplify/amplify-cli/commit/2d7e8d0e6549f680a979b9cdfb0cd28bf98fb349))
+* generate default theme if user has no themes ([#11343](https://github.com/aws-amplify/amplify-cli/issues/11343)) ([13a02ac](https://github.com/aws-amplify/amplify-cli/commit/13a02ac32de717a518336871b1c741aa2714562b))
+* keeps hooks intact when attaching backend ([#11179](https://github.com/aws-amplify/amplify-cli/issues/11179)) ([41caa91](https://github.com/aws-amplify/amplify-cli/commit/41caa9149680b2ca712addbbacd5234b12c4c13f))
+* uploading multiple auth trigger files ([#11254](https://github.com/aws-amplify/amplify-cli/issues/11254)) ([#11267](https://github.com/aws-amplify/amplify-cli/issues/11267)) ([b7bdcec](https://github.com/aws-amplify/amplify-cli/commit/b7bdcec939ac71c4f70ae87ece8c2a7995d4ae72))
+
+
+### Features
+
+* Nodejs graphql IAM template ([#10997](https://github.com/aws-amplify/amplify-cli/issues/10997)) ([880f7eb](https://github.com/aws-amplify/amplify-cli/commit/880f7eb3996133b31c0f498136a66488d1c8ceeb))
+
+
+
+
+
 # [3.14.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-e2e-tests@3.13.3...amplify-e2e-tests@3.14.0) (2022-10-27)
 
 
diff --git a/packages/amplify-e2e-tests/package.json b/packages/amplify-e2e-tests/package.json
index e685ed7bbb7..e36d4dbdf10 100644
--- a/packages/amplify-e2e-tests/package.json
+++ b/packages/amplify-e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-e2e-tests",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "description": "",
   "repository": {
     "type": "git",
@@ -23,16 +23,16 @@
     "clean-e2e-resources": "ts-node ./src/cleanup-e2e-resources.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-auth": "2.13.0",
-    "@aws-amplify/amplify-e2e-core": "4.4.0",
-    "@aws-cdk/core": "~1.172.0",
+    "@aws-amplify/amplify-category-auth": "2.13.1",
+    "@aws-amplify/amplify-e2e-core": "4.5.0",
+    "@aws-amplify/graphql-transformer-core": "^0.17.15",
     "@aws-cdk/aws-iam": "~1.172.0",
     "@aws-cdk/aws-sns": "~1.172.0",
     "@aws-cdk/aws-sns-subscriptions": "~1.172.0",
     "@aws-cdk/aws-sqs": "~1.172.0",
-    "@aws-amplify/graphql-transformer-core": "^0.17.15",
-    "amplify-cli-core": "3.3.0",
-    "amplify-headless-interface": "^1.15.0",
+    "@aws-cdk/core": "~1.172.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-headless-interface": "1.16.0",
     "aws-amplify": "^4.2.8",
     "aws-appsync": "^4.1.1",
     "aws-sdk": "^2.1233.0",
diff --git a/packages/amplify-environment-parameters/CHANGELOG.md b/packages/amplify-environment-parameters/CHANGELOG.md
index d49d6c74876..0b8bbaeffea 100644
--- a/packages/amplify-environment-parameters/CHANGELOG.md
+++ b/packages/amplify-environment-parameters/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-environment-parameters@1.2.0...@aws-amplify/amplify-environment-parameters@1.2.1) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-environment-parameters
+
+
+
+
+
 # [1.2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-environment-parameters@1.1.3...@aws-amplify/amplify-environment-parameters@1.2.0) (2022-10-27)
 
 
diff --git a/packages/amplify-environment-parameters/package.json b/packages/amplify-environment-parameters/package.json
index 9f20f191cd2..e66a548ceb7 100644
--- a/packages/amplify-environment-parameters/package.json
+++ b/packages/amplify-environment-parameters/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-environment-parameters",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Amplify CLI environment parameter manager",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "test": "jest --logHeapUsage"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/amplify-frontend-ios/CHANGELOG.md b/packages/amplify-frontend-ios/CHANGELOG.md
index 5fee8c3de21..267637e1314 100644
--- a/packages/amplify-frontend-ios/CHANGELOG.md
+++ b/packages/amplify-frontend-ios/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.5.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-ios@3.5.4...amplify-frontend-ios@3.5.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-frontend-ios
+
+
+
+
+
 ## [3.5.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-ios@3.5.3...amplify-frontend-ios@3.5.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-frontend-ios
diff --git a/packages/amplify-frontend-ios/package.json b/packages/amplify-frontend-ios/package.json
index 011d671a957..fe07858bfea 100644
--- a/packages/amplify-frontend-ios/package.json
+++ b/packages/amplify-frontend-ios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-frontend-ios",
-  "version": "3.5.4",
+  "version": "3.5.5",
   "description": "amplify-cli front-end plugin for xcode projects",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
     "graphql-config": "^2.2.1",
diff --git a/packages/amplify-frontend-javascript/CHANGELOG.md b/packages/amplify-frontend-javascript/CHANGELOG.md
index f602adabfee..067c0f6e745 100644
--- a/packages/amplify-frontend-javascript/CHANGELOG.md
+++ b/packages/amplify-frontend-javascript/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.7.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-javascript@3.7.0...amplify-frontend-javascript@3.7.1) (2022-11-17)
+
+**Note:** Version bump only for package amplify-frontend-javascript
+
+
+
+
+
 # [3.7.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-javascript@3.6.3...amplify-frontend-javascript@3.7.0) (2022-10-27)
 
 
diff --git a/packages/amplify-frontend-javascript/package.json b/packages/amplify-frontend-javascript/package.json
index d1dbf521a90..ae8002e580b 100644
--- a/packages/amplify-frontend-javascript/package.json
+++ b/packages/amplify-frontend-javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-frontend-javascript",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "amplify-cli front-end plugin for JavaScript projects",
   "scripts": {
     "test": "jest --logHeapUsage",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@babel/core": "^7.10.5",
     "@babel/plugin-transform-modules-commonjs": "7.10.4",
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-go-function-runtime-provider/CHANGELOG.md b/packages/amplify-go-function-runtime-provider/CHANGELOG.md
index c9f0717f05a..c519f7b2a5a 100644
--- a/packages/amplify-go-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-go-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-go-function-runtime-provider@2.3.4...amplify-go-function-runtime-provider@2.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-go-function-runtime-provider
+
+
+
+
+
 ## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-go-function-runtime-provider@2.3.3...amplify-go-function-runtime-provider@2.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-go-function-runtime-provider
diff --git a/packages/amplify-go-function-runtime-provider/package.json b/packages/amplify-go-function-runtime-provider/package.json
index 6a993984fb9..4e2e41128ad 100644
--- a/packages/amplify-go-function-runtime-provider/package.json
+++ b/packages/amplify-go-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-go-function-runtime-provider",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Provides functionality related to functions in Go 1.x on AWS",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo resources/localinvoke/go.sum resources/localinvoke/main resources/localinvoke/main.exe"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "archiver": "^5.3.0",
     "execa": "^5.1.1",
diff --git a/packages/amplify-graphiql-explorer/CHANGELOG.md b/packages/amplify-graphiql-explorer/CHANGELOG.md
index 11a7dcd8b58..2f7a968973e 100644
--- a/packages/amplify-graphiql-explorer/CHANGELOG.md
+++ b/packages/amplify-graphiql-explorer/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.5.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-graphiql-explorer@2.5.0...@aws-amplify/amplify-graphiql-explorer@2.5.1) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-graphiql-explorer
+
+
+
+
+
 # 2.5.0 (2022-08-02)
 
 
diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
index 00a07a9bba0..f43bfdac8d5 100644
--- a/packages/amplify-graphiql-explorer/package.json
+++ b/packages/amplify-graphiql-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-graphiql-explorer",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.16.0",
diff --git a/packages/amplify-graphql-migration-tests/CHANGELOG.md b/packages/amplify-graphql-migration-tests/CHANGELOG.md
index d0d7a5aa67c..b245b8fca9b 100644
--- a/packages/amplify-graphql-migration-tests/CHANGELOG.md
+++ b/packages/amplify-graphql-migration-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-graphql-migration-tests@2.3.3...amplify-graphql-migration-tests@2.3.4) (2022-11-17)
+
+**Note:** Version bump only for package amplify-graphql-migration-tests
+
+
+
+
+
 ## [2.3.3](https://github.com/aws-amplify/amplify-cli/compare/amplify-graphql-migration-tests@2.3.2...amplify-graphql-migration-tests@2.3.3) (2022-11-11)
 
 **Note:** Version bump only for package amplify-graphql-migration-tests
diff --git a/packages/amplify-graphql-migration-tests/package.json b/packages/amplify-graphql-migration-tests/package.json
index 82ffc975963..12dc88b3cb2 100644
--- a/packages/amplify-graphql-migration-tests/package.json
+++ b/packages/amplify-graphql-migration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-graphql-migration-tests",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Tests migration from v1 to v2 of the Amplify GraphQL transformer",
   "main": "lib/index.js",
   "private": true,
@@ -50,7 +50,7 @@
     "@aws-amplify/graphql-transformer-interfaces": "^1.14.9",
     "@aws-amplify/graphql-transformer-migrator": "^1.4.10",
     "@aws-cdk/cloudformation-diff": "~1.172.0",
-    "amplify-prompts": "2.6.0",
+    "amplify-prompts": "2.6.1",
     "fs-extra": "^8.1.0",
     "graphql-auth-transformer": "^7.2.44",
     "graphql-connection-transformer": "^5.2.43",
diff --git a/packages/amplify-headless-interface/CHANGELOG.md b/packages/amplify-headless-interface/CHANGELOG.md
index 06c62ae1151..8d0896840e6 100644
--- a/packages/amplify-headless-interface/CHANGELOG.md
+++ b/packages/amplify-headless-interface/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.16.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-headless-interface@1.15.0...amplify-headless-interface@1.16.0) (2022-11-17)
+
+
+### Features
+
+* add API key extension headless config ([#11037](https://github.com/aws-amplify/amplify-cli/issues/11037)) ([bd087d7](https://github.com/aws-amplify/amplify-cli/commit/bd087d7a468f35f1a1e1bae390cf623121310abc))
+* **category-geo:** add two new map styles 2022.10 ([#11262](https://github.com/aws-amplify/amplify-cli/issues/11262)) ([77a473e](https://github.com/aws-amplify/amplify-cli/commit/77a473ed78a945681d98b2c14822474aef966dcf))
+
+
+
+
+
 # [1.15.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-headless-interface@1.14.3...amplify-headless-interface@1.15.0) (2022-06-03)
 
 
diff --git a/packages/amplify-headless-interface/package.json b/packages/amplify-headless-interface/package.json
index c53b53a74b0..15ea2239189 100644
--- a/packages/amplify-headless-interface/package.json
+++ b/packages/amplify-headless-interface/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-headless-interface",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "interfaces for amplify headless mode payloads",
   "main": "lib/index.js",
   "scripts": {
diff --git a/packages/amplify-java-function-runtime-provider/CHANGELOG.md b/packages/amplify-java-function-runtime-provider/CHANGELOG.md
index 9a4b17aa6c1..5912aefbd52 100644
--- a/packages/amplify-java-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-java-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-java-function-runtime-provider@2.3.4...amplify-java-function-runtime-provider@2.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-java-function-runtime-provider
+
+
+
+
+
 ## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-java-function-runtime-provider@2.3.3...amplify-java-function-runtime-provider@2.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-java-function-runtime-provider
diff --git a/packages/amplify-java-function-runtime-provider/package.json b/packages/amplify-java-function-runtime-provider/package.json
index 068118a7553..bdb844ebb2e 100644
--- a/packages/amplify-java-function-runtime-provider/package.json
+++ b/packages/amplify-java-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-java-function-runtime-provider",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Provides functionality related to functions in JAVA on AWS",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",
diff --git a/packages/amplify-migration-tests/CHANGELOG.md b/packages/amplify-migration-tests/CHANGELOG.md
index 88407da6dcc..b35e14b9f35 100644
--- a/packages/amplify-migration-tests/CHANGELOG.md
+++ b/packages/amplify-migration-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.2.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-migration-tests@5.2.0...@aws-amplify/amplify-migration-tests@5.2.1) (2022-11-17)
+
+**Note:** Version bump only for package @aws-amplify/amplify-migration-tests
+
+
+
+
+
 # [5.2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-migration-tests@5.1.3...@aws-amplify/amplify-migration-tests@5.2.0) (2022-10-27)
 
 
diff --git a/packages/amplify-migration-tests/package.json b/packages/amplify-migration-tests/package.json
index 2838e65c660..6d4a98f3d38 100644
--- a/packages/amplify-migration-tests/package.json
+++ b/packages/amplify-migration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-migration-tests",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "setup-profile": "ts-node ./src/configure_tests.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-e2e-core": "4.4.0",
+    "@aws-amplify/amplify-e2e-core": "4.5.0",
     "fs-extra": "^8.1.0",
     "graphql-transformer-core": "^7.6.6",
     "lodash": "^4.17.21",
diff --git a/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md b/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
index 95ee84287f4..ee050a4b11d 100644
--- a/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-nodejs-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-runtime-provider@2.3.4...amplify-nodejs-function-runtime-provider@2.3.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-nodejs-function-runtime-provider
+
+
+
+
+
 ## [2.3.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-runtime-provider@2.3.3...amplify-nodejs-function-runtime-provider@2.3.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-nodejs-function-runtime-provider
diff --git a/packages/amplify-nodejs-function-runtime-provider/package.json b/packages/amplify-nodejs-function-runtime-provider/package.json
index 43709001d72..41bb48033de 100644
--- a/packages/amplify-nodejs-function-runtime-provider/package.json
+++ b/packages/amplify-nodejs-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-nodejs-function-runtime-provider",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "Provides functionality related to functions in NodeJS on AWS",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "test": "jest --logHeapUsage"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "execa": "^5.1.1",
     "exit": "^0.1.2",
diff --git a/packages/amplify-nodejs-function-template-provider/CHANGELOG.md b/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
index 504788c0653..568b05fdb72 100644
--- a/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
+++ b/packages/amplify-nodejs-function-template-provider/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-template-provider@2.5.4...amplify-nodejs-function-template-provider@2.6.0) (2022-11-17)
+
+
+### Features
+
+* Nodejs graphql IAM template ([#10997](https://github.com/aws-amplify/amplify-cli/issues/10997)) ([880f7eb](https://github.com/aws-amplify/amplify-cli/commit/880f7eb3996133b31c0f498136a66488d1c8ceeb))
+
+
+
+
+
 ## [2.5.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-nodejs-function-template-provider@2.5.3...amplify-nodejs-function-template-provider@2.5.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-nodejs-function-template-provider
diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
index dca10b6d2c9..9c3c7353866 100644
--- a/packages/amplify-nodejs-function-template-provider/package.json
+++ b/packages/amplify-nodejs-function-template-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-nodejs-function-template-provider",
-  "version": "2.5.4",
+  "version": "2.6.0",
   "description": "Node JS templates supplied by the Amplify Team",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "graphql-transformer-core": "^7.6.6",
     "lodash": "^4.17.21"
diff --git a/packages/amplify-opensearch-simulator/CHANGELOG.md b/packages/amplify-opensearch-simulator/CHANGELOG.md
new file mode 100644
index 00000000000..956657532ff
--- /dev/null
+++ b/packages/amplify-opensearch-simulator/CHANGELOG.md
@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# 1.1.0 (2022-11-17)
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-cli/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-cli/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-cli/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-cli/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-cli/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-cli/issues/11089) [#11324](https://github.com/aws-amplify/amplify-cli/issues/11324)
diff --git a/packages/amplify-opensearch-simulator/package.json b/packages/amplify-opensearch-simulator/package.json
index 42a489142d1..60fe8b3f4b9 100644
--- a/packages/amplify-opensearch-simulator/package.json
+++ b/packages/amplify-opensearch-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-opensearch-simulator",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Opensearch local simulator",
   "repository": {
     "type": "git",
@@ -24,8 +24,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "aws-sdk": "^2.1233.0",
     "detect-port": "^1.3.0",
     "execa": "^5.1.1",
@@ -47,4 +47,4 @@
     "testEnvironment": "node",
     "collectCoverage": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/amplify-prompts/CHANGELOG.md b/packages/amplify-prompts/CHANGELOG.md
index 59fd05e371a..e1dff554b88 100644
--- a/packages/amplify-prompts/CHANGELOG.md
+++ b/packages/amplify-prompts/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-prompts@2.6.0...amplify-prompts@2.6.1) (2022-11-17)
+
+**Note:** Version bump only for package amplify-prompts
+
+
+
+
+
 # [2.6.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-prompts@2.5.0...amplify-prompts@2.6.0) (2022-10-13)
 
 
diff --git a/packages/amplify-prompts/package.json b/packages/amplify-prompts/package.json
index c3b1eba6a36..1b0fa8e6af8 100644
--- a/packages/amplify-prompts/package.json
+++ b/packages/amplify-prompts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-prompts",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Utility functions for Amplify CLI terminal I/O",
   "main": "lib/index.js",
   "scripts": {
diff --git a/packages/amplify-provider-awscloudformation/CHANGELOG.md b/packages/amplify-provider-awscloudformation/CHANGELOG.md
index 21a602c0637..1e3abe24da8 100644
--- a/packages/amplify-provider-awscloudformation/CHANGELOG.md
+++ b/packages/amplify-provider-awscloudformation/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.9.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-provider-awscloudformation@6.9.0...amplify-provider-awscloudformation@6.9.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* add default ref for unauthrole for imported auth ([#10848](https://github.com/aws-amplify/amplify-cli/issues/10848)) ([bd71707](https://github.com/aws-amplify/amplify-cli/commit/bd717077a9fe88adf66244d621aa48d7157387a8))
+* eliminate circular dependency when generating CMS assets ([#11304](https://github.com/aws-amplify/amplify-cli/issues/11304)) ([2d7e8d0](https://github.com/aws-amplify/amplify-cli/commit/2d7e8d0e6549f680a979b9cdfb0cd28bf98fb349))
+* uploading multiple auth trigger files ([#11254](https://github.com/aws-amplify/amplify-cli/issues/11254)) ([#11267](https://github.com/aws-amplify/amplify-cli/issues/11267)) ([b7bdcec](https://github.com/aws-amplify/amplify-cli/commit/b7bdcec939ac71c4f70ae87ece8c2a7995d4ae72))
+
+
+
+## 10.3.2 (2022-10-25)
+
+
+
+
+
 # [6.9.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-provider-awscloudformation@6.8.1...amplify-provider-awscloudformation@6.9.0) (2022-10-27)
 
 
diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
index fa836c916a7..ee6a0e3443e 100644
--- a/packages/amplify-provider-awscloudformation/package.json
+++ b/packages/amplify-provider-awscloudformation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-provider-awscloudformation",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "description": "AWS CloudFormation Provider",
   "repository": {
     "type": "git",
@@ -24,9 +24,9 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@aws-amplify/amplify-category-custom": "2.5.4",
-    "@aws-amplify/amplify-environment-parameters": "1.2.0",
-    "@aws-amplify/cli-extensibility-helper": "2.4.4",
+    "@aws-amplify/amplify-category-custom": "2.5.5",
+    "@aws-amplify/amplify-environment-parameters": "1.2.1",
+    "@aws-amplify/cli-extensibility-helper": "2.4.5",
     "@aws-amplify/graphql-transformer-core": "^0.17.15",
     "@aws-amplify/graphql-transformer-interfaces": "^1.14.9",
     "@aws-cdk/assert": "~1.172.0",
@@ -53,10 +53,10 @@
     "@aws-cdk/aws-sqs": "~1.172.0",
     "@aws-cdk/core": "~1.172.0",
     "@aws-cdk/region-info": "~1.172.0",
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-cli-logger": "1.2.1",
     "amplify-codegen": "^3.3.2",
-    "amplify-prompts": "2.6.0",
+    "amplify-prompts": "2.6.1",
     "amplify-util-import": "2.3.0",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.1233.0",
diff --git a/packages/amplify-python-function-runtime-provider/CHANGELOG.md b/packages/amplify-python-function-runtime-provider/CHANGELOG.md
index c7c2e9291a6..965ea0d6c34 100644
--- a/packages/amplify-python-function-runtime-provider/CHANGELOG.md
+++ b/packages/amplify-python-function-runtime-provider/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-python-function-runtime-provider@2.4.4...amplify-python-function-runtime-provider@2.4.5) (2022-11-17)
+
+**Note:** Version bump only for package amplify-python-function-runtime-provider
+
+
+
+
+
 ## [2.4.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-python-function-runtime-provider@2.4.3...amplify-python-function-runtime-provider@2.4.4) (2022-10-27)
 
 **Note:** Version bump only for package amplify-python-function-runtime-provider
diff --git a/packages/amplify-python-function-runtime-provider/package.json b/packages/amplify-python-function-runtime-provider/package.json
index bee5d34502b..d03ca1752ce 100644
--- a/packages/amplify-python-function-runtime-provider/package.json
+++ b/packages/amplify-python-function-runtime-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-python-function-runtime-provider",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Provides functionality related to functions in Python on AWS",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
   },
   "dependencies": {
-    "amplify-cli-core": "3.3.0",
+    "amplify-cli-core": "3.4.0",
     "amplify-function-plugin-interface": "1.9.5",
     "execa": "^5.1.1",
     "glob": "^7.2.0",
diff --git a/packages/amplify-util-headless-input/CHANGELOG.md b/packages/amplify-util-headless-input/CHANGELOG.md
index c3cd4615c93..592dee0ea66 100644
--- a/packages/amplify-util-headless-input/CHANGELOG.md
+++ b/packages/amplify-util-headless-input/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.9.7](https://github.com/aws-amplify/amplify-cli/compare/amplify-util-headless-input@1.9.6...amplify-util-headless-input@1.9.7) (2022-11-17)
+
+**Note:** Version bump only for package amplify-util-headless-input
+
+
+
+
+
 ## [1.9.6](https://github.com/aws-amplify/amplify-cli/compare/amplify-util-headless-input@1.9.5...amplify-util-headless-input@1.9.6) (2022-10-13)
 
 **Note:** Version bump only for package amplify-util-headless-input
diff --git a/packages/amplify-util-headless-input/package.json b/packages/amplify-util-headless-input/package.json
index b8e034cfe3c..be39ec4f939 100644
--- a/packages/amplify-util-headless-input/package.json
+++ b/packages/amplify-util-headless-input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-util-headless-input",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "description": "Logic for validating objects against JSON-schema specs and performing version upgrades when necessary / possible",
   "main": "lib/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "ajv": "^6.12.6",
-    "amplify-headless-interface": "1.15.0"
+    "amplify-headless-interface": "1.16.0"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.5",
diff --git a/packages/amplify-util-mock/CHANGELOG.md b/packages/amplify-util-mock/CHANGELOG.md
index 0bb41081d21..cfecd8154b8 100644
--- a/packages/amplify-util-mock/CHANGELOG.md
+++ b/packages/amplify-util-mock/CHANGELOG.md
@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.7.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-util-mock@4.6.1...amplify-util-mock@4.7.0) (2022-11-17)
+
+
+### Features
+
+* add searchable mocking ([#11326](https://github.com/aws-amplify/amplify-cli/issues/11326)) ([da313bb](https://github.com/aws-amplify/amplify-cli/commit/da313bbaa61068519e6f1dfefd6029e9479d226a))
+* add Searchable mocking feature ([#11089](https://github.com/aws-amplify/amplify-cli/issues/11089)) ([899fe22](https://github.com/aws-amplify/amplify-cli/commit/899fe225b31a3d0e88a8090e13b8da0c725b69a1))
+
+
+### Reverts
+
+* Revert "feat: add Searchable mocking feature (#11089)" (#11324) ([6dfe8ed](https://github.com/aws-amplify/amplify-cli/commit/6dfe8ed16549a40c3ad72248612414287a444d8f)), closes [#11089](https://github.com/aws-amplify/amplify-cli/issues/11089) [#11324](https://github.com/aws-amplify/amplify-cli/issues/11324)
+
+
+
+## 10.3.2 (2022-10-25)
+
+
+
+
+
 ## [4.6.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-util-mock@4.6.0...amplify-util-mock@4.6.1) (2022-11-11)
 
 **Note:** Version bump only for package amplify-util-mock
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
index 3f7a9ebf742..4f70ea0b5cd 100644
--- a/packages/amplify-util-mock/package.json
+++ b/packages/amplify-util-mock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-util-mock",
-  "version": "4.6.1",
+  "version": "4.7.0",
   "description": "amplify cli plugin providing local testing",
   "repository": {
     "type": "git",
@@ -28,15 +28,15 @@
     "jest": "jest"
   },
   "dependencies": {
-    "@aws-amplify/amplify-appsync-simulator": "2.7.0",
+    "@aws-amplify/amplify-appsync-simulator": "2.8.0",
+    "@aws-amplify/amplify-opensearch-simulator": "1.1.0",
     "@hapi/topo": "^5.0.0",
-    "amplify-category-function": "4.2.0",
-    "amplify-cli-core": "3.3.0",
+    "amplify-category-function": "4.2.1",
+    "amplify-cli-core": "3.4.0",
     "amplify-codegen": "^3.3.2",
-    "amplify-dynamodb-simulator": "2.5.0",
-    "@aws-amplify/amplify-opensearch-simulator": "1.0.0",
-    "amplify-prompts": "2.6.0",
-    "amplify-provider-awscloudformation": "6.9.0",
+    "amplify-dynamodb-simulator": "2.5.1",
+    "amplify-prompts": "2.6.1",
+    "amplify-provider-awscloudformation": "6.9.1",
     "amplify-storage-simulator": "1.7.0",
     "chokidar": "^3.5.3",
     "detect-port": "^1.3.0",
@@ -69,7 +69,7 @@
     "@types/semver": "^7.1.0",
     "@types/which": "^1.3.2",
     "amplify-function-plugin-interface": "1.9.5",
-    "amplify-nodejs-function-runtime-provider": "2.3.4",
+    "amplify-nodejs-function-runtime-provider": "2.3.5",
     "aws-appsync": "^4.1.4",
     "aws-sdk": "^2.1233.0",
     "aws-sdk-mock": "^5.8.0",
@@ -122,4 +122,4 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/amplify-util-uibuilder/CHANGELOG.md b/packages/amplify-util-uibuilder/CHANGELOG.md
index a351722da09..ba450664091 100644
--- a/packages/amplify-util-uibuilder/CHANGELOG.md
+++ b/packages/amplify-util-uibuilder/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0...@aws-amplify/amplify-util-uibuilder@1.6.1) (2022-11-17)
+
+
+### Bug Fixes
+
+* generate default theme if user has no themes ([#11343](https://github.com/aws-amplify/amplify-cli/issues/11343)) ([13a02ac](https://github.com/aws-amplify/amplify-cli/commit/13a02ac32de717a518336871b1c741aa2714562b))
+
+
+
+
+
 # [1.6.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.5.0...@aws-amplify/amplify-util-uibuilder@1.6.0) (2022-10-27)
 
 
diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
index f6705278740..dfc18dbb46e 100644
--- a/packages/amplify-util-uibuilder/package.json
+++ b/packages/amplify-util-uibuilder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -15,8 +15,8 @@
   "dependencies": {
     "@aws-amplify/codegen-ui": "2.5.4",
     "@aws-amplify/codegen-ui-react": "2.5.4",
-    "amplify-cli-core": "3.3.0",
-    "amplify-prompts": "2.6.0",
+    "amplify-cli-core": "3.4.0",
+    "amplify-prompts": "2.6.1",
     "aws-sdk": "^2.1233.0",
     "fs-extra": "^8.1.0",
     "ora": "^4.0.3"

From 1922caaf70ab7c10ef97996aea355960b9605a96 Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Thu, 17 Nov 2022 10:07:49 -0800
Subject: [PATCH 09/30] chore: truncate long file names (#11422)

---
 packages/amplify-e2e-core/src/nexpect-reporter.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/amplify-e2e-core/src/nexpect-reporter.js b/packages/amplify-e2e-core/src/nexpect-reporter.js
index 4ce3366afee..9f918800a42 100644
--- a/packages/amplify-e2e-core/src/nexpect-reporter.js
+++ b/packages/amplify-e2e-core/src/nexpect-reporter.js
@@ -84,7 +84,10 @@ class AmplifyCLIExecutionReporter {
               // this ensures only alphanumeric values are in the file name
               sanitizedSections.push(section.replace(/[^a-z0-9]/gi, '_').toLowerCase());
             }
-            const suffix = sanitizedSections.join('_');
+            let suffix = sanitizedSections.join('_');
+            if(suffix.length > 30){
+              suffix = suffix.substring(0, 30);
+            }
             const castFile = `${new Date().getTime()}_${index}_${suffix}.cast`;
             const castFilePath = path.join(publicPath, castFile);
             fs.writeFileSync(castFilePath, r.recording);

From d8a9270ab99ccd5f03a7c7b0c9fba264fabf9daf Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Thu, 17 Nov 2022 11:02:10 -0800
Subject: [PATCH 10/30] chore: add random delay to spread sdk calls (#11423)

---
 .circleci/local_publish_helpers.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/local_publish_helpers.sh b/.circleci/local_publish_helpers.sh
index 7ebe3ebd977..2307ffac379 100644
--- a/.circleci/local_publish_helpers.sh
+++ b/.circleci/local_publish_helpers.sh
@@ -208,6 +208,8 @@ function setAwsAccountCredentials {
     export AWS_ACCESS_KEY_ID_ORIG=$AWS_ACCESS_KEY_ID
     export AWS_SECRET_ACCESS_KEY_ORIG=$AWS_SECRET_ACCESS_KEY
     export AWS_SESSION_TOKEN_ORIG=$AWS_SESSION_TOKEN
+    # introduce a delay of up to 3 minutes to allow for more even spread aws list-accounts calls due to throttling
+    sleep $[ ( $RANDOM % 180 )  + 1 ]s
     if [[ "$OSTYPE" == "msys" ]]; then
         # windows provided by circleci has this OSTYPE
         useChildAccountCredentials

From 1dc42bae3f84a78f08f5a2148f50d5db20cbee27 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Thu, 17 Nov 2022 11:46:52 -0800
Subject: [PATCH 11/30] chore: add binary validation in all builds (#11424)

* chore: add binary validation in all builds

* chore: add binary validation in all builds - fix script

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this

* chore: add binary validation in all builds - try this
---
 .circleci/config.base.yml          | 165 ++++++++++++++++++++++++++---
 .circleci/local_publish_helpers.sh |  66 +++++++++---
 .circleci/publish.sh               |  25 ++++-
 3 files changed, 222 insertions(+), 34 deletions(-)

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index 3b4e3745322..42525386a05 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -213,7 +213,30 @@ jobs:
           paths:
             - ~/repo/.amplify-pkg-version
 
-  build_pkg_binaries:
+  upload_pkg_binaries:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-linux-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-macos-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-win-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-arm-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Consolidate binaries cache and upload
+          command: |
+            source .circleci/local_publish_helpers.sh
+            uploadPkgCli
+      - save_cache:
+          key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ~/repo/out
+
+  build_pkg_binaries_linux:
     <<: *linux-e2e-executor
     steps:
       - restore_cache:
@@ -229,14 +252,101 @@ jobs:
             startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
             setNpmRegistryUrlToLocal
             changeNpmGlobalPath
-            generatePkgCli
+            generatePkgCli linux
             unsetNpmRegistryUrl
-            uploadPkgCli
       - save_cache:
-          key: amplify-pkg-binaries-{{ .Branch }}-{{ .Revision }}
+          key: amplify-pkg-binaries-linux-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ~/repo/out
+
+  build_pkg_binaries_macos:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Start verdaccio and package CLI
+          command: |
+            source .circleci/local_publish_helpers.sh
+            startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
+            setNpmRegistryUrlToLocal
+            changeNpmGlobalPath
+            generatePkgCli macos
+            unsetNpmRegistryUrl
+      - save_cache:
+          key: amplify-pkg-binaries-macos-{{ .Branch }}-{{ .Revision }}
           paths:
             - ~/repo/out
 
+  build_pkg_binaries_win:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Start verdaccio and package CLI
+          command: |
+            source .circleci/local_publish_helpers.sh
+            startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
+            setNpmRegistryUrlToLocal
+            changeNpmGlobalPath
+            generatePkgCli win
+            unsetNpmRegistryUrl
+      - save_cache:
+          key: amplify-pkg-binaries-win-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ~/repo/out
+
+  build_pkg_binaries_arm:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - restore_cache:
+          key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Start verdaccio and package CLI
+          command: |
+            source .circleci/local_publish_helpers.sh
+            startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
+            setNpmRegistryUrlToLocal
+            changeNpmGlobalPath
+            generatePkgCli arm
+            unsetNpmRegistryUrl
+      - save_cache:
+          key: amplify-pkg-binaries-arm-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ~/repo/out
+
+  verify_pkg_binaries:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-linux-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-macos-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-win-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-pkg-binaries-arm-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Verify packaged CLI
+          command: |
+            source .circleci/local_publish_helpers.sh
+            verifyPkgCli
+
   graphql_e2e_tests:
     <<: *defaults
     steps:
@@ -748,7 +858,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - integration_test:
           context:
             - e2e-test-context
@@ -762,6 +872,9 @@ workflows:
           requires:
             - build
       - publish_to_local_registry:
+          requires:
+            - build
+      - upload_pkg_binaries:
           filters:
             branches:
               only:
@@ -772,19 +885,37 @@ workflows:
                 - /tagged-release\/.*/
                 - /tagged-release-without-e2e-tests\/.*/
                 - /run-e2e\/.*/
-          requires:
-            - build
-      - build_pkg_binaries:
           context:
             - e2e-auth-credentials
             - e2e-test-context
             - amplify-s3-upload
+          requires:
+            - build_pkg_binaries_linux
+            - build_pkg_binaries_macos
+            - build_pkg_binaries_win
+            - build_pkg_binaries_arm
+      - build_pkg_binaries_linux:
+          requires:
+            - publish_to_local_registry
+      - build_pkg_binaries_macos:
+          requires:
+            - publish_to_local_registry
+      - build_pkg_binaries_win:
           requires:
             - publish_to_local_registry
+      - build_pkg_binaries_arm:
+          requires:
+            - publish_to_local_registry
+      - verify_pkg_binaries:
+          requires:
+            - build_pkg_binaries_linux
+            - build_pkg_binaries_macos
+            - build_pkg_binaries_win
+            - build_pkg_binaries_arm
       - amplify_sudo_install_test:
           context: amplify-ecr-image-pull
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
           filters:
             branches:
               only:
@@ -817,7 +948,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
             - build_windows_workspace_for_e2e
       - amplify_migration_tests_v6:
           context:
@@ -832,7 +963,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - amplify_migration_tests_v5:
           context:
             - e2e-auth-credentials
@@ -846,7 +977,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - amplify_migration_tests_non_multi_env_layers:
           context:
             - e2e-auth-credentials
@@ -860,7 +991,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - amplify_migration_tests_multi_env_layers:
           context:
             - e2e-auth-credentials
@@ -874,7 +1005,7 @@ workflows:
                 - /tagged-release\/.*/
                 - /run-e2e\/.*/
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - amplify_console_integration_tests:
           context:
             - e2e-auth-credentials
@@ -886,11 +1017,11 @@ workflows:
               only:
                 - dev
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
       - github_prerelease:
           context: github-publish
           requires:
-            - build_pkg_binaries
+            - upload_pkg_binaries
           filters:
             branches:
               only:
@@ -949,7 +1080,7 @@ workflows:
             - amplify_migration_tests_non_multi_env_layers
             - amplify_migration_tests_multi_env_layers
             - github_prerelease_install_sanity_check
-            - build_pkg_binaries
+            - upload_pkg_binaries
           filters:
             branches:
               only:
diff --git a/.circleci/local_publish_helpers.sh b/.circleci/local_publish_helpers.sh
index 2307ffac379..6f313f06c1a 100644
--- a/.circleci/local_publish_helpers.sh
+++ b/.circleci/local_publish_helpers.sh
@@ -21,11 +21,6 @@ function uploadPkgCli {
     export version=$(./amplify-pkg-linux-x64 --version)
 
     if [[ "$CIRCLE_BRANCH" == "release" ]] || [[ "$CIRCLE_BRANCH" =~ ^run-e2e-with-rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^release_rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
-        tar -czvf amplify-pkg-linux-arm64.tgz amplify-pkg-linux-arm64
-        tar -czvf amplify-pkg-linux-x64.tgz amplify-pkg-linux-x64
-        tar -czvf amplify-pkg-macos-x64.tgz amplify-pkg-macos-x64
-        tar -czvf amplify-pkg-win-x64.tgz amplify-pkg-win-x64.exe
-
         aws --profile=s3-uploader s3 cp amplify-pkg-win-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-win-x64-$(echo $hash).tgz
         aws --profile=s3-uploader s3 cp amplify-pkg-macos-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-macos-x64-$(echo $hash).tgz
         aws --profile=s3-uploader s3 cp amplify-pkg-linux-arm64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-arm64-$(echo $hash).tgz
@@ -50,7 +45,6 @@ function uploadPkgCli {
         aws --profile=s3-uploader s3 cp amplify-pkg-linux-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64.tgz
 
     else
-        tar -czvf amplify-pkg-linux-x64.tgz amplify-pkg-linux-x64
         aws --profile=s3-uploader s3 cp amplify-pkg-linux-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64-$(echo $hash).tgz
     fi
 
@@ -78,23 +72,65 @@ function generatePkgCli {
 
   # Build pkg cli
   cp package.json ../build/node_modules/package.json
-  if [[ "$CIRCLE_BRANCH" == "release" ]] || [[ "$CIRCLE_BRANCH" =~ ^run-e2e-with-rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^release_rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
-    # This will generate a file our arm64 binary
+
+  if [[ "$@" =~ 'arm' ]]; then
     npx pkg --no-bytecode --public-packages "*" --public -t node14-linux-arm64 ../build/node_modules -o ../out/amplify-pkg-linux-arm64
-    # This will generate files for our x64 binaries.
-    npx pkg -t node14-macos-x64 ../build/node_modules -o ../out/amplify-pkg-macos-x64
+    tar -czvf ../out/amplify-pkg-linux-arm64.tgz ../out/amplify-pkg-linux-arm64
+  fi
+
+  if [[ "$@" =~ 'linux' ]]; then
     npx pkg -t node14-linux-x64 ../build/node_modules -o ../out/amplify-pkg-linux-x64
-    npx pkg -t node14-win-x64 ../build/node_modules -o ../out/amplify-pkg-win-x64.exe
-  else
-    # This will generate files for our x64 binaries.
+    tar -czvf ../out/amplify-pkg-linux-x64.tgz ../out/amplify-pkg-linux-x64
+  fi
+
+  if [[ "$@" =~ 'macos' ]]; then
     npx pkg -t node14-macos-x64 ../build/node_modules -o ../out/amplify-pkg-macos-x64
-    npx pkg -t node14-linux-x64 ../build/node_modules -o ../out/amplify-pkg-linux-x64
-    npx pkg -t node14-win-x64 ../build/node_modules -o ../out/amplify-pkg-win-x64.exe
+    tar -czvf ../out/amplify-pkg-macos-x64.tgz ../out/amplify-pkg-macos-x64
   fi
 
+  if [[ "$@" =~ 'win' ]]; then
+    npx pkg -t node14-win-x64 ../build/node_modules -o ../out/amplify-pkg-win-x64.exe
+    tar -czvf ../out/amplify-pkg-win-x64.tgz ../out/amplify-pkg-win-x64.exe
+  fi
 
   cd ..
 }
+
+function verifyPkgCli {
+    echo "Human readable sizes"
+    du -h out/*
+    echo "Sizes in bytes"
+    wc -c out/*
+
+    linux_compressed_binary_threshold_in_bytes=$((200 * 1024 * 1024))
+    linux_compressed_binary_size=$(wc -c out/amplify-pkg-linux-x64.tgz | awk '{print $1}')
+    if (( linux_compressed_binary_size > linux_compressed_binary_threshold_in_bytes )); then
+      echo "Linux compressed binary size has grown over $linux_compressed_binary_threshold_in_bytes bytes"
+      exit 1
+    fi
+
+    macos_compressed_binary_threshold_in_bytes=$((200 * 1024 * 1024))
+    macos_compressed_binary_size=$(wc -c out/amplify-pkg-macos-x64.tgz | awk '{print $1}')
+    if (( macos_compressed_binary_size > macos_compressed_binary_threshold_in_bytes )); then
+      echo "MacOS compressed binary size has grown over $macos_compressed_binary_threshold_in_bytes bytes"
+      exit 1
+    fi
+
+    win_compressed_binary_threshold_in_bytes=$((200 * 1024 * 1024))
+    win_compressed_binary_size=$(wc -c out/amplify-pkg-win-x64.tgz | awk '{print $1}')
+    if (( win_compressed_binary_size > win_compressed_binary_threshold_in_bytes )); then
+      echo "Windows compressed binary size has grown over $win_compressed_binary_threshold_in_bytes bytes"
+      exit 1
+    fi
+
+    arm_compressed_binary_threshold_in_bytes=$((150 * 1024 * 1024))
+    arm_compressed_binary_size=$(wc -c out/amplify-pkg-linux-arm64.tgz | awk '{print $1}')
+    if (( arm_compressed_binary_size > arm_compressed_binary_threshold_in_bytes )); then
+      echo "Windows compressed binary size has grown over $arm_compressed_binary_threshold_in_bytes bytes"
+      exit 1
+    fi
+}
+
 function unsetNpmRegistryUrl {
     # Restore the original NPM and Yarn registry URLs
     npm set registry "https://registry.npmjs.org/"
diff --git a/.circleci/publish.sh b/.circleci/publish.sh
index 56a00931bb7..b30188467e3 100755
--- a/.circleci/publish.sh
+++ b/.circleci/publish.sh
@@ -1,6 +1,27 @@
 #!/bin/bash -e
-git config --global user.email $GITHUB_EMAIL
-git config --global user.name $GITHUB_USER
+
+if [ -z "$GITHUB_EMAIL" ]; then
+  if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
+    git config --global user.email not@used.com
+  else
+    echo "GITHUB_EMAIL email is missing"
+    exit 1
+  fi
+else
+  git config --global user.email $GITHUB_EMAIL
+fi
+
+if [ -z "$GITHUB_USER" ]; then
+  if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
+    git config --global user.name "Doesnt Matter"
+  else
+    echo "GITHUB_USER email is missing"
+    exit 1
+  fi
+else
+  git config --global user.name $GITHUB_USER
+fi
+
 if [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
   if [[ "$CIRCLE_BRANCH" =~ ^tagged-release-without-e2e-tests\/.* ]]; then
     # Remove tagged-release-without-e2e-tests/

From 334173a5cab0ccb34529756b07d4dd9c3b571439 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Thu, 17 Nov 2022 13:52:22 -0800
Subject: [PATCH 12/30] fix: include arm64 in github release (#11431)

* fix: include arm64 in github release

* Update config.base.yml

don't need that
---
 scripts/github-prerelease.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/github-prerelease.ts b/scripts/github-prerelease.ts
index e3390a2a51d..1240d0fbfbb 100644
--- a/scripts/github-prerelease.ts
+++ b/scripts/github-prerelease.ts
@@ -9,7 +9,7 @@ import { unifiedChangelogPath } from './constants';
  */
 const binariesDir = join(__dirname, '..', 'out');
 const binaryNamePrefix = 'amplify-pkg-';
-const platformSuffixes = ['linux', 'macos', 'win.exe'];
+const platformSuffixes = ['linux', 'linux-arm64', 'macos', 'win.exe'];
 
 const validateVersion = async (version: string) => {
   if (!valid(version)) {

From e9fb32fa78c3bdbbc5ef2539a1fe6a93109327ae Mon Sep 17 00:00:00 2001
From: Edward Foyle <foyleef@amazon.com>
Date: Thu, 17 Nov 2022 14:29:59 -0800
Subject: [PATCH 13/30] fix: fallback to tpi when no backend dir (#11419)

---
 .../src/__tests__/attach-backend.test.ts      | 55 +++++++++++++++++++
 packages/amplify-cli/src/attach-backend.ts    |  4 +-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 packages/amplify-cli/src/__tests__/attach-backend.test.ts

diff --git a/packages/amplify-cli/src/__tests__/attach-backend.test.ts b/packages/amplify-cli/src/__tests__/attach-backend.test.ts
new file mode 100644
index 00000000000..de01c11d30e
--- /dev/null
+++ b/packages/amplify-cli/src/__tests__/attach-backend.test.ts
@@ -0,0 +1,55 @@
+import { $TSContext, stateManager } from 'amplify-cli-core';
+import { attachBackend } from '../attach-backend';
+
+jest.mock('../amplify-service-helper');
+jest.mock('../attach-backend-steps/a10-queryProvider');
+jest.mock('../attach-backend-steps/a20-analyzeProject');
+jest.mock('../attach-backend-steps/a30-initFrontend');
+jest.mock('../attach-backend-steps/a40-generateFiles');
+jest.mock('../initialize-env');
+jest.mock('amplify-prompts');
+
+jest.mock('amplify-cli-core');
+jest.mock('fs-extra');
+const stateManagerMock = stateManager as jest.Mocked<typeof stateManager>;
+
+const testAppId = 'testAppId';
+
+stateManagerMock.getTeamProviderInfo.mockReturnValue({
+  test: {
+    awscloudformation: {
+      AmplifyAppId: testAppId,
+    },
+  },
+});
+
+stateManagerMock.getLocalEnvInfo.mockReturnValue({
+  noUpdateBackend: true,
+  envName: 'test',
+});
+stateManagerMock.getLocalAWSInfo.mockReturnValue({
+  test: {},
+});
+
+describe('attachBackend', () => {
+  it('sets input params appId to team provider app id if not already present', async () => {
+    const inputParams = {
+      yes: true,
+      test: {},
+      amplify: {
+        defaultEditor: 'test',
+        projectName: 'test',
+        envName: 'test',
+        frontend: 'test',
+        noOverride: false,
+      },
+    };
+    const contextStub = {
+      exeInfo: {
+        awsConfigInfo: {},
+      },
+    } as unknown as $TSContext;
+    await attachBackend(contextStub, inputParams);
+    expect(contextStub.exeInfo.inputParams.amplify.appId).toBe(testAppId);
+  });
+});
diff --git a/packages/amplify-cli/src/attach-backend.ts b/packages/amplify-cli/src/attach-backend.ts
index d60a71f6bc8..913648128cc 100644
--- a/packages/amplify-cli/src/attach-backend.ts
+++ b/packages/amplify-cli/src/attach-backend.ts
@@ -14,7 +14,6 @@ import { queryProvider } from './attach-backend-steps/a10-queryProvider';
 import { analyzeProject } from './attach-backend-steps/a20-analyzeProject';
 import { initFrontend } from './attach-backend-steps/a30-initFrontend';
 import { generateFiles } from './attach-backend-steps/a40-generateFiles';
-import { getAmplifyAppId } from './extensions/amplify-helpers/get-amplify-appId';
 import { initializeEnv } from './initialize-env';
 
 const backupAmplifyDirName = 'amplify-backup';
@@ -225,7 +224,8 @@ const updateContextForNoUpdateBackendProjects = (context: $TSContext): void => {
     context.exeInfo.inputParams.amplify.envName = context.exeInfo.inputParams.amplify.envName || envName;
     context.exeInfo.inputParams.amplify.frontend = context.exeInfo.inputParams.amplify.frontend
     || context.exeInfo.existingProjectConfig.frontend;
-    context.exeInfo.inputParams.amplify.appId = context.exeInfo.inputParams.amplify.appId || getAmplifyAppId();
+    context.exeInfo.inputParams.amplify.appId = context.exeInfo.inputParams.amplify.appId
+      || context.exeInfo.existingTeamProviderInfo[envName].awscloudformation?.AmplifyAppId;
     // eslint-disable-next-line max-len
     context.exeInfo.inputParams[context.exeInfo.inputParams.amplify.frontend] = context.exeInfo.inputParams[context.exeInfo.inputParams.amplify.frontend]
       || context.exeInfo.existingProjectConfig[context.exeInfo.inputParams.amplify.frontend];

From bd81d741aa93ba7263b378921bf82f771046c5c7 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Fri, 18 Nov 2022 11:03:53 -0800
Subject: [PATCH 14/30] chore: add api extractor (#11346)

* chore: add api extractor

* chore: add api extractor - add yarn install

* chore: add api extractor - try this

* chore: add api extractor - try this

* chore: add api extractor - try this

* chore: add api extractor - try this

* chore: add api extractor - fix warning

* chore: add api extractor - validation

* chore: add api extractor - api files

* chore: add api extractor - api files

* chore: add api extractor - pr feedback

* chore: add api extractor - add hook

* chore: add api extractor - try hook

* chore: add api extractor - try hook

* chore: add api extractor - undo this for now

* chore: add api extractor - refactor this file.

* chore: add api extractor - add hook.

* chore: add api extractor - try hook.

* chore: update API.md

* chore: add api extractor - can't commit on push really

* chore: add api extractor - try hook

* chore: add api extractor - that worked nice.

* chore: add api extractor - missed that part

* chore: add api extractor - remove private

* chore: add api dif
---
 .circleci/config.base.yml                     |   25 +
 CONTRIBUTING.md                               |    2 +-
 nx.json                                       |   51 +-
 package.json                                  |    8 +-
 packages/amplify-appsync-simulator/API.md     |  363 ++++
 .../amplify-appsync-simulator/package.json    |    3 +-
 packages/amplify-category-analytics/API.md    |   55 +
 .../amplify-category-analytics/package.json   |    3 +-
 packages/amplify-category-auth/API.md         |  129 ++
 packages/amplify-category-auth/package.json   |    3 +-
 packages/amplify-category-custom/API.md       |   37 +
 packages/amplify-category-custom/package.json |    3 +-
 packages/amplify-category-function/API.md     |  127 ++
 .../amplify-category-function/package.json    |    3 +-
 packages/amplify-category-geo/API.md          |   28 +
 packages/amplify-category-geo/package.json    |    3 +-
 packages/amplify-category-interactions/API.md |   24 +
 .../package.json                              |    3 +-
 .../amplify-category-notifications/API.md     |   42 +
 .../package.json                              |    3 +-
 packages/amplify-category-predictions/API.md  |    9 +
 .../amplify-category-predictions/package.json |    3 +-
 packages/amplify-category-storage/API.md      |  127 ++
 .../amplify-category-storage/package.json     |    3 +-
 packages/amplify-cli-core/API.md              | 1527 +++++++++++++++++
 packages/amplify-cli-core/package.json        |    3 +-
 .../amplify-cli-extensibility-helper/API.md   |  192 +++
 .../package.json                              |    3 +-
 packages/amplify-cli-logger/API.md            |   23 +
 packages/amplify-cli-logger/package.json      |    3 +-
 packages/amplify-cli-npm/API.md               |   15 +
 packages/amplify-cli-npm/package.json         |    3 +-
 packages/amplify-cli-shared-interfaces/API.md |   88 +
 .../package.json                              |    3 +-
 packages/amplify-cli/API.md                   |  115 ++
 packages/amplify-cli/package.json             |    3 +-
 packages/amplify-console-hosting/API.md       |   25 +
 packages/amplify-console-hosting/package.json |    3 +-
 packages/amplify-container-hosting/API.md     |    9 +
 .../amplify-container-hosting/package.json    |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 .../amplify-environment-parameters/API.md     |   34 +
 .../package.json                              |    3 +-
 .../amplify-function-plugin-interface/API.md  |  360 ++++
 .../package.json                              |    3 +-
 .../API.md                                    |   18 +
 .../package.json                              |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 packages/amplify-headless-interface/API.md    |  662 +++++++
 .../amplify-headless-interface/package.json   |    3 +-
 .../API.md                                    |   18 +
 .../package.json                              |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 .../API.md                                    |   14 +
 .../package.json                              |    3 +-
 packages/amplify-opensearch-simulator/API.md  |   79 +
 .../amplify-opensearch-simulator/package.json |    3 +-
 packages/amplify-prompts/API.md               |  244 +++
 packages/amplify-prompts/package.json         |    3 +-
 .../amplify-provider-awscloudformation/API.md |   52 +
 .../package.json                              |    3 +-
 .../API.md                                    |   18 +
 .../package.json                              |    3 +-
 .../API.md                                    |   18 +
 .../package.json                              |    3 +-
 packages/amplify-storage-simulator/API.md     |   43 +
 .../amplify-storage-simulator/package.json    |    3 +-
 packages/amplify-util-headless-input/API.md   |   54 +
 .../amplify-util-headless-input/package.json  |    3 +-
 packages/amplify-util-import/API.md           |   69 +
 packages/amplify-util-import/package.json     |    3 +-
 packages/amplify-util-mock/API.md             |   15 +
 packages/amplify-util-mock/package.json       |    3 +-
 packages/amplify-util-uibuilder/API.md        |   19 +
 packages/amplify-util-uibuilder/package.json  |    3 +-
 scripts/api-extractor.json                    |   44 +
 scripts/extract-api.ts                        |   39 +
 scripts/package.json                          |    1 +
 scripts/verify_extract_api.sh                 |    8 +
 scripts/yarn.lock                             |  288 ++++
 87 files changed, 5243 insertions(+), 62 deletions(-)
 create mode 100644 packages/amplify-appsync-simulator/API.md
 create mode 100644 packages/amplify-category-analytics/API.md
 create mode 100644 packages/amplify-category-auth/API.md
 create mode 100644 packages/amplify-category-custom/API.md
 create mode 100644 packages/amplify-category-function/API.md
 create mode 100644 packages/amplify-category-geo/API.md
 create mode 100644 packages/amplify-category-interactions/API.md
 create mode 100644 packages/amplify-category-notifications/API.md
 create mode 100644 packages/amplify-category-predictions/API.md
 create mode 100644 packages/amplify-category-storage/API.md
 create mode 100644 packages/amplify-cli-core/API.md
 create mode 100644 packages/amplify-cli-extensibility-helper/API.md
 create mode 100644 packages/amplify-cli-logger/API.md
 create mode 100644 packages/amplify-cli-npm/API.md
 create mode 100644 packages/amplify-cli-shared-interfaces/API.md
 create mode 100644 packages/amplify-cli/API.md
 create mode 100644 packages/amplify-console-hosting/API.md
 create mode 100644 packages/amplify-container-hosting/API.md
 create mode 100644 packages/amplify-dotnet-function-runtime-provider/API.md
 create mode 100644 packages/amplify-dotnet-function-template-provider/API.md
 create mode 100644 packages/amplify-environment-parameters/API.md
 create mode 100644 packages/amplify-function-plugin-interface/API.md
 create mode 100644 packages/amplify-go-function-runtime-provider/API.md
 create mode 100644 packages/amplify-go-function-template-provider/API.md
 create mode 100644 packages/amplify-headless-interface/API.md
 create mode 100644 packages/amplify-java-function-runtime-provider/API.md
 create mode 100644 packages/amplify-java-function-template-provider/API.md
 create mode 100644 packages/amplify-nodejs-function-runtime-provider/API.md
 create mode 100644 packages/amplify-nodejs-function-template-provider/API.md
 create mode 100644 packages/amplify-opensearch-simulator/API.md
 create mode 100644 packages/amplify-prompts/API.md
 create mode 100644 packages/amplify-provider-awscloudformation/API.md
 create mode 100644 packages/amplify-python-function-runtime-provider/API.md
 create mode 100644 packages/amplify-python-function-template-provider/API.md
 create mode 100644 packages/amplify-storage-simulator/API.md
 create mode 100644 packages/amplify-util-headless-input/API.md
 create mode 100644 packages/amplify-util-import/API.md
 create mode 100644 packages/amplify-util-mock/API.md
 create mode 100644 packages/amplify-util-uibuilder/API.md
 create mode 100644 scripts/api-extractor.json
 create mode 100644 scripts/extract-api.ts
 create mode 100755 scripts/verify_extract_api.sh

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index 42525386a05..745beb062b9 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -156,6 +156,21 @@ jobs:
           key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - run: chmod +x .circleci/lint_pr.sh && ./.circleci/lint_pr.sh
 
+  verify-api-extract:
+    <<: *linux-e2e-executor
+    steps:
+      - restore_cache:
+          key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - run:
+          name: extract api
+          command: |
+            cd scripts
+            yarn install
+            cd ..
+            yarn verify-api-extract
+
   mock_e2e_tests:
     <<: *linux-e2e-executor
     steps:
@@ -828,6 +843,16 @@ workflows:
                 - release
                 - /release_rc\/.*/
                 - /tagged-release-without-e2e-tests\/.*/
+      - verify-api-extract:
+          requires:
+            - build
+          filters:
+            branches:
+              ignore:
+                - beta
+                - release
+                - /release_rc\/.*/
+                - /tagged-release-without-e2e-tests\/.*/
       - test:
           requires:
             - build
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b528fa627ae..814d972c0c0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -171,7 +171,7 @@ You will notice the extra actions carried out when you run the `git commit` or `
 "husky": {
     "hooks": {
         "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-        "pre-push": "yarn build-tests-changed && yarn split-e2e-tests",
+        "pre-push": "yarn verify-api-extract && yarn build-tests-changed && yarn split-e2e-tests",
         "pre-commit": "yarn verify-commit"
     }
 }
diff --git a/nx.json b/nx.json
index 549cca57a91..630d8798c40 100644
--- a/nx.json
+++ b/nx.json
@@ -10,31 +10,44 @@
           "test",
           "lint",
           "package",
-          "prepare"
+          "prepare",
+          "extract-api"
         ]
       }
     }
   },
-  "targetDependencies": {
-    "build": [
-      {
-        "target": "build",
-        "projects": "dependencies"
-      }
-    ],
-    "prepare": [
-      {
-        "target": "prepare",
-        "projects": "dependencies"
-      }
-    ],
-    "package": [
-      {
-        "target": "package",
-        "projects": "dependencies"
-      }
+  "namedInputs": {
+    "default": [
+      "{projectRoot}/**/*",
+      "!{projectRoot}/**/*.md"
     ]
   },
+  "targetDefaults": {
+    "build": {
+      "inputs": [ "default", "^default" ],
+      "dependsOn": [ "^build" ]
+    },
+    "prepare": {
+      "inputs": [ "default", "^default" ],
+      "dependsOn": [ "^prepare" ]
+    },
+    "package": {
+      "inputs": [ "default", "^default" ],
+      "dependsOn": [ "^package" ]
+    },
+    "test": {
+      "inputs": [ "default", "^default" ],
+      "dependsOn": [ "build" ]
+    },
+    "extract-api": {
+      "dependsOn": [ "build" ],
+      "inputs": [
+        "{projectRoot}/src/**/*",
+        "!{projectRoot}/src/__tests__/**/*"
+      ],
+      "outputs": [ "{projectRoot}/API.md" ]
+    }
+  },
   "affected": {
     "defaultBase": "dev"
   },
diff --git a/package.json b/package.json
index 8ea57cc9d1a..d153180da94 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,9 @@
     "release-rc": "./scripts/release-rc.sh",
     "promote-rc": "./scripts/promote-rc.sh",
     "finish-release": "./scripts/finish-release.sh",
-    "update-data-packages": "./scripts/update-data-dependencies.sh && yarn"
+    "update-data-packages": "./scripts/update-data-dependencies.sh && yarn",
+    "extract-api": "nx run-many --target=extract-api --all",
+    "verify-api-extract": "yarn extract-api && ./scripts/verify_extract_api.sh"
   },
   "bugs": {
     "url": "https://github.com/aws-amplify/amplify-cli/issues"
@@ -61,7 +63,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-push": "yarn build-tests-changed && yarn split-e2e-tests",
+      "pre-push": "yarn verify-api-extract && yarn build-tests-changed && yarn split-e2e-tests",
       "pre-commit": "yarn verify-commit"
     }
   },
@@ -137,4 +139,4 @@
     "**/nth-check": "^2.0.1",
     "**/undici": "^5.8.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/amplify-appsync-simulator/API.md b/packages/amplify-appsync-simulator/API.md
new file mode 100644
index 00000000000..32fae224b83
--- /dev/null
+++ b/packages/amplify-appsync-simulator/API.md
@@ -0,0 +1,363 @@
+## API Report File for "@aws-amplify/amplify-appsync-simulator"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { GraphQLResolveInfo } from 'graphql';
+import { GraphQLSchema } from 'graphql';
+import { PubSub } from 'graphql-subscriptions';
+import { Request as Request_2 } from 'express';
+
+// Warning: (ae-forgotten-export) The symbol "AmplifyAppSyncSimulatorDataLoader" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function addDataLoader(sourceType: AppSyncSimulatorDataSourceType, loader: new (config?: AppSyncSimulatorDataSourceConfig) => AmplifyAppSyncSimulatorDataLoader): void;
+
+// @public (undocumented)
+export type AmplifyAppSyncAPIConfig = {
+    name: string;
+    defaultAuthenticationType: AmplifyAppSyncAuthenticationProviderConfig;
+    authRoleName?: string;
+    unAuthRoleName?: string;
+    authAccessKeyId?: string;
+    accountId?: string;
+    apiKey?: string;
+    additionalAuthenticationProviders: AmplifyAppSyncAuthenticationProviderConfig[];
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderAPIConfig = {
+    authenticationType: AmplifyAppSyncSimulatorAuthenticationType.API_KEY;
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderCognitoConfig = {
+    authenticationType: AmplifyAppSyncSimulatorAuthenticationType.AMAZON_COGNITO_USER_POOLS;
+    cognitoUserPoolConfig: {
+        AppIdClientRegex?: string;
+    };
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderConfig = AmplifyAppSyncAuthenticationProviderAPIConfig | AmplifyAppSyncAuthenticationProviderIAMConfig | AmplifyAppSyncAuthenticationProviderCognitoConfig | AmplifyAppSyncAuthenticationProviderOIDCConfig | AmplifyAppSyncAuthenticationProviderLambdaConfig;
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderIAMConfig = {
+    authenticationType: AmplifyAppSyncSimulatorAuthenticationType.AWS_IAM;
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderLambdaConfig = {
+    authenticationType: AmplifyAppSyncSimulatorAuthenticationType.AWS_LAMBDA;
+    lambdaAuthorizerConfig: {
+        AuthorizerUri: string;
+        AuthorizerResultTtlInSeconds?: number;
+    };
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncAuthenticationProviderOIDCConfig = {
+    authenticationType: AmplifyAppSyncSimulatorAuthenticationType.OPENID_CONNECT;
+    openIDConnectConfig: {
+        Issuer?: string;
+        ClientId?: string;
+    };
+};
+
+// @public (undocumented)
+export class AmplifyAppSyncSimulator {
+    constructor(serverConfig?: AppSyncSimulatorServerConfig);
+    // (undocumented)
+    get appSyncConfig(): AmplifyAppSyncAPIConfig;
+    // (undocumented)
+    asyncIterator(trigger: string): AsyncIterator<any>;
+    // (undocumented)
+    get config(): AmplifyAppSyncSimulatorConfig;
+    // (undocumented)
+    getDataLoader(sourceName: string): AmplifyAppSyncSimulatorDataLoader;
+    // Warning: (ae-forgotten-export) The symbol "AmplifySimulatorFunction" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    getFunction(functionName: string): AmplifySimulatorFunction;
+    // (undocumented)
+    getMappingTemplate(path: string): VelocityTemplate;
+    // (undocumented)
+    getResolver(typeName: any, fieldName: any): any;
+    // (undocumented)
+    init(config: AmplifyAppSyncSimulatorConfig): void;
+    // (undocumented)
+    get pubsub(): PubSub;
+    // (undocumented)
+    reload(config: AmplifyAppSyncSimulatorConfig): void;
+    // (undocumented)
+    get schema(): GraphQLSchema;
+    // (undocumented)
+    start(): Promise<void>;
+    // (undocumented)
+    stop(): void;
+    // (undocumented)
+    get url(): string;
+}
+
+// @public (undocumented)
+export enum AmplifyAppSyncSimulatorAuthenticationType {
+    // (undocumented)
+    AMAZON_COGNITO_USER_POOLS = "AMAZON_COGNITO_USER_POOLS",
+    // (undocumented)
+    API_KEY = "API_KEY",
+    // (undocumented)
+    AWS_IAM = "AWS_IAM",
+    // (undocumented)
+    AWS_LAMBDA = "AWS_LAMBDA",
+    // (undocumented)
+    OPENID_CONNECT = "OPENID_CONNECT"
+}
+
+// @public (undocumented)
+export type AmplifyAppSyncSimulatorConfig = {
+    schema: AppSyncSimulatorSchemaConfig;
+    resolvers?: (AppSyncSimulatorUnitResolverConfig | AppSyncSimulatorPipelineResolverConfig)[];
+    functions?: AppSyncSimulatorFunctionsConfig[];
+    dataSources?: AppSyncSimulatorDataSourceConfig[];
+    mappingTemplates?: AppSyncSimulatorMappingTemplate[];
+    tables?: AppSyncSimulatorTable[];
+    appSync: AmplifyAppSyncAPIConfig;
+};
+
+// @public (undocumented)
+export type AmplifyAppSyncSimulatorRequestContext = {
+    jwt?: object;
+    requestAuthorizationMode: AmplifyAppSyncSimulatorAuthenticationType;
+    request: Request_2;
+    appsyncErrors: {};
+};
+
+// @public (undocumented)
+export type AppSyncGraphQLExecutionContext = {
+    readonly sourceIp?: string;
+    readonly jwt?: JWTToken;
+    readonly iamToken?: IAMToken;
+    headers: Record<string, string | string[]>;
+    appsyncErrors?: Error[];
+    requestAuthorizationMode: AmplifyAppSyncSimulatorAuthenticationType;
+};
+
+// @public (undocumented)
+export type AppSyncMockFile = {
+    path?: string;
+    content: string;
+};
+
+// @public (undocumented)
+export interface AppSyncSimulatorBaseResolverConfig {
+    // (undocumented)
+    requestMappingTemplate?: string;
+    // (undocumented)
+    requestMappingTemplateLocation?: string;
+    // (undocumented)
+    responseMappingTemplate?: string;
+    // (undocumented)
+    responseMappingTemplateLocation?: string;
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorDataSourceBaseConfig {
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    type: AppSyncSimulatorDataSourceType | `${AppSyncSimulatorDataSourceType}`;
+}
+
+// @public (undocumented)
+export type AppSyncSimulatorDataSourceConfig = AppSyncSimulatorDataSourceDDBConfig | AppSyncSimulatorDataSourceNoneConfig | AppSyncSimulatorDataSourceLambdaConfig;
+
+// @public (undocumented)
+export interface AppSyncSimulatorDataSourceDDBConfig extends AppSyncSimulatorDataSourceBaseConfig {
+    // (undocumented)
+    config: {
+        endpoint: string;
+        region?: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
+        tableName: string;
+    };
+    // (undocumented)
+    type: AppSyncSimulatorDataSourceType.DynamoDB | `${AppSyncSimulatorDataSourceType.DynamoDB}`;
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorDataSourceLambdaConfig extends AppSyncSimulatorDataSourceBaseConfig {
+    // (undocumented)
+    invoke: Function;
+    // (undocumented)
+    type: AppSyncSimulatorDataSourceType.Lambda | `${AppSyncSimulatorDataSourceType.Lambda}`;
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorDataSourceNoneConfig extends AppSyncSimulatorDataSourceBaseConfig {
+    // (undocumented)
+    type: AppSyncSimulatorDataSourceType.None | `${AppSyncSimulatorDataSourceType.None}`;
+}
+
+// @public (undocumented)
+export const enum AppSyncSimulatorDataSourceType {
+    // (undocumented)
+    DynamoDB = "AMAZON_DYNAMODB",
+    // (undocumented)
+    Lambda = "AWS_LAMBDA",
+    // (undocumented)
+    None = "NONE",
+    // (undocumented)
+    OpenSearch = "AMAZON_ELASTICSEARCH"
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorFunctionResolverConfig extends AppSyncSimulatorBaseResolverConfig {
+    // (undocumented)
+    dataSourceName: string;
+}
+
+// @public (undocumented)
+export type AppSyncSimulatorFunctionsConfig = {
+    name: string;
+    dataSourceName: string;
+    requestMappingTemplateLocation: string;
+    responseMappingTemplateLocation: string;
+};
+
+// @public (undocumented)
+export type AppSyncSimulatorMappingTemplate = AppSyncMockFile;
+
+// @public (undocumented)
+export interface AppSyncSimulatorPipelineResolver extends AppSyncSimulatorUnitResolverConfig {
+    // (undocumented)
+    functions: string[];
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorPipelineResolverConfig extends AppSyncSimulatorBaseResolverConfig {
+    // (undocumented)
+    fieldName: string;
+    // (undocumented)
+    functions: string[];
+    // (undocumented)
+    kind: RESOLVER_KIND.PIPELINE;
+    // (undocumented)
+    typeName: string;
+}
+
+// @public (undocumented)
+export type AppSyncSimulatorRequestContext = {
+    jwt?: {
+        iss?: string;
+        sub?: string;
+        'cognito:username'?: string;
+    };
+    request?: object;
+};
+
+// @public (undocumented)
+export type AppSyncSimulatorSchemaConfig = AppSyncMockFile;
+
+// @public (undocumented)
+export type AppSyncSimulatorServerConfig = {
+    port?: number;
+    wsPort?: number;
+};
+
+// @public (undocumented)
+export type AppSyncSimulatorTable = string;
+
+// @public (undocumented)
+export interface AppSyncSimulatorUnitResolver extends AppSyncSimulatorUnitResolverConfig {
+    // (undocumented)
+    datSourceName: string;
+}
+
+// @public (undocumented)
+export interface AppSyncSimulatorUnitResolverConfig extends AppSyncSimulatorBaseResolverConfig {
+    // (undocumented)
+    dataSourceName: string;
+    // (undocumented)
+    fieldName: string;
+    // (undocumented)
+    kind: RESOLVER_KIND.UNIT;
+    // (undocumented)
+    typeName: string;
+}
+
+// @public (undocumented)
+export type AppSyncVTLRenderContext = {
+    arguments: object;
+    source: object;
+    stash?: object;
+    result?: any;
+    prevResult?: any;
+    error?: any;
+};
+
+// @public (undocumented)
+export type AppSyncVTLTemplate = AppSyncMockFile;
+
+// @public (undocumented)
+export type IAMToken = {
+    accountId: string;
+    userArn: string;
+    username: string;
+    cognitoIdentityPoolId?: string;
+    cognitoIdentityId?: string;
+    cognitoIdentityAuthType?: 'authenticated' | 'unauthenticated';
+    cognitoIdentityAuthProvider?: string;
+};
+
+// @public (undocumented)
+export type JWTToken = {
+    iss: string;
+    sub: string;
+    aud: string;
+    exp: number;
+    iat: number;
+    event_id?: string;
+    token_use?: string;
+    auth_time?: number;
+    nbf?: number;
+    username?: string;
+    email?: string;
+    groups?: string[];
+    'cognito:username'?: string;
+    'cognito:groups'?: string[];
+};
+
+// @public (undocumented)
+export function removeDataLoader(sourceType: AppSyncSimulatorDataSourceType): boolean;
+
+// @public (undocumented)
+export enum RESOLVER_KIND {
+    // (undocumented)
+    PIPELINE = "PIPELINE",
+    // (undocumented)
+    UNIT = "UNIT"
+}
+
+// @public (undocumented)
+export class VelocityTemplate {
+    constructor(template: AppSyncVTLTemplate, simulatorContext: AmplifyAppSyncSimulator);
+    // (undocumented)
+    render(ctxValues: AppSyncVTLRenderContext, requestContext: AppSyncGraphQLExecutionContext, info?: GraphQLResolveInfo): {
+        result: any;
+        stash: any;
+        args: any;
+        errors: any;
+        isReturn: boolean;
+        hadException: boolean;
+    };
+}
+
+// @public (undocumented)
+export class VelocityTemplateParseError extends Error {
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
index 2f84f1552aa..363d4df72ee 100644
--- a/packages/amplify-appsync-simulator/package.json
+++ b/packages/amplify-appsync-simulator/package.json
@@ -26,7 +26,8 @@
     "clean": "rimraf ./lib tsconfig.tsbuildinfo tsconfig.tests.tsbuildinfo node_modules",
     "watch": "tsc -w",
     "start": "node ./lib/index.js",
-    "test": "jest --logHeapUsage --forceExit"
+    "test": "jest --logHeapUsage --forceExit",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@graphql-tools/schema": "^8.3.1",
diff --git a/packages/amplify-category-analytics/API.md b/packages/amplify-category-analytics/API.md
new file mode 100644
index 00000000000..34d651710e2
--- /dev/null
+++ b/packages/amplify-category-analytics/API.md
@@ -0,0 +1,55 @@
+## API Report File for "amplify-category-analytics"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { IAmplifyResource } from 'amplify-cli-core';
+import { IAnalyticsResource } from 'amplify-cli-core';
+import { IPluginCapabilityAPIResponse } from 'amplify-cli-core';
+import { NotificationChannels } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const analyticsPluginAPICreateResource: (context: $TSContext, resourceProviderServiceName: string) => Promise<IAmplifyResource>;
+
+// @public (undocumented)
+export const analyticsPluginAPIGetResources: (resourceProviderServiceName?: string | undefined, context?: $TSContext | undefined) => Array<IAnalyticsResource>;
+
+// @public (undocumented)
+export const analyticsPluginAPIMigrations: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const analyticsPluginAPIPinpointHasInAppMessagingPolicy: (context: $TSContext) => Promise<boolean>;
+
+// @public (undocumented)
+export const analyticsPluginAPIPostPush: (context: $TSContext) => Promise<$TSContext>;
+
+// @public (undocumented)
+export const analyticsPluginAPIPush: (context: $TSContext, resourceProviderServiceName: string) => Promise<IPluginCapabilityAPIResponse>;
+
+// @public (undocumented)
+export const analyticsPluginAPIToggleNotificationChannel: (resourceProviderServiceName: string, channel: NotificationChannels, enableChannel: boolean) => Promise<IPluginCapabilityAPIResponse>;
+
+// @public (undocumented)
+const console_2: (context: $TSContext) => Promise<void>;
+export { console_2 as console }
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext) => Promise<$TSAny>;
+
+// @public (undocumented)
+export const getPermissionPolicies: (context: $TSContext, resourceOpsMapping: {
+    [x: string]: any;
+}) => Promise<$TSAny>;
+
+// @public (undocumented)
+export const handleAmplifyEvent: (__context: $TSContext, args: $TSAny) => Promise<void>;
+
+// @public (undocumented)
+export const migrate: (context: $TSContext) => void;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
index 82fa95c9179..aeb9fe2981e 100644
--- a/packages/amplify-category-analytics/package.json
+++ b/packages/amplify-category-analytics/package.json
@@ -18,7 +18,8 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
-    "test": "jest --logHeapUsage"
+    "test": "jest --logHeapUsage",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-environment-parameters": "1.2.1",
diff --git a/packages/amplify-category-auth/API.md b/packages/amplify-category-auth/API.md
new file mode 100644
index 00000000000..77764ca24f1
--- /dev/null
+++ b/packages/amplify-category-auth/API.md
@@ -0,0 +1,129 @@
+## API Report File for "@aws-amplify/amplify-category-auth"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { AmplifyCategoryTransform } from 'amplify-cli-core';
+import { Template } from 'amplify-cli-core';
+
+// @public (undocumented)
+export function add(context: any, skipNextSteps?: boolean): Promise<any>;
+
+// @public (undocumented)
+export class AmplifyAuthTransform extends AmplifyCategoryTransform {
+    constructor(resourceName: string);
+    // (undocumented)
+    applyOverride: () => Promise<void>;
+    // (undocumented)
+    saveBuildFiles: (context: $TSContext, template: Template) => Promise<void>;
+    // (undocumented)
+    transform(context: $TSContext): Promise<Template>;
+    // (undocumented)
+    validateCfnParameters(context: $TSContext, oldParameters: $TSAny, parametersJson: $TSAny): boolean;
+}
+
+// @public (undocumented)
+export class AmplifyUserPoolGroupTransform extends AmplifyCategoryTransform {
+    constructor(resourceName: string);
+    // (undocumented)
+    applyOverride: () => Promise<void>;
+    // (undocumented)
+    saveBuildFiles: (__context: $TSContext, template: Template) => Promise<void>;
+    // (undocumented)
+    synthesizeTemplates: () => Promise<Template>;
+    // (undocumented)
+    transform(context: $TSContext): Promise<Template>;
+}
+
+// @public (undocumented)
+export type AuthParameters = {
+    dependsOn?: $TSAny[];
+    triggers?: string;
+    identityPoolName?: string;
+    aliasAttributes?: string[];
+    usernameAttributes?: string[];
+    authProviders?: string[];
+    authProvidersUserPool?: string[];
+    requiredAttributes?: string[];
+    passwordPolicyMinLength?: number;
+    passwordPolicyCharacters?: string[];
+    mfaConfiguration?: string;
+    mfaTypes?: string[];
+    autoVerifiedAttributes?: string[];
+};
+
+// @public (undocumented)
+export function authPluginAPIPush(context: Object): Promise<void>;
+
+// @public (undocumented)
+export const category: "auth";
+
+// @public (undocumented)
+export function checkRequirements(requirements: any, context: any, category: any, targetResourceName: any): Promise<{
+    errors: string[];
+    authEnabled?: undefined;
+} | {
+    authEnabled: boolean;
+    errors?: undefined;
+}>;
+
+// @public (undocumented)
+function console_2(context: any): Promise<any>;
+export { console_2 as console }
+
+// @public (undocumented)
+export function executeAmplifyCommand(context: any): Promise<void>;
+
+// @public (undocumented)
+export function executeAmplifyHeadlessCommand(context: any, headlessPayload: string): Promise<void>;
+
+// @public (undocumented)
+export function externalAuthEnable(context: any, externalCategory: any, resourceName: any, requirements: any): Promise<any>;
+
+// @public (undocumented)
+export const generateAuthStackTemplate: (context: $TSContext, resourceName: string) => Promise<Template>;
+
+// Warning: (ae-forgotten-export) The symbol "FrontEndConfig" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const getFrontendConfig: (authParameters: AuthParameters) => FrontEndConfig;
+
+// @public (undocumented)
+export function getPermissionPolicies(context: any, resourceOpsMapping: any): Promise<{
+    permissionPolicies: any[];
+    resourceAttributes: any[];
+}>;
+
+// @public (undocumented)
+export function handleAmplifyEvent(context: any, args: any): Promise<void>;
+
+// @public (undocumented)
+export function importAuth(context: any): Promise<any>;
+
+// @public (undocumented)
+export function initEnv(context: any): Promise<void>;
+
+// @public (undocumented)
+export function isSMSWorkflowEnabled(context: any, resourceName: any): Promise<boolean>;
+
+// @public (undocumented)
+export function migrate(context: any): Promise<void>;
+
+// @public (undocumented)
+export function migrateAuthResource(context: any, resourceName: any): Promise<boolean>;
+
+// @public (undocumented)
+export function prePushAuthHook(context: any): Promise<void>;
+
+// @public (undocumented)
+export function transformCategoryStack(context: any, resource: any): Promise<void>;
+
+// @public (undocumented)
+export const uploadFiles: (context: $TSContext) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
index 9c07d15e30c..e1d1f11787c 100644
--- a/packages/amplify-category-auth/package.json
+++ b/packages/amplify-category-auth/package.json
@@ -24,7 +24,8 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest --logHeapUsage",
     "test-watch": "jest --watch",
-    "generateSchemas": "ts-node ./scripts/generateAuthSchemas.ts"
+    "generateSchemas": "ts-node ./scripts/generateAuthSchemas.ts",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-environment-parameters": "1.2.1",
diff --git a/packages/amplify-category-custom/API.md b/packages/amplify-category-custom/API.md
new file mode 100644
index 00000000000..397894221a3
--- /dev/null
+++ b/packages/amplify-category-custom/API.md
@@ -0,0 +1,37 @@
+## API Report File for "@aws-amplify/amplify-category-custom"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import * as cdk from '@aws-cdk/core';
+import { IAmplifyResource } from 'amplify-cli-core';
+
+// Warning: (ae-forgotten-export) The symbol "AmplifyDependentResourceDefinition" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function addCDKResourceDependency(stack: cdk.Stack, category: string, resourceName: string, dependentResources: AmplifyDependentResourceDefinition[]): any;
+
+// @public (undocumented)
+export type AmplifyResourceProps = {
+    category: string;
+    resourceName: string;
+};
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const generateDependentResourcesType: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const handleAmplifyEvent: (__context: $TSContext, args: $TSAny) => Promise<void>;
+
+// @public (undocumented)
+export const transformCategoryStack: (context: $TSContext, resource: IAmplifyResource) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
index fb972e121cf..0fc93ab17c7 100644
--- a/packages/amplify-category-custom/package.json
+++ b/packages/amplify-category-custom/package.json
@@ -15,7 +15,8 @@
     "build": "tsc",
     "test": "jest --logHeapUsage",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-category-function/API.md b/packages/amplify-category-function/API.md
new file mode 100644
index 00000000000..a436938c0d0
--- /dev/null
+++ b/packages/amplify-category-function/API.md
@@ -0,0 +1,127 @@
+## API Report File for "amplify-category-function"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { $TSObject } from 'amplify-cli-core';
+import { BuildType } from 'amplify-function-plugin-interface';
+import { FunctionParameters } from 'amplify-function-plugin-interface';
+import { ResourceTuple } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const add: (context: any, providerName: any, service: any, parameters: any) => Promise<string>;
+
+// @public (undocumented)
+export function addAppSyncInvokeMethodPermission(functionName: string): void;
+
+// Warning: (ae-forgotten-export) The symbol "ExecRolePermissionsResponse" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const askExecRolePermissionsQuestions: (context: $TSContext, resourceNameToUpdate: string, currentPermissionMap?: any, currentEnvMap?: any, category?: string, serviceName?: string) => Promise<ExecRolePermissionsResponse>;
+
+// Warning: (ae-forgotten-export) The symbol "BuildRequestMeta" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const buildResource: (context: $TSContext, resource: BuildRequestMeta & {
+    service: string;
+}) => Promise<string | Date>;
+
+// @public (undocumented)
+export const buildTypeKeyMap: Record<BuildType, string>;
+
+// @public (undocumented)
+export const category = "function";
+
+// @public (undocumented)
+const console_2: (context: $TSContext) => Promise<void>;
+export { console_2 as console }
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const getBuilder: (context: $TSContext, resourceName: string, buildType: BuildType) => () => Promise<void>;
+
+// @public (undocumented)
+export const getInvoker: (context: $TSContext, { handler, resourceName, envVars }: InvokerParameters) => Promise<({ event: unknown }: {
+    event: any;
+}) => Promise<$TSAny>>;
+
+// @public (undocumented)
+export const getPermissionPolicies: (context: $TSContext, resourceOpsMapping: $TSAny) => Promise<{
+    permissionPolicies: $TSAny[];
+    resourceAttributes: $TSAny[];
+}>;
+
+// @public (undocumented)
+export const handleAmplifyEvent: (context: $TSContext, args: $TSAny) => Promise<void>;
+
+// @public (undocumented)
+export const hashLayerResource: (layerPath: string, resourceName: string) => Promise<string>;
+
+// @public (undocumented)
+export const initEnv: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export type InvokerParameters = {
+    resourceName: string;
+    handler: string;
+    envVars?: {
+        [key: string]: string;
+    };
+};
+
+// @public (undocumented)
+export const isMockable: (context: $TSContext, resourceName: string) => IsMockableResponse;
+
+// @public (undocumented)
+export interface IsMockableResponse {
+    // (undocumented)
+    isMockable: boolean;
+    // (undocumented)
+    reason?: string;
+}
+
+// @public (undocumented)
+export const lambdaLayerPrompt: (context: $TSContext, resources: $TSAny[]) => Promise<void>;
+
+// @public (undocumented)
+export function lambdasWithApiDependency(context: $TSContext, allResources: $TSObject[], backendDir: string, modelsDeleted: string[]): Promise<any[]>;
+
+// @public (undocumented)
+export const loadFunctionParameters: (resourcePath: string) => any;
+
+// @public (undocumented)
+export const migrate: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const migrateLegacyLayer: (context: $TSContext, layerName: string) => Promise<boolean>;
+
+// Warning: (ae-forgotten-export) The symbol "Packager" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const packageResource: Packager;
+
+// @public (undocumented)
+export const postPushCleanup: (resource: $TSAny[], envName: string) => Promise<void>;
+
+// @public (undocumented)
+export const enum ServiceName {
+    // (undocumented)
+    LambdaFunction = "Lambda",
+    // (undocumented)
+    LambdaLayer = "LambdaLayer"
+}
+
+// @public (undocumented)
+export const update: (context: any, providerName: any, service: any, parameters: any, resourceToUpdate: any) => Promise<$TSAny>;
+
+// @public (undocumented)
+export function updateDependentFunctionsCfn(context: $TSContext, dependentFunctionResource: $TSObject[], backendDir: string, modelsDeleted: string[], apiResource: string): Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
index 3c729acce27..2041cc715d0 100644
--- a/packages/amplify-category-function/package.json
+++ b/packages/amplify-category-function/package.json
@@ -15,7 +15,8 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest --logHeapUsage",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-category-geo/API.md b/packages/amplify-category-geo/API.md
new file mode 100644
index 00000000000..ba15d9820b4
--- /dev/null
+++ b/packages/amplify-category-geo/API.md
@@ -0,0 +1,28 @@
+## API Report File for "amplify-category-geo"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { $TSObject } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const executeAmplifyHeadlessCommand: (context: $TSContext, headlessPayload: string) => Promise<void>;
+
+// @public (undocumented)
+export const getPermissionPolicies: (context: $TSContext, resourceOpsMapping: $TSObject) => {
+    permissionPolicies: $TSObject[];
+    resourceAttributes: $TSObject[];
+};
+
+// @public (undocumented)
+export const handleAmplifyEvent: (context: $TSContext, args: $TSAny) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
index 92adbd8e329..44d8f2e5349 100644
--- a/packages/amplify-category-geo/package.json
+++ b/packages/amplify-category-geo/package.json
@@ -15,7 +15,8 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest --logHeapUsage",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-category-interactions/API.md b/packages/amplify-category-interactions/API.md
new file mode 100644
index 00000000000..87b2e802fc3
--- /dev/null
+++ b/packages/amplify-category-interactions/API.md
@@ -0,0 +1,24 @@
+## API Report File for "amplify-category-interactions"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export function executeAmplifyCommand(context: any): Promise<void>;
+
+// @public (undocumented)
+export function getPermissionPolicies(context: any, resourceOpsMapping: any): Promise<{
+    permissionPolicies: any[];
+    resourceAttributes: any[];
+}>;
+
+// @public (undocumented)
+export function handleAmplifyEvent(context: any, args: any): Promise<void>;
+
+// @public (undocumented)
+export function migrate(context: any): Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-interactions/package.json b/packages/amplify-category-interactions/package.json
index c7310ee190f..d5cbfdce0e7 100644
--- a/packages/amplify-category-interactions/package.json
+++ b/packages/amplify-category-interactions/package.json
@@ -18,7 +18,8 @@
     "build": "tsc && yarn copy-templates",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
-    "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && yarn copyfiles -u 4 src/provider-utils/awscloudformation/function-template-dir/*.ejs lib/provider-utils/awscloudformation/function-template-dir/"
+    "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && yarn copyfiles -u 4 src/provider-utils/awscloudformation/function-template-dir/*.ejs lib/provider-utils/awscloudformation/function-template-dir/",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-category-notifications/API.md b/packages/amplify-category-notifications/API.md
new file mode 100644
index 00000000000..fb16e93a972
--- /dev/null
+++ b/packages/amplify-category-notifications/API.md
@@ -0,0 +1,42 @@
+## API Report File for "amplify-category-notifications"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { INotificationsResource } from 'amplify-cli-core';
+import { IPluginAPIResponse } from 'amplify-cli-core';
+
+// @public (undocumented)
+const console_2: (context: $TSContext) => Promise<void>;
+export { console_2 as console }
+
+// @public (undocumented)
+export const deletePinpointAppForEnv: (context: $TSContext, envName: string) => Promise<void>;
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const handleAmplifyEvent: (__context: $TSContext, args: $TSAny) => void;
+
+// @public (undocumented)
+export const initEnv: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const migrate: (context: $TSContext) => Promise<void>;
+
+// @public (undocumented)
+export const notificationsAPIGetAvailableChannelNames: (__context: $TSContext) => Promise<string[]>;
+
+// @public (undocumented)
+export const notificationsPluginAPIGetResource: (context: $TSContext) => Promise<INotificationsResource | undefined>;
+
+// @public (undocumented)
+export const notificationsPluginAPIRemoveApp: (context: $TSContext, appName: string) => Promise<IPluginAPIResponse | undefined>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json
index 9da61a5f608..5abccb56caf 100644
--- a/packages/amplify-category-notifications/package.json
+++ b/packages/amplify-category-notifications/package.json
@@ -19,7 +19,8 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "test": "jest --logHeapUsage",
-    "watch": "tsc --watch"
+    "watch": "tsc --watch",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-environment-parameters": "1.2.1",
diff --git a/packages/amplify-category-predictions/API.md b/packages/amplify-category-predictions/API.md
new file mode 100644
index 00000000000..757179f0db3
--- /dev/null
+++ b/packages/amplify-category-predictions/API.md
@@ -0,0 +1,9 @@
+## API Report File for "amplify-category-predictions"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json
index b01adaf13d8..fbca1beccb3 100644
--- a/packages/amplify-category-predictions/package.json
+++ b/packages/amplify-category-predictions/package.json
@@ -18,7 +18,8 @@
     "build": "tsc && yarn copy-templates",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
-    "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && copyfiles -u 4 src/provider-utils/awscloudformation/triggers/**/*.ejs lib/provider-utils/awscloudformation/triggers/"
+    "copy-templates": "copyfiles -u 4 src/provider-utils/awscloudformation/cloudformation-templates/* lib/provider-utils/awscloudformation/cloudformation-templates/ && copyfiles -u 4 src/provider-utils/awscloudformation/triggers/**/*.ejs lib/provider-utils/awscloudformation/triggers/",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-category-storage/API.md b/packages/amplify-category-storage/API.md
new file mode 100644
index 00000000000..2d87d3d3b1e
--- /dev/null
+++ b/packages/amplify-category-storage/API.md
@@ -0,0 +1,127 @@
+## API Report File for "@aws-amplify/amplify-category-storage"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { IAmplifyResource } from 'amplify-cli-core';
+
+// @public (undocumented)
+export function add(context: any, providerName: any, service: any): Promise<any>;
+
+// @public (undocumented)
+export function canResourceBeTransformed(context: $TSContext, resourceName: string): boolean;
+
+// @public (undocumented)
+export const category = "storage";
+
+// @public (undocumented)
+function console_2(context: any): Promise<void>;
+export { console_2 as console }
+
+// @public (undocumented)
+export function executeAmplifyCommand(context: any): Promise<void>;
+
+// @public (undocumented)
+export const executeAmplifyHeadlessCommand: (context: $TSContext, headlessPayload: string) => Promise<void>;
+
+// Warning: (ae-forgotten-export) The symbol "S3PermissionType" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function getDefaultAuthPermissions(): Promise<S3PermissionType[]>;
+
+// @public (undocumented)
+export function getPermissionPolicies(context: any, resourceOpsMapping: any): Promise<{
+    permissionPolicies: any;
+    resourceAttributes: any;
+}>;
+
+// @public (undocumented)
+export function handleAmplifyEvent(context: $TSContext, args: $TSAny): Promise<void>;
+
+// @public (undocumented)
+export function initEnv(context: any): Promise<void>;
+
+// @public (undocumented)
+export function migrateStorageCategory(context: any): Promise<void>;
+
+// @public (undocumented)
+export function s3AddStorageLambdaTrigger(context: $TSContext, s3ResourceName: string, storageLambdaTrigger: S3UserInputTriggerFunctionParams): Promise<S3UserInputs>;
+
+// @public (undocumented)
+export function s3CreateStorageResource(context: $TSContext, storageInput: S3UserInputs): Promise<S3UserInputs>;
+
+// Warning: (ae-forgotten-export) The symbol "S3AccessType" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function s3GetBucketUserInputDefault(project: $TSAny, shortId: string, accessType: S3AccessType): Promise<S3UserInputs>;
+
+// @public (undocumented)
+export function s3GetResourceName(): string | undefined;
+
+// @public (undocumented)
+export function s3GetUserInput(context: $TSContext, s3ResourceName: string): Promise<S3UserInputs>;
+
+// @public (undocumented)
+export function s3RegisterAdminTrigger(context: $TSContext, s3ResourceName: string, adminLambdaTrigger: S3UserInputTriggerFunctionParams): Promise<S3UserInputs>;
+
+// @public (undocumented)
+export function s3RemoveAdminLambdaTrigger(context: $TSContext, s3ResourceName: string): Promise<S3UserInputs>;
+
+// @public (undocumented)
+export function s3RemoveStorageLambdaTrigger(context: $TSContext, s3ResourceName: string): Promise<void>;
+
+// @public (undocumented)
+export interface S3UserInputs {
+    // (undocumented)
+    additionalTriggerFunctions?: S3UserInputTriggerFunctionParams[] | undefined;
+    // (undocumented)
+    adminTriggerFunction?: S3UserInputTriggerFunctionParams | undefined;
+    // (undocumented)
+    authAccess: S3PermissionType[];
+    // (undocumented)
+    bucketName: string | undefined;
+    // Warning: (ae-forgotten-export) The symbol "GroupAccessType" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    groupAccess?: GroupAccessType | undefined;
+    // (undocumented)
+    guestAccess: S3PermissionType[];
+    // (undocumented)
+    policyUUID: string | undefined;
+    // (undocumented)
+    resourceName: string | undefined;
+    // (undocumented)
+    storageAccess: S3AccessType | undefined;
+    // (undocumented)
+    triggerFunction?: string | undefined;
+}
+
+// @public (undocumented)
+export interface S3UserInputTriggerFunctionParams {
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    permissions: S3PermissionType[];
+    // (undocumented)
+    tag?: string;
+    // Warning: (ae-forgotten-export) The symbol "S3TriggerEventType" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    triggerEvents: S3TriggerEventType[];
+    // (undocumented)
+    triggerFunction: string;
+    // Warning: (ae-forgotten-export) The symbol "S3TriggerPrefixType" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    triggerPrefix?: S3TriggerPrefixType[];
+}
+
+// @public (undocumented)
+export function transformCategoryStack(context: $TSContext, resource: IAmplifyResource): Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-category-storage/package.json b/packages/amplify-category-storage/package.json
index fd445c2c9a0..069f25b9909 100644
--- a/packages/amplify-category-storage/package.json
+++ b/packages/amplify-category-storage/package.json
@@ -16,7 +16,8 @@
     "test": "jest --logHeapUsage",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc -w",
-    "generateSchemas": "ts-node ./resources/genInputSchema.ts"
+    "generateSchemas": "ts-node ./resources/genInputSchema.ts",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-cli-core/API.md b/packages/amplify-cli-core/API.md
new file mode 100644
index 00000000000..94378a26624
--- /dev/null
+++ b/packages/amplify-cli-core/API.md
@@ -0,0 +1,1527 @@
+## API Report File for "amplify-cli-core"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import Ajv from 'ajv';
+import { ApiKeyConfig } from '@aws-amplify/graphql-transformer-interfaces';
+import * as cdk from '@aws-cdk/core';
+import { ChildProcess } from 'child_process';
+import { DeploymentResources } from '@aws-amplify/graphql-transformer-core';
+import { DeploymentResources as DeploymentResources_2 } from 'graphql-transformer-core';
+import opn from 'open';
+import { Ora } from 'ora';
+import { Template as Template_2 } from 'cloudform-types';
+
+// @public (undocumented)
+export type $IPluginManifest = $TSAny;
+
+// @public (undocumented)
+export type $TSAny = any;
+
+// @public (undocumented)
+export type $TSContext = {
+    amplify: AmplifyToolkit;
+    print: IContextPrint;
+    migrationInfo: $TSAny;
+    projectHasMobileHubResources: boolean;
+    prompt: $TSAny;
+    exeInfo: $TSAny;
+    input: $TSAny;
+    parameters: $TSAny;
+    usageData: $TSAny;
+    runtime: $TSAny;
+    pluginPlatform: IPluginPlatform;
+    newUserInfo?: $TSAny;
+    filesystem: IContextFilesystem;
+    template: IContextTemplate;
+    updatingAuth: $TSAny;
+};
+
+// @public (undocumented)
+export type $TSCopyJob = $TSAny;
+
+// @public (undocumented)
+export type $TSMeta = $TSAny;
+
+// @public (undocumented)
+export type $TSObject = Record<string, $TSAny>;
+
+// @public (undocumented)
+export type $TSTeamProviderInfo = $TSAny;
+
+// @public (undocumented)
+export const AMPLIFY_DOCS_URL = "https://docs.amplify.aws";
+
+// @public (undocumented)
+export const AMPLIFY_SUPPORT_DOCS: {
+    CLI_PROJECT_TROUBLESHOOTING: {
+        name: string;
+        url: string;
+    };
+    CLI_GRAPHQL_TROUBLESHOOTING: {
+        name: string;
+        url: string;
+    };
+    CLI_EXTENSIBILITY: {
+        name: string;
+        url: string;
+    };
+    AWS_CUSTOM_DOMAIN_TROUBLESHOOTING: {
+        name: string;
+        url: string;
+    };
+    AMPLIFY_IAM_TROUBLESHOOTING_URL: {
+        name: string;
+        url: string;
+    };
+    AMPLIFY_DATASTORE: {
+        name: string;
+        url: string;
+    };
+    AWS_CLOUDFORMATION_DRIFT: {
+        name: string;
+        url: string;
+    };
+    AWS_KNOWLEDGE_CENTER: {
+        name: string;
+        url: string;
+    };
+};
+
+// @public (undocumented)
+export const AmplifyCategories: {
+    STORAGE: string;
+    API: string;
+    AUTH: string;
+    FUNCTION: string;
+    HOSTING: string;
+    INTERACTIONS: string;
+    NOTIFICATIONS: string;
+    PREDICTIONS: string;
+    ANALYTICS: string;
+    CUSTOM: string;
+};
+
+// @public (undocumented)
+export abstract class AmplifyCategoryTransform {
+    constructor(resourceName: string);
+    // (undocumented)
+    abstract applyOverride(): Promise<void>;
+    // (undocumented)
+    resourceName: string;
+    // (undocumented)
+    abstract saveBuildFiles(context: $TSContext, template: Template): Promise<void>;
+    // (undocumented)
+    abstract transform(context: $TSContext): Promise<Template>;
+}
+
+// @public (undocumented)
+export class AmplifyError extends AmplifyException {
+    constructor(name: AmplifyErrorType, options: AmplifyExceptionOptions, downstreamException?: Error);
+}
+
+// @public (undocumented)
+export type AmplifyErrorType = 'AmplifyStudioError' | 'AmplifyStudioLoginError' | 'AmplifyStudioNotEnabledError' | 'ApiCategorySchemaNotFoundError' | 'AuthImportError' | 'BucketAlreadyExistsError' | 'BucketNotFoundError' | 'CategoryNotEnabledError' | 'CloudFormationTemplateError' | 'CommandNotSupportedError' | 'ConfigurationError' | 'DeploymentError' | 'DeploymentInProgressError' | 'DirectoryError' | 'DirectoryAlreadyExistsError' | 'DuplicateLogicalIdError' | 'EnvironmentConfigurationError' | 'EnvironmentNameError' | 'EnvironmentNotInitializedError' | 'FeatureFlagsValidationError' | 'FrameworkNotSupportedError' | 'FunctionTooLargeError' | 'InputValidationError' | 'InvalidAmplifyAppIdError' | 'InvalidCustomResourceError' | 'InvalidOverrideError' | 'InvalidStackError' | 'IterativeRollbackError' | 'LambdaLayerDeleteError' | 'MigrationError' | 'MissingAmplifyMetaFileError' | 'MissingOverridesInstallationRequirementsError' | 'ModelgenError' | 'NestedProjectInitError' | 'NoUpdateBackendError' | 'NotImplementedError' | 'OpenSslCertificateError' | 'ParameterNotFoundError' | 'PermissionsError' | 'PluginMethodNotFoundError' | 'PluginNotFoundError' | 'ProfileConfigurationError' | 'ProjectAppIdResolveError' | 'ProjectInitError' | 'ProjectNotFoundError' | 'ProjectNotInitializedError' | 'PushResourcesError' | 'RegionNotAvailableError' | 'RemoveNotificationAppError' | 'ResourceAlreadyExistsError' | 'ResourceInUseError' | 'ResourceNotReadyError' | 'StackNotFoundError' | 'StackStateError' | 'UserInputError' | 'MockProcessError' | 'SearchableMockUnsupportedPlatformError' | 'SearchableMockUnavailablePortError' | 'SearchableMockProcessError';
+
+// @public (undocumented)
+export abstract class AmplifyException extends Error {
+    constructor(name: AmplifyExceptionType, classification: AmplifyExceptionClassification, options: AmplifyExceptionOptions, downstreamException?: Error | undefined);
+    // (undocumented)
+    readonly classification: AmplifyExceptionClassification;
+    // (undocumented)
+    readonly details?: string;
+    // (undocumented)
+    readonly downstreamException?: Error | undefined;
+    // (undocumented)
+    readonly link?: string;
+    // (undocumented)
+    readonly message: string;
+    // (undocumented)
+    readonly name: AmplifyExceptionType;
+    // (undocumented)
+    readonly options: AmplifyExceptionOptions;
+    // (undocumented)
+    readonly resolution?: string;
+    // (undocumented)
+    toObject: () => object;
+}
+
+// @public (undocumented)
+export type AmplifyExceptionClassification = 'FAULT' | 'ERROR';
+
+// @public (undocumented)
+export type AmplifyExceptionOptions = {
+    message: string;
+    details?: string;
+    resolution?: string;
+    link?: string;
+};
+
+// @public (undocumented)
+export type AmplifyExceptionType = AmplifyErrorType | AmplifyFaultType;
+
+// @public (undocumented)
+export class AmplifyFault extends AmplifyException {
+    constructor(name: AmplifyFaultType, options: AmplifyExceptionOptions, downstreamException?: Error);
+}
+
+// @public (undocumented)
+export type AmplifyFaultType = 'AnalyticsCategoryFault' | 'AmplifyBackupFault' | 'BackendPullFault' | 'ConfigurationFault' | 'BackendDeleteFault' | 'ConfigurationFault' | 'DeploymentFault' | 'NotificationsChannelAPNSFault' | 'NotificationsChannelEmailFault' | 'NotificationsChannelFCMFault' | 'NotificationsChannelSmsFault' | 'NotificationsChannelInAppMessagingFault' | 'NotImplementedFault' | 'ProjectDeleteFault' | 'ProjectInitFault' | 'PluginNotLoadedFault' | 'PushResourcesFault' | 'PullBackendFault' | 'ResourceExportFault' | 'ResourceNotFoundFault' | 'ResourceNotReadyFault' | 'ResourceRemoveFault' | 'RootStackNotFoundFault' | 'ServiceCallFault' | 'TimeoutFault' | 'TriggerUploadFault' | 'UnexpectedS3Fault' | 'UnknownFault' | 'UnknownNodeJSFault' | 'MockProcessFault';
+
+// @public (undocumented)
+export enum AmplifyFrontend {
+    // (undocumented)
+    android = "android",
+    // (undocumented)
+    ios = "ios",
+    // (undocumented)
+    javascript = "javascript"
+}
+
+// @public (undocumented)
+export interface AmplifyProjectConfig {
+    // (undocumented)
+    frontend: AmplifyFrontend;
+    // (undocumented)
+    projectName: string;
+    // (undocumented)
+    providers: string[];
+    // (undocumented)
+    version: string;
+}
+
+// @public (undocumented)
+export interface AmplifyStackTemplate {
+    // (undocumented)
+    addCfnCondition(props: cdk.CfnConditionProps, logicalId: string): void;
+    // (undocumented)
+    addCfnMapping(props: cdk.CfnMappingProps, logicalId: string): void;
+    // (undocumented)
+    addCfnOutput(props: cdk.CfnOutputProps, logicalId: string): void;
+    // (undocumented)
+    addCfnParameter(props: cdk.CfnParameterProps, logicalId: string): void;
+    // (undocumented)
+    getCfnCondition(logicalId: string): cdk.CfnCondition;
+    // (undocumented)
+    getCfnMapping(logicalId: string): cdk.CfnMapping;
+    // (undocumented)
+    getCfnOutput(logicalId: string): cdk.CfnOutput;
+    // (undocumented)
+    getCfnParameter(logicalId: string): cdk.CfnParameter;
+}
+
+// @public (undocumented)
+export const AmplifySupportedService: {
+    APIGW: string;
+    APPSYNC: string;
+    S3: string;
+    DYNAMODB: string;
+    COGNITO: string;
+    COGNITOUSERPOOLGROUPS: string;
+    LAMBDA: string;
+    LAMBDA_LAYER: string;
+    PINPOINT: string;
+    KINESIS: string;
+};
+
+// @public (undocumented)
+export class AngularConfigNotFoundError extends Error {
+}
+
+// @public (undocumented)
+export class ApiCategoryFacade {
+    // (undocumented)
+    static getDirectiveDefinitions(context: $TSContext, resourceDir: string): Promise<string>;
+    // (undocumented)
+    static getTransformerVersion(context: $TSContext): Promise<number>;
+    // (undocumented)
+    static transformGraphQLSchema(context: $TSContext, options: $TSAny): Promise<DeploymentResources | DeploymentResources_2 | undefined>;
+}
+
+// @public (undocumented)
+export const AWS_AMPLIFY_DEFAULT_BANNER_URL: string;
+
+// @public (undocumented)
+export const AWS_DOCS_URL = "https://docs.aws.amazon.com/";
+
+// @public (undocumented)
+export const AWS_PREMIUM_SUPPORT_URL = "https://aws.amazon.com/premiumsupport";
+
+// @public (undocumented)
+export class BannerMessage {
+    // (undocumented)
+    static getMessage: (messageId: string) => Promise<string | undefined>;
+    // (undocumented)
+    getMessages: (messageId: string) => Promise<string | undefined>;
+    // (undocumented)
+    static initialize: (cliVersion: string) => BannerMessage;
+}
+
+// @public (undocumented)
+export type BooleanFeatureFlag = {
+    type: 'boolean';
+    name: string;
+    defaultValueForExistingProjects: boolean;
+    defaultValueForNewProjects: boolean;
+};
+
+// @public (undocumented)
+export const buildOverrideDir: (cwd: string, destDirPath: string) => Promise<boolean>;
+
+// @public (undocumented)
+export abstract class CategoryInputState {
+    constructor(resourceName: string);
+    // (undocumented)
+    abstract getCLIInputPayload(): $TSAny;
+    // (undocumented)
+    abstract isCLIInputsValid(props: $TSAny): void;
+    // (undocumented)
+    _resourceName: string;
+    // (undocumented)
+    abstract saveCLIInputPayload(props: $TSAny): void;
+}
+
+// @public (undocumented)
+export type CategoryName = string;
+
+// @public (undocumented)
+export enum CFNTemplateFormat {
+    // (undocumented)
+    JSON = "json",
+    // (undocumented)
+    YAML = "yaml"
+}
+
+// @public (undocumented)
+export interface CLIContext {
+    // (undocumented)
+    getEnvInfo: () => $TSAny;
+}
+
+// @public (undocumented)
+export class CLIContextEnvironmentProvider implements CLIEnvironmentProvider {
+    // Warning: (ae-forgotten-export) The symbol "EnvInfoProvider" needs to be exported by the entry point index.d.ts
+    constructor(context: EnvInfoProvider);
+    // (undocumented)
+    getCurrentEnvName(): string;
+}
+
+// @public (undocumented)
+export interface CLIEnvironmentProvider {
+    // (undocumented)
+    getCurrentEnvName(): string;
+}
+
+// @public (undocumented)
+export class CLIInputSchemaGenerator {
+    constructor(typeDefs: TypeDef[]);
+    // (undocumented)
+    generateJSONSchemas(): string[];
+    // (undocumented)
+    OVERWRITE_SCHEMA_FLAG: string;
+    // (undocumented)
+    SCHEMA_FILES_ROOT: string;
+    // (undocumented)
+    TYPES_SRC_ROOT: string;
+}
+
+// @public (undocumented)
+export class CLIInputSchemaValidator {
+    constructor(context: $TSContext, service: string, category: string, schemaFileName: string);
+    // (undocumented)
+    _ajv: Ajv.Ajv;
+    // (undocumented)
+    _category: string;
+    // (undocumented)
+    _context: $TSContext;
+    // (undocumented)
+    getUserInputSchema(): Promise<any>;
+    // (undocumented)
+    _schemaFileName: string;
+    // (undocumented)
+    _service: string;
+    // (undocumented)
+    validateInput(userInput: string): Promise<boolean>;
+}
+
+// @public (undocumented)
+export interface CLIParams {
+    // (undocumented)
+    cliCommand: string;
+    // (undocumented)
+    cliOptions: Record<string, $TSAny>;
+    // (undocumented)
+    cliSubcommands: string[] | undefined;
+}
+
+// @public (undocumented)
+export const CLISubCommands: {
+    ADD: string;
+    PUSH: string;
+    PULL: string;
+    REMOVE: string;
+    UPDATE: string;
+    CONSOLE: string;
+    IMPORT: string;
+};
+
+// @public (undocumented)
+export enum CLISubCommandType {
+    // (undocumented)
+    ADD = "add",
+    // (undocumented)
+    CONSOLE = "console",
+    // (undocumented)
+    IMPORT = "import",
+    // (undocumented)
+    MIGRATE = "migrate",
+    // (undocumented)
+    OVERRIDE = "override",
+    // (undocumented)
+    PULL = "pull",
+    // (undocumented)
+    PUSH = "push",
+    // (undocumented)
+    REMOVE = "remove",
+    // (undocumented)
+    UPDATE = "update"
+}
+
+// @public (undocumented)
+export class CloudformationProviderFacade {
+    // (undocumented)
+    static getApiKeyConfig(context: $TSContext): Promise<ApiKeyConfig>;
+    // (undocumented)
+    static hashDirectory(context: $TSContext, directory: string): Promise<string>;
+    // (undocumented)
+    static isAmplifyAdminApp(context: $TSContext, appId: string): Promise<{
+        isAdminApp: boolean;
+        region: string;
+        userPoolID: string;
+    }>;
+    // (undocumented)
+    static prePushCfnTemplateModifier(context: $TSContext, template: Template_2): Promise<(template: Template_2) => Promise<void>>;
+}
+
+// @public (undocumented)
+export class ConfigurationError extends Error {
+}
+
+// @public (undocumented)
+export const convertNumBytes: (numBytes: number) => {
+    toKB: () => number;
+    toMB: () => number;
+};
+
+// @public (undocumented)
+export function createDefaultCustomPoliciesFile(categoryName: string, resourceName: string): void;
+
+// @public (undocumented)
+export type CustomIAMPolicies = CustomIAMPolicy[];
+
+// @public (undocumented)
+export const CustomIAMPoliciesSchema: {
+    type: string;
+    minItems: number;
+    items: {
+        type: string;
+        properties: {
+            Action: {
+                type: string;
+                items: {
+                    type: string;
+                };
+                minItems: number;
+                nullable: boolean;
+            };
+            Resource: {
+                type: string;
+                anyOf: ({
+                    contains: {
+                        type: string;
+                        additionalProperties?: undefined;
+                    };
+                } | {
+                    contains: {
+                        type: string;
+                        additionalProperties: boolean;
+                    };
+                })[];
+                minItems: number;
+                nullable: boolean;
+            };
+        };
+        optionalProperties: {
+            Effect: {
+                type: string;
+                enum: string[];
+                default: string;
+            };
+        };
+        required: string[];
+        additionalProperties: boolean;
+    };
+    additionalProperties: boolean;
+};
+
+// @public (undocumented)
+export type CustomIAMPolicy = {
+    Action: string[];
+    Effect?: string;
+    Resource: (string | $TSObject)[];
+};
+
+// @public (undocumented)
+export class CustomPoliciesFormatError extends Error {
+}
+
+// @public (undocumented)
+export type DataParameter = {
+    amplify: {
+        version?: string;
+        environment?: string;
+        command?: string;
+        subCommand?: string;
+        argv?: string[];
+    };
+};
+
+// @public (undocumented)
+export class DebugConfigValueNotSetError extends Error {
+}
+
+// @public (undocumented)
+export const defaultSupportedExt: HookExtensions;
+
+// @public (undocumented)
+export type DeploymentSecrets = {
+    appSecrets: Array<{
+        rootStackId: string;
+        environments: {
+            [env: string]: {
+                [category: string]: {
+                    [resourceName: string]: {
+                        [key: string]: string;
+                    };
+                };
+            };
+        };
+    }>;
+};
+
+// @public (undocumented)
+export type DeploymentState = {
+    version: '1';
+    startedAt?: string;
+    finishedAt?: string;
+    status: DeploymentStatus;
+    currentStepIndex: number;
+    steps: DeploymentStepState[];
+};
+
+// @public (undocumented)
+export enum DeploymentStatus {
+    // (undocumented)
+    'DEPLOYED' = "DEPLOYED",
+    // (undocumented)
+    'DEPLOYING' = "DEPLOYING",
+    // (undocumented)
+    'FAILED' = "FAILED",
+    // (undocumented)
+    'IDLE' = "IDLE",
+    // (undocumented)
+    'ROLLED_BACK' = "ROLLED_BACK",
+    // (undocumented)
+    'ROLLING_BACK' = "ROLLING_BACK"
+}
+
+// @public (undocumented)
+export type DeploymentStepState = {
+    status: DeploymentStepStatus;
+    previousMetaKey?: string;
+};
+
+// @public (undocumented)
+export enum DeploymentStepStatus {
+    // (undocumented)
+    'DEPLOYED' = "DEPLOYED",
+    // (undocumented)
+    'DEPLOYING' = "DEPLOYING",
+    // (undocumented)
+    'ROLLED_BACK' = "ROLLED_BACK",
+    // (undocumented)
+    'ROLLING_BACK' = "ROLLING_BACK",
+    // (undocumented)
+    'WAITING_FOR_DEPLOYMENT' = "WAITING_FOR_DEPLOYMENT",
+    // (undocumented)
+    'WAITING_FOR_ROLLBACK' = "WAITING_FOR_ROLLBACK",
+    // (undocumented)
+    'WAITING_FOR_TABLE_TO_BE_READY' = "WAITING_FOR_TABLE_TO_BE_READY"
+}
+
+// @public (undocumented)
+export class DiagnoseReportUploadError extends Error {
+}
+
+// @public (undocumented)
+export class EnvVarFormatError extends Error {
+    constructor(variableName: string);
+}
+
+// @public (undocumented)
+export type ErrorParameter = {
+    message: string;
+    stack: string;
+};
+
+// @public (undocumented)
+export type EventPrefix = 'pre' | 'post';
+
+// @public (undocumented)
+export const executeHooks: (hooksMeta: HooksMeta) => Promise<void>;
+
+// @public (undocumented)
+export const exitOnNextTick: (code: number) => void;
+
+// @public (undocumented)
+export class ExportedStackNotFoundError extends Error {
+}
+
+// @public (undocumented)
+export class ExportedStackNotInValidStateError extends Error {
+}
+
+// @public (undocumented)
+export class ExportPathValidationError extends Error {
+}
+
+// @public (undocumented)
+export type FeatureFlagConfiguration = {
+    project: FeatureFlagsEntry;
+    environments: Record<string, FeatureFlagsEntry>;
+};
+
+// @public (undocumented)
+export type FeatureFlagRegistration = NumberFeatureFlag | BooleanFeatureFlag;
+
+// @public (undocumented)
+export class FeatureFlags {
+    // (undocumented)
+    static ensureDefaultFeatureFlags: (newProject: boolean) => Promise<void>;
+    // (undocumented)
+    static ensureFeatureFlag: (featureFlagSection: string, featureFlagName: string) => Promise<void>;
+    // (undocumented)
+    static getBoolean: (flagName: string) => boolean;
+    // (undocumented)
+    static getEffectiveFlags: () => Readonly<FeatureFlagsEntry>;
+    // (undocumented)
+    static getExistingProjectDefaults: () => Readonly<FeatureFlagsEntry>;
+    // (undocumented)
+    static getNewProjectDefaults: () => Readonly<FeatureFlagsEntry>;
+    // (undocumented)
+    static getNumber: (flagName: string) => number;
+    // (undocumented)
+    static initialize: (environmentProvider: CLIEnvironmentProvider, useNewDefaults?: boolean, additionalFlags?: Record<string, FeatureFlagRegistration[]> | undefined) => Promise<void>;
+    // (undocumented)
+    static isInitialized: () => boolean;
+    // (undocumented)
+    static reloadValues: () => Promise<void>;
+    // (undocumented)
+    static removeFeatureFlagConfiguration: (removeProjectConfiguration: boolean, envNames: string[]) => Promise<void>;
+}
+
+// @public (undocumented)
+export type FeatureFlagsEntry = Record<string, Record<string, $TSAny>>;
+
+// @public (undocumented)
+export type FeatureFlagType = 'boolean' | 'number';
+
+// @public (undocumented)
+export const generateAmplifyOverrideProjectBuildFiles: (backendDir: string, srcResourceDirPath: string) => void;
+
+// @public (undocumented)
+export function generateCustomPoliciesInTemplate(template: Template_2, resourceName: string, service: string, category: string): Template_2;
+
+// @public (undocumented)
+export const generateOverrideSkeleton: (context: $TSContext, srcResourceDirPath: string, destDirPath: string) => Promise<void>;
+
+// @public (undocumented)
+export const generateTsConfigforProject: (srcResourceDirPath: string, destDirPath: string) => void;
+
+// @public (undocumented)
+export function getAmplifyResourceByCategories(category: string): string[];
+
+// @public (undocumented)
+export function getFolderSize(filePaths: string | string[]): Promise<number>;
+
+// @public (undocumented)
+export function getGraphQLTransformerAuthDocLink(version: number): string;
+
+// @public (undocumented)
+export function getGraphQLTransformerAuthSubscriptionsDocLink(version: number): string;
+
+// @public (undocumented)
+export function getGraphQLTransformerFunctionDocLink(version: number): string;
+
+// @public (undocumented)
+export function getGraphQLTransformerOpenSearchDocLink(version: number): string;
+
+// @public (undocumented)
+export function getGraphQLTransformerOpenSearchProductionDocLink(version: number): string;
+
+// @public (undocumented)
+export function getMigrateResourceMessageForOverride(categoryName: string, resourceName: string, isUpdate?: boolean): string;
+
+// @public (undocumented)
+export type GetOptions<T> = {
+    throwIfNotExist?: boolean;
+    preserveComments?: boolean;
+    default?: T;
+};
+
+// @public (undocumented)
+export type GetPackageAssetPaths = () => Promise<string[]>;
+
+// @public (undocumented)
+export const getPackageManager: (rootPath?: string | undefined) => PackageManager | null;
+
+// @public (undocumented)
+export const getPermissionsBoundaryArn: (env?: string | undefined) => string | undefined;
+
+// @public (undocumented)
+export type HookEvent = {
+    command: string;
+    subCommand?: string;
+    argv: string[];
+    eventPrefix?: EventPrefix;
+    forcePush: boolean;
+};
+
+// @public (undocumented)
+export type HookExtensions = Record<string, {
+    runtime: string;
+    runtime_windows?: string;
+}>;
+
+// @public (undocumented)
+export type HookFileMeta = {
+    baseName: string;
+    extension?: string;
+    filePath?: string;
+    fileName: string;
+};
+
+// @public (undocumented)
+export const hookFileSeparator = "-";
+
+// @public (undocumented)
+export type HooksConfig = {
+    extensions?: HookExtensions;
+    ignore?: string[];
+};
+
+// @public (undocumented)
+export class HooksMeta {
+    // (undocumented)
+    getDataParameter(): DataParameter;
+    // (undocumented)
+    getErrorParameter(): ErrorParameter | undefined;
+    // (undocumented)
+    getHookEvent(): HookEvent;
+    // (undocumented)
+    static getInstance: (input?: {
+        command?: string | undefined;
+        plugin?: string | undefined;
+        subCommands?: string[] | undefined;
+        options?: {
+            forcePush?: boolean | undefined;
+        } | undefined;
+        argv?: string[] | undefined;
+    } | undefined, eventPrefix?: EventPrefix | undefined, errorParameter?: ErrorParameter | undefined) => HooksMeta;
+    // (undocumented)
+    mergeDataParameter(newDataParameter: DataParameter): void;
+    // (undocumented)
+    setAmplifyVersion(amplifyVersion: string): void;
+    // (undocumented)
+    setEnvironmentName(envName?: string): void;
+    // (undocumented)
+    setErrorParameter(errorParameter?: ErrorParameter): void;
+    // (undocumented)
+    setEventCommand(command: string): void;
+    // (undocumented)
+    setEventPrefix(prefix?: EventPrefix): void;
+    // (undocumented)
+    setEventSubCommand(subCommand?: string): void;
+    // (undocumented)
+    setHookEventFromInput(input?: {
+        command?: string;
+        plugin?: string;
+        subCommands?: string[];
+        argv?: string[];
+        options?: {
+            forcePush?: boolean;
+        };
+    }): void;
+}
+
+// @public (undocumented)
+export type HooksNoun = 'notifications' | 'analytics' | 'api' | 'auth' | 'function' | 'hosting' | 'interactions' | 'predictions' | 'storage' | 'xr' | 'codegen' | 'env';
+
+// @public (undocumented)
+export type HooksVerb = 'add' | 'update' | 'remove' | 'push' | 'pull' | 'publish' | 'delete' | 'checkout' | 'list' | 'get' | 'mock' | 'build' | 'status' | 'import' | 'gqlcompile' | 'addgraphqldatasource' | 'statements' | 'types';
+
+// Warning: (ae-forgotten-export) The symbol "TagVariables" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function HydrateTags(tags: Tag[], tagVariables: TagVariables, skipProjectEnv?: boolean): Tag[];
+
+// @public (undocumented)
+export interface IAmplifyResource {
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    region?: string;
+    // (undocumented)
+    resourceName: string;
+    // (undocumented)
+    service: string;
+}
+
+// @public (undocumented)
+export interface IAnalyticsResource extends IAmplifyResource {
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    output?: $TSAny;
+    // (undocumented)
+    region?: string;
+}
+
+// @public (undocumented)
+export type IAuthResource = IAmplifyResource;
+
+// @public (undocumented)
+export type IContextFilesystem = {
+    remove: (targetPath: string) => void;
+    read: (targetPath: string, encoding?: string) => $TSAny;
+    write: (targetPath: string, data: unknown) => void;
+    exists: (targetPath: string) => boolean;
+    isFile: (targetPath: string) => boolean;
+    path: (...pathParts: string[]) => string;
+};
+
+// @public (undocumented)
+export type IContextPrint = {
+    info: (message: string) => void;
+    fancy: (message?: string) => void;
+    warning: (message: string) => void;
+    error: (message: string) => void;
+    success: (message: string) => void;
+    table: (data: string[][], options?: {
+        format?: 'markdown' | 'lean';
+    }) => void;
+    debug: (message: string) => void;
+    green: (message: string) => void;
+    yellow: (message: string) => void;
+    red: (message: string) => void;
+    blue: (message: string) => void;
+};
+
+// @public (undocumented)
+export type IContextTemplate = {
+    generate: (opts: {
+        template: string;
+        target: string;
+        props: $TSObject;
+        directory: string;
+    }) => string;
+};
+
+// @public (undocumented)
+export interface IDeploymentStateManager {
+    // (undocumented)
+    advanceStep: () => Promise<void>;
+    // (undocumented)
+    deleteDeploymentStateFile: () => Promise<void>;
+    // (undocumented)
+    failDeployment: () => Promise<void>;
+    // (undocumented)
+    getStatus: () => DeploymentState | undefined;
+    // (undocumented)
+    isDeploymentFinished: () => boolean;
+    // (undocumented)
+    isDeploymentInProgress: () => boolean;
+    // (undocumented)
+    startCurrentStep: (parameters?: StepStatusParameters) => Promise<void>;
+    // (undocumented)
+    startDeployment: (steps: DeploymentStepState[]) => Promise<boolean>;
+    // (undocumented)
+    startRollback: () => Promise<void>;
+    // (undocumented)
+    updateCurrentStepStatus: (status: DeploymentStepStatus) => Promise<void>;
+    // (undocumented)
+    updateStatus: (status: DeploymentStatus) => Promise<void>;
+}
+
+// @public (undocumented)
+export type INotificationsResource = IAnalyticsResource;
+
+// @public (undocumented)
+export interface INotificationsResourceMeta {
+    // (undocumented)
+    Id: string;
+    // (undocumented)
+    lastPushDirHash?: string;
+    // (undocumented)
+    lastPushTimeStamp?: string;
+    // (undocumented)
+    mobileHubMigrated?: boolean;
+    // (undocumented)
+    Name: string;
+    // (undocumented)
+    output: Record<string, $TSAny>;
+    // (undocumented)
+    Region: string;
+    // (undocumented)
+    ResourceName: string;
+    // (undocumented)
+    service: string;
+}
+
+// @public (undocumented)
+export class InvalidSubCommandError extends Error {
+}
+
+// @public (undocumented)
+export interface IPluginAPIResponse {
+    // (undocumented)
+    errorCode?: PluginAPIError;
+    // (undocumented)
+    pluginName: string;
+    // (undocumented)
+    reasonMsg?: string;
+    // (undocumented)
+    resourceProviderServiceName: string;
+    // (undocumented)
+    status: boolean;
+}
+
+// @public (undocumented)
+export interface IPluginCapabilityAPIResponse extends IPluginAPIResponse {
+    // (undocumented)
+    capability: string;
+    // (undocumented)
+    subCapability?: string;
+}
+
+// @public (undocumented)
+export type IPluginCollection = {
+    [pluginType: string]: IPluginInfo[];
+};
+
+// @public (undocumented)
+export type IPluginInfo = {
+    packageName: string;
+    packageVersion: string;
+    packageLocation: string;
+    manifest: $IPluginManifest;
+};
+
+// @public (undocumented)
+export type IPluginPlatform = {
+    pluginDirectories: string[];
+    pluginPrefixes: string[];
+    userAddedLocations: string[];
+    lastScanTime: Date;
+    maxScanIntervalInSeconds: number;
+    plugins: IPluginCollection;
+    excluded: IPluginCollection;
+};
+
+// @public (undocumented)
+export const isCI: () => boolean;
+
+// @public (undocumented)
+export const isPackaged: boolean;
+
+// @public (undocumented)
+export const isResourceNameUnique: (category: string, resourceName: string, throwOnMatch?: boolean) => boolean;
+
+// @public (undocumented)
+export const isWindowsPlatform: boolean;
+
+// @public (undocumented)
+export class JSONUtilities {
+    // (undocumented)
+    static parse: <T>(jsonString: string, options?: {
+        preserveComments?: boolean | undefined;
+    } | undefined) => T;
+    // (undocumented)
+    static readJson: <T>(fileName: string, options?: {
+        throwIfNotExist?: boolean | undefined;
+        preserveComments?: boolean | undefined;
+    } | undefined) => T | undefined;
+    // (undocumented)
+    static stringify: (data: any, options?: {
+        minify?: boolean | undefined;
+        keepComments?: boolean | undefined;
+    } | undefined) => string | undefined;
+    // (undocumented)
+    static writeJson: (fileName: string, data: any, options?: {
+        keepComments?: boolean | undefined;
+        mode?: number | undefined;
+        minify?: boolean | undefined;
+        secureFile?: boolean | undefined;
+    } | undefined) => void;
+}
+
+// Warning: (ae-forgotten-export) The symbol "deploymentSecretMerge" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const mergeDeploymentSecrets: (deploymentSecretsModifier: deploymentSecretMerge) => DeploymentSecrets;
+
+// @public (undocumented)
+export type Message = {
+    message: string;
+    id: string;
+    conditions?: {
+        enabled: boolean;
+        cliVersions?: string;
+        startTime?: string;
+        endTime?: string;
+    };
+};
+
+// @public (undocumented)
+export class MissingParametersError extends Error {
+}
+
+// @public (undocumented)
+export enum NotificationChannels {
+    // (undocumented)
+    APNS = "APNS",
+    // (undocumented)
+    EMAIL = "Email",
+    // (undocumented)
+    FCM = "FCM",
+    // (undocumented)
+    IN_APP_MSG = "InAppMessaging",
+    // (undocumented)
+    PUSH_NOTIFICATION = "PushNotification",
+    // (undocumented)
+    SMS = "SMS"
+}
+
+// @public (undocumented)
+export class NotImplementedError extends Error {
+}
+
+// @public (undocumented)
+export type NumberFeatureFlag = {
+    type: 'number';
+    name: string;
+    defaultValueForExistingProjects: number;
+    defaultValueForNewProjects: number;
+};
+
+// @public (undocumented)
+const open_2: (target: string, options: opn.Options) => Promise<ChildProcess | void>;
+export { open_2 as open }
+
+// @public (undocumented)
+export const overriddenCategories: string[];
+
+// @public (undocumented)
+export type PackageManager = {
+    packageManager: PackageManagerType;
+    lockFile: string;
+    executable: string;
+};
+
+// @public (undocumented)
+export type PackageManagerType = 'yarn' | 'npm';
+
+// @public (undocumented)
+export type PartialAmplifyExceptionOptions = Partial<AmplifyExceptionOptions> & {
+    message: string;
+};
+
+// @public (undocumented)
+export const PathConstants: {
+    DotAWSDirName: string;
+    AWSCredentials: string;
+    AWSConfig: string;
+    DeploymentSecretsFileName: string;
+    AmplifyAdminDirName: string;
+    AmplifyDirName: string;
+    DotAmplifyDirName: string;
+    DotConfigDirName: string;
+    BackendDirName: string;
+    CurrentCloudBackendDirName: string;
+    HooksDirName: string;
+    BuildDirName: string;
+    OverrideDirName: string;
+    ProviderName: string;
+    CfnStacksBuildDirName: string;
+    AmplifyAdminConfigFileName: string;
+    AmplifyRcFileName: string;
+    GitIgnoreFileName: string;
+    ProjectConfigFileName: string;
+    AmplifyMetaFileName: string;
+    TagsFileName: string;
+    ParametersJsonFileName: string;
+    ReadMeFileName: string;
+    HooksConfigFileName: string;
+    HooksShellSampleFileName: string;
+    HooksJsSampleFileName: string;
+    HooksReadmeFileName: string;
+    LocalEnvFileName: string;
+    LocalAWSInfoFileName: string;
+    TeamProviderInfoFileName: string;
+    BackendConfigFileName: string;
+    CLIJSONFileName: string;
+    CLIJSONFileNameGlob: string;
+    CLIJsonWithEnvironmentFileName: (env: string) => string;
+    CLIInputsJsonFileName: string;
+    CfnFileName: (resourceName: string) => string;
+    CustomPoliciesFilename: string;
+    DefaultFrontEndExportFolder: string;
+    DefaultExportFolder: string;
+    ExportManifestJsonFilename: string;
+    ExportTagsJsonFileName: string;
+    ExportCategoryStackMappingJsonFilename: string;
+};
+
+// @public (undocumented)
+export class PathManager {
+    constructor();
+    // (undocumented)
+    findProjectRoot: () => string | undefined;
+    // (undocumented)
+    getAmplifyAdminConfigFilePath: () => string;
+    // (undocumented)
+    getAmplifyAdminDirPath: () => string;
+    // (undocumented)
+    getAmplifyDirPath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getAmplifyLibRoot: () => string;
+    // (undocumented)
+    getAmplifyMetaFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getAmplifyPackageLibDirPath: (packageName: string) => string;
+    // (undocumented)
+    getAmplifyRcFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getAWSConfigFilePath: () => string;
+    // (undocumented)
+    getAWSCredentialsFilePath: () => string;
+    // (undocumented)
+    getBackendConfigFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getBackendDirPath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getCLIJSONFilePath: (projectPath: string, env?: string | undefined) => string;
+    // (undocumented)
+    getCurrentAmplifyMetaFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getCurrentBackendConfigFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getCurrentCfnTemplatePath: (projectPath: string | undefined, categoryName: string, resourceName: string) => string;
+    // (undocumented)
+    getCurrentCloudBackendDirPath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getCurrentCloudRootStackDirPath: (projectPath: string) => string;
+    // (undocumented)
+    getCurrentResourceParametersJsonPath: (projectPath: string | undefined, categoryName: string, resourceName: string) => string;
+    // (undocumented)
+    getCurrentTagFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getCustomPoliciesPath: (category: string, resourceName: string) => string;
+    // (undocumented)
+    getDeploymentSecrets: () => string;
+    // (undocumented)
+    getDotAWSAmplifyDirPath: () => string;
+    // (undocumented)
+    getDotAWSDirPath: () => string;
+    // (undocumented)
+    getDotConfigDirPath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getGitIgnoreFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getHomeDotAmplifyDirPath: () => string;
+    // (undocumented)
+    getHooksConfigFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getHooksDirPath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getLocalAWSInfoFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getLocalEnvFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getOverrideDirPath: (projectPath: string, category: string, resourceName: string) => string;
+    // (undocumented)
+    getProjectConfigFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getReadMeFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getResourceCfnTemplatePath: (projectPath: string | undefined, category: string, resourceName: string, buildDirectory?: boolean) => string;
+    // (undocumented)
+    getResourceDirectoryPath: (projectPath: string | undefined, category: string, resourceName: string) => string;
+    // (undocumented)
+    getResourceInputsJsonFilePath: (projectPath: string | undefined, category: string, resourceName: string) => string;
+    // (undocumented)
+    getResourceParametersFilePath: (projectPath: string | undefined, category: string, resourceName: string) => string;
+    // (undocumented)
+    getRootOverrideDirPath: (projectPath: string) => string;
+    // (undocumented)
+    getRootStackBuildDirPath: (projectPath: string) => string;
+    // (undocumented)
+    getTagFilePath: (projectPath?: string | undefined) => string;
+    // (undocumented)
+    getTeamProviderInfoFilePath: (projectPath?: string | undefined) => string;
+}
+
+// @public (undocumented)
+export const pathManager: PathManager;
+
+// @public (undocumented)
+export enum PluginAPIError {
+    // (undocumented)
+    E_NO_RESPONSE = "E_NO_RESPONSE",
+    // (undocumented)
+    E_NO_SVC_PROVIDER = "E_NO_SVC_PROVIDER",
+    // (undocumented)
+    E_PUSH_FAILED = "E_PUSH_FAILED",
+    // (undocumented)
+    E_SVC_PROVIDER_CDK = "E_SVC_CDK",
+    // (undocumented)
+    E_SVC_PROVIDER_NO_CAPABILITY = "E_SVC_PROVIDER_NO_CAPABILITY",
+    // (undocumented)
+    E_SVC_PROVIDER_SDK = "E_SVC_SDK",
+    // (undocumented)
+    E_UNKNOWN = "E_UNKNOWN"
+}
+
+// @public (undocumented)
+export const projectNotInitializedError: () => AmplifyError;
+
+// @public (undocumented)
+export function promptConfirmationRemove(context: $TSContext, serviceType?: string): Promise<boolean>;
+
+// @public (undocumented)
+export interface ProviderContext {
+    // (undocumented)
+    projectName: string;
+    // (undocumented)
+    provider: string;
+    // (undocumented)
+    service: string;
+}
+
+// @public (undocumented)
+export function readCFNTemplate(filePath: string): {
+    templateFormat: CFNTemplateFormat;
+    cfnTemplate: Template_2;
+};
+
+// Warning: (ae-forgotten-export) The symbol "defaultReadCFNTemplateOptions" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function readCFNTemplate(filePath: string, options: Partial<typeof defaultReadCFNTemplateOptions>): {
+    templateFormat: CFNTemplateFormat;
+    cfnTemplate: Template_2;
+} | undefined;
+
+// @public (undocumented)
+export function ReadTags(tagsFilePath: string): Tag[];
+
+// @public (undocumented)
+export const recursiveOmit: (obj: $TSObject, path: Array<string>) => void;
+
+// Warning: (ae-forgotten-export) The symbol "deploymentSecretsRemove" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const removeFromDeploymentSecrets: (deploymentSecretsModifier: deploymentSecretsRemove) => DeploymentSecrets;
+
+// @public (undocumented)
+export class ResourceAlreadyExistsError extends Error {
+}
+
+// @public (undocumented)
+export class ResourceCountLimitExceedError extends Error {
+    constructor(errMessage: string);
+}
+
+// @public (undocumented)
+export class ResourceCredentialsNotFoundError extends Error {
+}
+
+// @public (undocumented)
+export class ResourceDoesNotExistError extends Error {
+    constructor(errMessage: string);
+}
+
+// @public (undocumented)
+export type ResourceEntry = {
+    resourceName: string;
+    resource: Record<string, unknown>;
+};
+
+// @public (undocumented)
+export type ResourceName = string;
+
+// @public (undocumented)
+export interface ResourceTuple {
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    resourceName: string;
+}
+
+// @public (undocumented)
+export const SecretFileMode = 384;
+
+// @public (undocumented)
+export type ServiceSelection = {
+    provider: string;
+    service: string;
+    providerName: string;
+};
+
+// @public (undocumented)
+export const setPermissionsBoundaryArn: (arn?: string | undefined, env?: string | undefined, teamProviderInfo?: $TSObject | undefined) => void;
+
+// @public (undocumented)
+export function skipHooks(): boolean;
+
+// @public (undocumented)
+export const skipHooksFilePath = "/opt/amazon";
+
+// @public (undocumented)
+export const spinner: Ora;
+
+// @public (undocumented)
+export class StateManager {
+    // (undocumented)
+    backendConfigFileExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    cliJSONFileExists: (projectPath: string, env?: string | undefined) => boolean;
+    // (undocumented)
+    currentMetaFileExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    getAmplifyAdminConfigEntry: (appId: string, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getAppID: () => string;
+    // (undocumented)
+    getBackendConfig: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getCLIJSON: (projectPath: string, env?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getCurrentBackendConfig: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getCurrentEnvName: (projectPath?: string | undefined) => string | undefined;
+    // (undocumented)
+    getCurrentMeta: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSMeta;
+    // (undocumented)
+    getCurrentProjectTags: (projectPath?: string | undefined) => Tag[];
+    // (undocumented)
+    getCurrentRegion: (projectPath?: string | undefined) => string | undefined;
+    // (undocumented)
+    getCurrentResourceParametersJson: (projectPath: string | undefined, category: string, resourceName: string, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getCustomPolicies: (categoryName: string, resourceName: string) => CustomIAMPolicies;
+    // (undocumented)
+    getDeploymentSecrets: () => DeploymentSecrets;
+    // (undocumented)
+    getHooksConfigJson: (projectPath?: string | undefined) => HooksConfig;
+    // (undocumented)
+    getHydratedTags: (projectPath?: string | undefined, skipProjEnv?: boolean) => Tag[];
+    // (undocumented)
+    getLocalAWSInfo: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getLocalEnvInfo: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getMeta: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSMeta;
+    // (undocumented)
+    getProjectConfig: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getProjectName: () => string;
+    // (undocumented)
+    getProjectTags: (projectPath?: string | undefined) => Tag[];
+    // (undocumented)
+    getResourceFromMeta: (amplifyMeta: Record<string, $TSAny>, categoryName: string, serviceName: string, resourceName?: string | undefined, throwIfNotExist?: boolean) => ResourceEntry | null;
+    // (undocumented)
+    getResourceInputsJson: (projectPath: string | undefined, category: string, resourceName: string, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getResourceParametersJson: (projectPath: string | undefined, category: string, resourceName: string, options?: GetOptions<any> | undefined) => $TSAny;
+    // (undocumented)
+    getTeamProviderInfo: (projectPath?: string | undefined, options?: GetOptions<any> | undefined) => $TSTeamProviderInfo;
+    // (undocumented)
+    isTagFilePresent: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    localAWSInfoExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    localEnvInfoExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    metaFileExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    projectConfigExists: (projectPath?: string | undefined) => boolean;
+    // (undocumented)
+    removeAmplifyAdminConfigEntry: (appId: string) => void;
+    // (undocumented)
+    resourceInputsJsonExists: (projectPath: string | undefined, category: string, resourceName: string) => boolean;
+    // (undocumented)
+    setAmplifyAdminConfigEntry: (appId: string, config: $TSAny) => void;
+    // (undocumented)
+    setBackendConfig: (projectPath: string | undefined, backendConfig: $TSAny) => void;
+    // (undocumented)
+    setCLIJSON: (projectPath: string, cliJSON: $TSAny, env?: string | undefined) => void;
+    // (undocumented)
+    setCurrentBackendConfig: (projectPath: string | undefined, backendConfig: $TSAny) => void;
+    // (undocumented)
+    setCurrentMeta: (projectPath: string | undefined, meta: $TSMeta) => void;
+    // (undocumented)
+    setDeploymentSecrets: (deploymentSecrets: DeploymentSecrets) => void;
+    // (undocumented)
+    setLocalAWSInfo: (projectPath: string | undefined, localAWSInfo: $TSAny) => void;
+    // (undocumented)
+    setLocalEnvInfo: (projectPath: string | undefined, localEnvInfo: $TSAny) => void;
+    // (undocumented)
+    setMeta: (projectPath: string | undefined, meta: $TSMeta) => void;
+    // (undocumented)
+    setProjectConfig: (projectPath: string | undefined, projectConfig: $TSAny) => void;
+    // (undocumented)
+    setProjectFileTags: (projectPath: string | undefined, tags: Tag[]) => void;
+    // (undocumented)
+    setResourceInputsJson: (projectPath: string | undefined, category: string, resourceName: string, inputs: $TSObject) => void;
+    // (undocumented)
+    setResourceParametersJson: (projectPath: string | undefined, category: string, resourceName: string, parameters: $TSAny) => void;
+    // (undocumented)
+    setSampleHooksDir: (projectPath: string | undefined, sourceDirPath: string) => void;
+    // (undocumented)
+    setTeamProviderInfo: (projectPath: string | undefined, teamProviderInfo: $TSTeamProviderInfo) => void;
+    // (undocumented)
+    teamProviderInfoExists: (projectPath?: string | undefined) => boolean;
+}
+
+// @public (undocumented)
+export const stateManager: StateManager;
+
+// @public (undocumented)
+export type StepStatusParameters = Omit<DeploymentStepState, 'status'>;
+
+// @public (undocumented)
+export const supportedEnvEvents: HooksVerb[];
+
+// @public (undocumented)
+export const supportedEvents: Record<HooksVerb, HooksNoun[]>;
+
+// @public (undocumented)
+export interface Tag {
+    // (undocumented)
+    Key: string;
+    // (undocumented)
+    Value: string;
+}
+
+// @public (undocumented)
+export interface Template {
+    // (undocumented)
+    AWSTemplateFormatVersion?: string;
+    // (undocumented)
+    Conditions?: Record<string, any>;
+    // (undocumented)
+    Description?: string;
+    // (undocumented)
+    Mappings?: {
+        [key: string]: {
+            [key: string]: Record<string, string | number | string[]>;
+        };
+    };
+    // (undocumented)
+    Metadata?: Record<string, any>;
+    // (undocumented)
+    Outputs?: Record<string, any>;
+    // (undocumented)
+    Parameters?: Record<string, any>;
+    // (undocumented)
+    Resources?: Record<string, any>;
+    // (undocumented)
+    Transform?: any;
+}
+
+// @public (undocumented)
+export type TypeDef = {
+    typeName: string;
+    service: string;
+};
+
+// @public (undocumented)
+export class UnknownArgumentError extends Error {
+}
+
+// @public (undocumented)
+export class UnknownResourceTypeError extends Error {
+}
+
+// @public (undocumented)
+export class UnrecognizedFrameworkError extends Error {
+}
+
+// @public (undocumented)
+export class UnrecognizedFrontendError extends Error {
+}
+
+// @public (undocumented)
+export function validate(tags: Tag[], skipProjectEnv?: boolean): void;
+
+// @public (undocumented)
+export function validateExportDirectoryPath(directoryPath: any, defaultPath: string): string;
+
+// @public (undocumented)
+export class ViewResourceTableParams {
+    constructor(cliParams: CLIParams);
+    // (undocumented)
+    get categoryList(): string[] | [];
+    // (undocumented)
+    get command(): string;
+    // (undocumented)
+    getCategoryFromCLIOptions(cliOptions: object): string[];
+    // (undocumented)
+    getStyledHelp(): string;
+    // (undocumented)
+    get help(): boolean;
+    // (undocumented)
+    logErrorException(e: Error, context: $TSContext): void;
+    // (undocumented)
+    styleCommand(str: string): string;
+    // (undocumented)
+    styleHeader(str: string): string;
+    // (undocumented)
+    styleOption(str: string): string;
+    // (undocumented)
+    stylePrompt(str: string): string;
+    // (undocumented)
+    get verbose(): boolean;
+}
+
+// @public (undocumented)
+export const writeCFNTemplate: (template: object, filePath: string, options?: WriteCFNTemplateOptions | undefined) => Promise<void>;
+
+// @public (undocumented)
+export type WriteCFNTemplateOptions = {
+    templateFormat?: CFNTemplateFormat;
+    minify?: boolean;
+};
+
+// Warnings were encountered during analysis:
+//
+// src/types.ts:17:3 - (ae-forgotten-export) The symbol "AmplifyToolkit" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json
index 50ca9307bf3..46ced49e1a1 100644
--- a/packages/amplify-cli-core/package.json
+++ b/packages/amplify-cli-core/package.json
@@ -21,7 +21,8 @@
     "test-ci": "jest --ci -i",
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/graphql-transformer-core": "^0.17.15",
diff --git a/packages/amplify-cli-extensibility-helper/API.md b/packages/amplify-cli-extensibility-helper/API.md
new file mode 100644
index 00000000000..219521b6987
--- /dev/null
+++ b/packages/amplify-cli-extensibility-helper/API.md
@@ -0,0 +1,192 @@
+## API Report File for "@aws-amplify/cli-extensibility-helper"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { addCDKResourceDependency as addResourceDependency } from '@aws-amplify/amplify-category-custom';
+import { AmplifyResourceProps } from '@aws-amplify/amplify-category-custom';
+import * as apigwCdk from '@aws-cdk/aws-apigateway';
+import * as cdk from '@aws-cdk/core';
+import { CfnApiKey } from '@aws-cdk/aws-appsync';
+import { CfnDataSource } from '@aws-cdk/aws-appsync';
+import { CfnDomain } from '@aws-cdk/aws-elasticsearch';
+import { CfnEventSourceMapping } from '@aws-cdk/aws-lambda';
+import { CfnFunction } from '@aws-cdk/aws-lambda';
+import { CfnFunctionConfiguration } from '@aws-cdk/aws-appsync';
+import { CfnGraphQLApi } from '@aws-cdk/aws-appsync';
+import { CfnGraphQLSchema } from '@aws-cdk/aws-appsync';
+import { CfnPolicy } from '@aws-cdk/aws-iam';
+import { CfnResolver } from '@aws-cdk/aws-appsync';
+import { CfnRole } from '@aws-cdk/aws-iam';
+import { CfnStack } from '@aws-cdk/core';
+import { CfnTable } from '@aws-cdk/aws-dynamodb';
+import * as cognito from '@aws-cdk/aws-cognito';
+import * as ddb from '@aws-cdk/aws-dynamodb';
+import * as iamCdk from '@aws-cdk/aws-iam';
+import * as lambda from '@aws-cdk/aws-lambda';
+import * as s3 from '@aws-cdk/aws-s3';
+
+export { addResourceDependency }
+
+// @public (undocumented)
+export interface AmplifyApiGraphQlResourceStackTemplate {
+    // Warning: (ae-forgotten-export) The symbol "AppsyncApiStack" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    api?: Partial<AppsyncApiStack>;
+    // Warning: (ae-forgotten-export) The symbol "ModelDirectiveStack" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    models?: Partial<Record<string, ModelDirectiveStack>>;
+    // Warning: (ae-forgotten-export) The symbol "OpenSearchDirectiveStack" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "AppsyncStackCommon" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    opensearch?: Partial<OpenSearchDirectiveStack & AppsyncStackCommon>;
+    // Warning: (ae-forgotten-export) The symbol "PredictionsDirectiveStack" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    predictions?: Partial<PredictionsDirectiveStack & AppsyncStackCommon>;
+}
+
+// Warning: (ae-forgotten-export) The symbol "AmplifyCDKL1_2" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type AmplifyApiRestResourceStackTemplate = {
+    restApi: apigwCdk.CfnRestApi;
+    deploymentResource: apigwCdk.CfnDeployment;
+    policies?: {
+        [pathName: string]: ApigwPathPolicy;
+    };
+} & AmplifyCDKL1_2;
+
+// Warning: (ae-forgotten-export) The symbol "AmplifyCDKL1_3" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type AmplifyAuthCognitoStackTemplate = {
+    customMessageConfirmationBucket?: s3.CfnBucket;
+    snsRole?: iamCdk.CfnRole;
+    userPool?: cognito.CfnUserPool;
+    userPoolClientWeb?: cognito.CfnUserPoolClient;
+    userPoolClient?: cognito.CfnUserPoolClient;
+    identityPool?: cognito.CfnIdentityPool;
+    identityPoolRoleMap?: cognito.CfnIdentityPoolRoleAttachment;
+    lambdaConfigPermissions?: Record<string, lambda.CfnPermission>;
+    lambdaTriggerPermissions?: Record<string, iamCdk.CfnPolicy>;
+    userPoolClientLambda?: lambda.CfnFunction;
+    userPoolClientRole?: iamCdk.CfnRole;
+    userPoolClientLambdaPolicy?: iamCdk.CfnPolicy;
+    userPoolClientLogPolicy?: iamCdk.CfnPolicy;
+    userPoolClientInputs?: cdk.CustomResource;
+    hostedUICustomResource?: lambda.CfnFunction;
+    hostedUICustomResourcePolicy?: iamCdk.CfnPolicy;
+    hostedUICustomResourceLogPolicy?: iamCdk.CfnPolicy;
+    hostedUICustomResourceInputs?: cdk.CustomResource;
+    hostedUIProvidersCustomResource?: lambda.CfnFunction;
+    hostedUIProvidersCustomResourcePolicy?: iamCdk.CfnPolicy;
+    hostedUIProvidersCustomResourceLogPolicy?: iamCdk.CfnPolicy;
+    hostedUIProvidersCustomResourceInputs?: cdk.CustomResource;
+    oAuthCustomResource?: lambda.CfnFunction;
+    oAuthCustomResourcePolicy?: iamCdk.CfnPolicy;
+    oAuthCustomResourceLogPolicy?: iamCdk.CfnPolicy;
+    oAuthCustomResourceInputs?: cdk.CustomResource;
+    mfaLambda?: lambda.CfnFunction;
+    mfaLogPolicy?: iamCdk.CfnPolicy;
+    mfaLambdaPolicy?: iamCdk.CfnPolicy;
+    mfaLambdaInputs?: cdk.CustomResource;
+    mfaLambdaRole?: iamCdk.CfnRole;
+    openIdLambda?: lambda.CfnFunction;
+    openIdLogPolicy?: iamCdk.CfnPolicy;
+    openIdLambdaIAMPolicy?: iamCdk.CfnPolicy;
+    openIdLambdaInputs?: cdk.CustomResource;
+    openIdLambdaRole?: iamCdk.CfnRole;
+} & AmplifyCDKL1_3;
+
+// @public (undocumented)
+export interface AmplifyCDKL1 {
+    // (undocumented)
+    addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
+}
+
+// @public (undocumented)
+export interface AmplifyDDBResourceTemplate extends AmplifyCDKL1 {
+    // (undocumented)
+    dynamoDBTable?: ddb.CfnTable;
+}
+
+export { AmplifyResourceProps }
+
+// @public (undocumented)
+export interface AmplifyRootStackTemplate {
+    // (undocumented)
+    addCfnCondition: (props: cdk.CfnConditionProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnMapping: (props: cdk.CfnMappingProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnOutput: (props: cdk.CfnOutputProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnParameter: (props: cdk.CfnParameterProps, logicalId: string) => void;
+    // (undocumented)
+    addCfnResource: (props: cdk.CfnResourceProps, logicalId: string) => void;
+    // (undocumented)
+    authRole?: iamCdk.CfnRole;
+    // (undocumented)
+    unauthRole?: iamCdk.CfnRole;
+}
+
+// @public (undocumented)
+export interface AmplifyS3ResourceTemplate extends AmplifyCDKL1 {
+    // (undocumented)
+    s3AuthPrivatePolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3AuthProtectedPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3AuthPublicPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3AuthReadPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3AuthUploadPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3Bucket?: s3.CfnBucket;
+    // (undocumented)
+    s3GuestPublicPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3GuestReadPolicy?: iamCdk.CfnPolicy;
+    // (undocumented)
+    s3GuestUploadPolicy?: iamCdk.CfnPolicy;
+}
+
+// @public (undocumented)
+export type AmplifyUserPoolGroupStackTemplate = {
+    userPoolGroup?: Record<string, cognito.CfnUserPoolGroup>;
+    userPoolGroupRole?: Record<string, iamCdk.CfnRole>;
+    roleMapCustomResource?: cdk.CustomResource;
+    lambdaExecutionRole?: iamCdk.CfnRole;
+    roleMapLambdaFunction?: lambda.CfnFunction;
+} & AmplifyCDKL1_3;
+
+// @public (undocumented)
+export type ApigwPathPolicy = {
+    groups?: {
+        [groupName: string]: iamCdk.CfnPolicy;
+    };
+};
+
+// Warning: (ae-forgotten-export) The symbol "AmplifyProjectInfo" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const getProjectInfo: () => AmplifyProjectInfo;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli-extensibility-helper/package.json b/packages/amplify-cli-extensibility-helper/package.json
index 38bdc2bb835..7256879cef3 100644
--- a/packages/amplify-cli-extensibility-helper/package.json
+++ b/packages/amplify-cli-extensibility-helper/package.json
@@ -24,7 +24,8 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-category-custom": "2.5.5",
diff --git a/packages/amplify-cli-logger/API.md b/packages/amplify-cli-logger/API.md
new file mode 100644
index 00000000000..739d6d3a76c
--- /dev/null
+++ b/packages/amplify-cli-logger/API.md
@@ -0,0 +1,23 @@
+## API Report File for "amplify-cli-logger"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export const LocalLogDirectory: string;
+
+// Warning: (ae-forgotten-export) The symbol "IAmplifyLogger" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const logger: IAmplifyLogger;
+
+// @public (undocumented)
+export const Redactor: (arg: string | undefined) => string;
+
+// @public (undocumented)
+export const stringMasker: (s: string) => string;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli-logger/package.json b/packages/amplify-cli-logger/package.json
index 9f702f18285..924e7a1e0e1 100644
--- a/packages/amplify-cli-logger/package.json
+++ b/packages/amplify-cli-logger/package.json
@@ -8,7 +8,8 @@
     "test": "jest --logHeapUsage",
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "repository": {
     "type": "git",
diff --git a/packages/amplify-cli-npm/API.md b/packages/amplify-cli-npm/API.md
new file mode 100644
index 00000000000..41ce2f81c53
--- /dev/null
+++ b/packages/amplify-cli-npm/API.md
@@ -0,0 +1,15 @@
+## API Report File for "@aws-amplify/cli"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export const install: () => Promise<void>;
+
+// @public (undocumented)
+export const run: () => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json
index 5b26df6f5d5..7c4e1bb5224 100644
--- a/packages/amplify-cli-npm/package.json
+++ b/packages/amplify-cli-npm/package.json
@@ -24,7 +24,8 @@
     "build": "tsc",
     "postinstall": "node ./lib/install.js || echo \"failed to install amplify binary\"",
     "prepublishOnly": "rimraf ./lib && tsc",
-    "run": "ts-node ./run.ts"
+    "run": "ts-node ./run.ts",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "engines": {
     "node": ">=12.0.0"
diff --git a/packages/amplify-cli-shared-interfaces/API.md b/packages/amplify-cli-shared-interfaces/API.md
new file mode 100644
index 00000000000..b74608f2a36
--- /dev/null
+++ b/packages/amplify-cli-shared-interfaces/API.md
@@ -0,0 +1,88 @@
+## API Report File for "amplify-cli-shared-interfaces"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export interface ICommandInput {
+    // (undocumented)
+    argv: Array<string>;
+    // (undocumented)
+    command?: string;
+    // (undocumented)
+    options?: {
+        [key: string]: string | boolean;
+    };
+    // (undocumented)
+    plugin?: string;
+    // (undocumented)
+    subCommands?: string[];
+}
+
+// @public (undocumented)
+export interface IFlowData {
+    // (undocumented)
+    assignProjectIdentifier: (envName?: string) => string | undefined;
+    // (undocumented)
+    getFlowReport: () => IFlowReport | Record<string, never>;
+    // (undocumented)
+    pushHeadlessFlow: (headlessFlowDataString: string, input: ICommandInput) => void;
+    // (undocumented)
+    pushInteractiveFlow: (prompt: string, input: unknown) => void;
+    // (undocumented)
+    setIsHeadless: (headless: boolean) => void;
+}
+
+// @public (undocumented)
+export interface IFlowReport {
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    cmd: string;
+    // (undocumented)
+    executable: string;
+    // (undocumented)
+    input: ICommandInput;
+    // (undocumented)
+    isHeadless: boolean;
+    // (undocumented)
+    optionFlowData: Array<TypeOptionFlowData>;
+    // (undocumented)
+    projectEnvIdentifier?: string;
+    // (undocumented)
+    projectIdentifier?: string;
+    // (undocumented)
+    runtime: string;
+    // (undocumented)
+    subCmd: string | undefined;
+    // (undocumented)
+    timestamp: string;
+    // (undocumented)
+    version: string;
+}
+
+// @public (undocumented)
+export interface IOptionFlowCLIData {
+    // (undocumented)
+    input: unknown;
+    // (undocumented)
+    prompt: string;
+    // (undocumented)
+    timestamp: number;
+}
+
+// @public (undocumented)
+export interface IOptionFlowHeadlessData {
+    // (undocumented)
+    input: string;
+    // (undocumented)
+    timestamp: number;
+}
+
+// @public (undocumented)
+export type TypeOptionFlowData = IOptionFlowHeadlessData | IOptionFlowCLIData;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli-shared-interfaces/package.json b/packages/amplify-cli-shared-interfaces/package.json
index 9bd975dbbb2..dca8d5ccdc3 100644
--- a/packages/amplify-cli-shared-interfaces/package.json
+++ b/packages/amplify-cli-shared-interfaces/package.json
@@ -7,7 +7,8 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
     "demo": "yarn build && node lib/demo/demo.js",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "repository": {
     "type": "git",
diff --git a/packages/amplify-cli/API.md b/packages/amplify-cli/API.md
new file mode 100644
index 00000000000..2d934dd7a5a
--- /dev/null
+++ b/packages/amplify-cli/API.md
@@ -0,0 +1,115 @@
+## API Report File for "@aws-amplify/cli-internal"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+/// <reference types="node" />
+
+import { $TSAny } from 'amplify-cli-core';
+import { IAmplifyLogger } from 'amplify-cli-logger/lib/IAmplifyLogger';
+import { ICommandInput } from 'amplify-cli-shared-interfaces';
+import { IFlowData } from 'amplify-cli-shared-interfaces';
+import { IFlowReport } from 'amplify-cli-shared-interfaces';
+import { IPluginCollection } from 'amplify-cli-core';
+import { IPluginInfo } from 'amplify-cli-core';
+import { IPluginPlatform } from 'amplify-cli-core';
+import { TypeOptionFlowData } from 'amplify-cli-shared-interfaces';
+import { UrlWithStringQuery } from 'url';
+
+// Warning: (ae-forgotten-export) The symbol "Input" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const execute: (input: Input) => Promise<void>;
+
+// Warning: (ae-forgotten-export) The symbol "Context" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const executeAmplifyCommand: (context: Context) => Promise<void>;
+
+// @public (undocumented)
+export const run: (startTime: number) => Promise<void>;
+
+// Warning: (ae-forgotten-export) The symbol "IUsageData" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export class UsageData implements IUsageData {
+    // (undocumented)
+    accountId: string;
+    // (undocumented)
+    assignProjectIdentifier(): string | undefined;
+    // (undocumented)
+    calculatePushNormalizationFactor(events: {
+        StackId: string;
+        PhysicalResourceId: string;
+    }[], StackId: string): void;
+    // (undocumented)
+    codePathDurations: Map<TimedCodePath, number>;
+    // Warning: (ae-forgotten-export) The symbol "TimedCodePath" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "Timer" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    codePathTimers: Map<TimedCodePath, Timer>;
+    // (undocumented)
+    emitAbort(): Promise<void>;
+    // (undocumented)
+    emitError(error: Error | null): Promise<void>;
+    // (undocumented)
+    emitSuccess(): Promise<void>;
+    // Warning: (ae-forgotten-export) The symbol "CLIFlowReport" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    flow: CLIFlowReport;
+    // (undocumented)
+    getFlowReport(): IFlowReport;
+    // (undocumented)
+    getSessionUuid(): string;
+    // Warning: (ae-forgotten-export) The symbol "UsageDataPayload" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    getUsageDataPayload(error: Error | null, state: string): UsageDataPayload;
+    // (undocumented)
+    init(installationUuid: string, version: string, input: Input, accountId: string, projectSettings: ProjectSettings, processStartTimeStamp: number): void;
+    // (undocumented)
+    input: Input;
+    // Warning: (ae-forgotten-export) The symbol "InputOptions" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    inputOptions: InputOptions;
+    // (undocumented)
+    installationUuid: string;
+    // (undocumented)
+    static get Instance(): IUsageData;
+    // Warning: (ae-forgotten-export) The symbol "ProjectSettings" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    projectSettings: ProjectSettings;
+    // (undocumented)
+    pushHeadlessFlow(headlessParameterString: string, input: ICommandInput): void;
+    // (undocumented)
+    pushInteractiveFlow(prompt: string, input: unknown): void;
+    // (undocumented)
+    pushNormalizationFactor: number;
+    // (undocumented)
+    requestTimeout: number;
+    // (undocumented)
+    sessionUuid: string;
+    // (undocumented)
+    setIsHeadless(isHeadless: boolean): void;
+    // Warning: (ae-forgotten-export) The symbol "StartableTimedCodePath" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    startCodePathTimer(codePath: StartableTimedCodePath): void;
+    // Warning: (ae-forgotten-export) The symbol "StoppableTimedCodePath" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    stopCodePathTimer(codePath: StoppableTimedCodePath): void;
+    // (undocumented)
+    url: UrlWithStringQuery;
+    // (undocumented)
+    version: string;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index ea239df583f..0d80e354c35 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -27,7 +27,8 @@
     "test": "jest --logHeapUsage",
     "postinstall": "node scripts/post-install.js",
     "watch": "tsc -w",
-    "clean": "rimraf ./lib tsconfig.tsbuildinfo"
+    "clean": "rimraf ./lib tsconfig.tsbuildinfo",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "engines": {
     "node": ">=12.0.0"
diff --git a/packages/amplify-console-hosting/API.md b/packages/amplify-console-hosting/API.md
new file mode 100644
index 00000000000..7f165405a1f
--- /dev/null
+++ b/packages/amplify-console-hosting/API.md
@@ -0,0 +1,25 @@
+## API Report File for "amplify-console-hosting"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export function executeAmplifyCommand(context: any): Promise<void>;
+
+// @public (undocumented)
+export function handleAmplifyEvent(context: any, args: any): Promise<void>;
+
+// @public (undocumented)
+export function initEnv(context: any): Promise<void>;
+
+// @public (undocumented)
+export function publish(context: any, service: any, args: any): Promise<void>;
+
+// @public (undocumented)
+function status_2(context: any): Promise<void>;
+export { status_2 as status }
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-console-hosting/package.json b/packages/amplify-console-hosting/package.json
index e02cb73cdb0..3c2bd49f718 100644
--- a/packages/amplify-console-hosting/package.json
+++ b/packages/amplify-console-hosting/package.json
@@ -22,6 +22,7 @@
   "scripts": {
     "build": "tsc && copyfiles -u 1 \"./src/hosting/templates/*.json\" \"./lib\"",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "watch": "tsc --watch"
+    "watch": "tsc --watch",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   }
 }
diff --git a/packages/amplify-container-hosting/API.md b/packages/amplify-container-hosting/API.md
new file mode 100644
index 00000000000..2ee833d1dd5
--- /dev/null
+++ b/packages/amplify-container-hosting/API.md
@@ -0,0 +1,9 @@
+## API Report File for "amplify-container-hosting"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json
index 74d7d59a837..b6f87a29553 100644
--- a/packages/amplify-container-hosting/package.json
+++ b/packages/amplify-container-hosting/package.json
@@ -19,7 +19,8 @@
     "test-ci": "yarn jest --ci",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "watch": "tsc --watch",
-    "test": "jest --logHeapUsage --coverage --passWithNoTests"
+    "test": "jest --logHeapUsage --coverage --passWithNoTests",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-category-api": "^4.0.9",
diff --git a/packages/amplify-dotnet-function-runtime-provider/API.md b/packages/amplify-dotnet-function-runtime-provider/API.md
new file mode 100644
index 00000000000..934d672b4c0
--- /dev/null
+++ b/packages/amplify-dotnet-function-runtime-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-dotnet-function-runtime-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionRuntimeContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-dotnet-function-runtime-provider/package.json b/packages/amplify-dotnet-function-runtime-provider/package.json
index b0fb5c48d11..58b88ebb3f7 100644
--- a/packages/amplify-dotnet-function-runtime-provider/package.json
+++ b/packages/amplify-dotnet-function-runtime-provider/package.json
@@ -19,7 +19,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.5",
diff --git a/packages/amplify-dotnet-function-template-provider/API.md b/packages/amplify-dotnet-function-template-provider/API.md
new file mode 100644
index 00000000000..afc1c9fe127
--- /dev/null
+++ b/packages/amplify-dotnet-function-template-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-dotnet-function-template-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionTemplateContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionTemplateContributorFactory: FunctionTemplateContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-dotnet-function-template-provider/package.json b/packages/amplify-dotnet-function-template-provider/package.json
index ec7e7a8c1cf..fb3f47ab6a9 100644
--- a/packages/amplify-dotnet-function-template-provider/package.json
+++ b/packages/amplify-dotnet-function-template-provider/package.json
@@ -19,7 +19,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-environment-parameters/API.md b/packages/amplify-environment-parameters/API.md
new file mode 100644
index 00000000000..b00d452ddda
--- /dev/null
+++ b/packages/amplify-environment-parameters/API.md
@@ -0,0 +1,34 @@
+## API Report File for "@aws-amplify/amplify-environment-parameters"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export const ensureEnvParamManager: (envName?: string) => Promise<{
+    instance: EnvironmentParameterManager;
+}>;
+
+// @public (undocumented)
+export const getEnvParamManager: (envName?: string) => EnvironmentParameterManager;
+
+// @public (undocumented)
+export type IEnvironmentParameterManager = {
+    init: () => Promise<void>;
+    removeResourceParamManager: (category: string, resource: string) => void;
+    hasResourceParamManager: (category: string, resource: string) => boolean;
+    getResourceParamManager: (category: string, resource: string) => ResourceParameterManager;
+    save: () => void;
+};
+
+// @public (undocumented)
+export const saveAll: () => Promise<void>;
+
+// Warnings were encountered during analysis:
+//
+// src/environment-parameter-manager.ts:14:13 - (ae-forgotten-export) The symbol "EnvironmentParameterManager" needs to be exported by the entry point index.d.ts
+// src/environment-parameter-manager.ts:130:3 - (ae-forgotten-export) The symbol "ResourceParameterManager" needs to be exported by the entry point index.d.ts
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-environment-parameters/package.json b/packages/amplify-environment-parameters/package.json
index e66a548ceb7..484f70db18c 100644
--- a/packages/amplify-environment-parameters/package.json
+++ b/packages/amplify-environment-parameters/package.json
@@ -22,7 +22,8 @@
     "build": "tsc",
     "watch": "tsc -w",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "test": "jest --logHeapUsage"
+    "test": "jest --logHeapUsage",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-function-plugin-interface/API.md b/packages/amplify-function-plugin-interface/API.md
new file mode 100644
index 00000000000..1b1029f5b69
--- /dev/null
+++ b/packages/amplify-function-plugin-interface/API.md
@@ -0,0 +1,360 @@
+## API Report File for "amplify-function-plugin-interface"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export type BuildRequest = {
+    buildType: BuildType;
+    srcRoot: string;
+    runtime: string;
+    legacyBuildHookParams?: {
+        projectRoot: string;
+        resourceName: string;
+    };
+    lastBuildTimeStamp?: Date;
+    lastBuildType?: BuildType;
+    service?: string;
+};
+
+// @public (undocumented)
+export type BuildResult = {
+    rebuilt: boolean;
+};
+
+// @public (undocumented)
+export enum BuildType {
+    // (undocumented)
+    DEV = "DEV",
+    // (undocumented)
+    PROD = "PROD"
+}
+
+// @public (undocumented)
+export type CheckDependenciesResult = {
+    hasRequiredDependencies: boolean;
+    errorMessage?: string;
+};
+
+// @public (undocumented)
+export interface Contributor<T extends Partial<FunctionParameters>, K> {
+    // (undocumented)
+    contribute(request: K): Promise<T>;
+}
+
+// @public (undocumented)
+export interface ExternalLayer {
+    // (undocumented)
+    arn: string | {
+        'Fn::Sub': string;
+    } | {
+        Ref: string;
+    };
+    // (undocumented)
+    type: 'ExternalLayer';
+}
+
+// @public (undocumented)
+export interface FunctionBreadcrumbs {
+    // (undocumented)
+    defaultEditorFile: string;
+    // (undocumented)
+    functionRuntime: string;
+    // (undocumented)
+    pluginId: string;
+    // (undocumented)
+    scripts?: Record<'build' & 'package', FunctionScript>;
+    // (undocumented)
+    useLegacyBuild: boolean;
+}
+
+// @public (undocumented)
+export interface FunctionDependency {
+    // (undocumented)
+    attributeEnvMap?: {
+        [name: string]: string;
+    };
+    // (undocumented)
+    attributes: string[];
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    resourceName: string;
+}
+
+// @public (undocumented)
+export type FunctionParameters = {
+    providerContext: ProviderContext;
+    cloudResourceTemplatePath: string;
+    resourceName: string;
+    functionName: string;
+    runtime: FunctionRuntime;
+    roleName: string;
+    dependsOn?: FunctionDependency[];
+    functionTemplate?: FunctionTemplate;
+    categoryPolicies?: object[];
+    skipEdit?: boolean;
+    mutableParametersState?: any;
+    environmentMap?: Record<string, any>;
+    triggerEventSourceMappings?: any;
+    topLevelComment?: string;
+    runtimePluginId: string;
+    cloudwatchRule?: string;
+    lambdaLayers: LambdaLayer[];
+    environmentVariables?: Record<string, string>;
+    secretDeltas?: SecretDeltas;
+    template?: string;
+    defaultRuntime?: string;
+    skipAdvancedSection?: boolean;
+    skipNextSteps?: boolean;
+};
+
+// @public (undocumented)
+export interface FunctionRuntime {
+    // (undocumented)
+    cloudTemplateValue: string;
+    // (undocumented)
+    defaultHandler: string;
+    // (undocumented)
+    layerDefaultFiles?: LayerFiles[];
+    // (undocumented)
+    layerExecutablePath?: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    runtimePluginId?: string;
+    // (undocumented)
+    value: string;
+}
+
+// Warning: (ae-forgotten-export) The symbol "FunctionContributorCondition" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type FunctionRuntimeCondition = Pick<FunctionContributorCondition, 'provider' | 'services'>;
+
+// @public (undocumented)
+export type FunctionRuntimeContributorFactory = (context: any) => Contributor<FunctionRuntimeParameters, RuntimeContributionRequest> & FunctionRuntimeLifecycleManager;
+
+// @public (undocumented)
+export interface FunctionRuntimeLifecycleManager {
+    // (undocumented)
+    build(request: BuildRequest): Promise<BuildResult>;
+    // (undocumented)
+    checkDependencies(runtimeValue: string): Promise<CheckDependenciesResult>;
+    // (undocumented)
+    invoke(request: InvocationRequest): Promise<any>;
+    // (undocumented)
+    package(request: PackageRequest): Promise<PackageResult>;
+}
+
+// @public (undocumented)
+export type FunctionRuntimeParameters = Pick<FunctionParameters, 'runtime'>;
+
+// @public (undocumented)
+export interface FunctionScript {
+    // (undocumented)
+    type: 'file' | 'inline';
+    // (undocumented)
+    value: string;
+}
+
+// @public (undocumented)
+export interface FunctionTemplate {
+    // (undocumented)
+    defaultEditorFile?: string;
+    // (undocumented)
+    destMap?: {
+        [name: string]: string;
+    };
+    // (undocumented)
+    handler?: string;
+    // (undocumented)
+    parameters?: any;
+    // (undocumented)
+    sourceFiles: string[];
+    // (undocumented)
+    sourceRoot: string;
+}
+
+// @public (undocumented)
+export type FunctionTemplateCondition = FunctionContributorCondition;
+
+// @public (undocumented)
+export type FunctionTemplateContributorFactory = (context: any) => Contributor<Partial<FunctionParameters>, TemplateContributionRequest>;
+
+// @public (undocumented)
+export type FunctionTemplateParameters = Pick<FunctionParameters, 'dependsOn' | 'functionTemplate' | 'triggerEventSourceMappings'>;
+
+// @public (undocumented)
+export interface FunctionTriggerParameters {
+    // (undocumented)
+    cloudResourceTemplatePath?: string;
+    // (undocumented)
+    environmentVariables?: Record<string, string>;
+    // (undocumented)
+    functionName: string;
+    // (undocumented)
+    functionTemplate?: FunctionTemplate;
+    // (undocumented)
+    key: string;
+    // (undocumented)
+    modules: any[];
+    // (undocumented)
+    parentResource: string;
+    // (undocumented)
+    parentStack: string;
+    // (undocumented)
+    resourceName: string;
+    // (undocumented)
+    roleName: string;
+    // (undocumented)
+    skipEdit: boolean;
+    // (undocumented)
+    skipNextSteps?: boolean;
+    // (undocumented)
+    trigger: boolean;
+    // (undocumented)
+    triggerDir: string;
+    // (undocumented)
+    triggerEnvs: any;
+    // (undocumented)
+    triggerEventPath: string;
+    // (undocumented)
+    triggerIndexPath: string;
+    // (undocumented)
+    triggerPackagePath: string;
+    // (undocumented)
+    triggerTemplate: string;
+}
+
+// @public (undocumented)
+export type InvocationRequest = {
+    srcRoot: string;
+    runtime: string;
+    handler: string;
+    event: string;
+    envVars?: {
+        [key: string]: string;
+    };
+};
+
+// @public (undocumented)
+export type LambdaLayer = ProjectLayer | ExternalLayer;
+
+// @public (undocumented)
+export interface LayerFiles {
+    // (undocumented)
+    content?: any;
+    // (undocumented)
+    filename: string;
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+export type PackageRequest = {
+    env: string;
+    srcRoot: string;
+    dstFilename: string;
+    runtime: string;
+    lastBuildTimeStamp: Date;
+    lastPackageTimeStamp?: Date;
+    skipHashing?: boolean;
+    service?: string;
+    currentHash?: boolean;
+};
+
+// @public (undocumented)
+export type PackageResult = {
+    packageHash?: string;
+    zipEntries?: ZipEntry[];
+};
+
+// @public (undocumented)
+export interface ProjectLayer {
+    // (undocumented)
+    env: string;
+    // (undocumented)
+    isLatestVersionSelected: boolean;
+    // (undocumented)
+    resourceName: string;
+    // (undocumented)
+    type: 'ProjectLayer';
+    // (undocumented)
+    version: number | string;
+}
+
+// @public (undocumented)
+export interface ProviderContext {
+    // (undocumented)
+    projectName: string;
+    // (undocumented)
+    provider: string;
+    // (undocumented)
+    service: string;
+}
+
+// @public (undocumented)
+export type RemoveSecret = {
+    operation: 'remove';
+};
+
+// @public (undocumented)
+export const removeSecret: RemoveSecret;
+
+// @public (undocumented)
+export type RetainSecret = {
+    operation: 'retain';
+};
+
+// @public (undocumented)
+export const retainSecret: RetainSecret;
+
+// @public (undocumented)
+export type RuntimeContributionRequest = {
+    selection: string;
+    contributionContext: {
+        functionName: string;
+        resourceName: string;
+    };
+};
+
+// @public (undocumented)
+export type SecretDelta = RetainSecret | RemoveSecret | SetSecret;
+
+// @public (undocumented)
+export type SecretDeltas = Record<SecretName, SecretDelta>;
+
+// @public (undocumented)
+export type SecretName = string;
+
+// @public (undocumented)
+export type SetSecret = {
+    operation: 'set';
+    value: string;
+};
+
+// @public (undocumented)
+export const setSecret: (value: string) => SetSecret;
+
+// @public (undocumented)
+export type TemplateContributionRequest = {
+    selection: string;
+    contributionContext: {
+        runtime: FunctionRuntime;
+        functionName: string;
+        resourceName: string;
+    };
+};
+
+// @public (undocumented)
+export type ZipEntry = {
+    sourceFolder?: string;
+    packageFolder?: string;
+    ignoreFiles?: string[];
+};
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-function-plugin-interface/package.json b/packages/amplify-function-plugin-interface/package.json
index dc7347268d4..53f837c37f3 100644
--- a/packages/amplify-function-plugin-interface/package.json
+++ b/packages/amplify-function-plugin-interface/package.json
@@ -14,6 +14,7 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf ./lib tsconfig.tsbuildinfo",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   }
 }
diff --git a/packages/amplify-go-function-runtime-provider/API.md b/packages/amplify-go-function-runtime-provider/API.md
new file mode 100644
index 00000000000..6300c4e77e8
--- /dev/null
+++ b/packages/amplify-go-function-runtime-provider/API.md
@@ -0,0 +1,18 @@
+## API Report File for "amplify-go-function-runtime-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionRuntimeContributorFactory } from 'amplify-function-plugin-interface';
+import { GetPackageAssetPaths } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactory;
+
+// @public (undocumented)
+export const getPackageAssetPaths: GetPackageAssetPaths;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-go-function-runtime-provider/package.json b/packages/amplify-go-function-runtime-provider/package.json
index 4e2e41128ad..947d2623224 100644
--- a/packages/amplify-go-function-runtime-provider/package.json
+++ b/packages/amplify-go-function-runtime-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo resources/localinvoke/go.sum resources/localinvoke/main resources/localinvoke/main.exe"
+    "clean": "rimraf lib tsconfig.tsbuildinfo resources/localinvoke/go.sum resources/localinvoke/main resources/localinvoke/main.exe",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-go-function-template-provider/API.md b/packages/amplify-go-function-template-provider/API.md
new file mode 100644
index 00000000000..936c2c78797
--- /dev/null
+++ b/packages/amplify-go-function-template-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-go-function-template-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionTemplateContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionTemplateContributorFactory: FunctionTemplateContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-go-function-template-provider/package.json b/packages/amplify-go-function-template-provider/package.json
index 8efb8131401..26c06931a83 100644
--- a/packages/amplify-go-function-template-provider/package.json
+++ b/packages/amplify-go-function-template-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.5"
diff --git a/packages/amplify-headless-interface/API.md b/packages/amplify-headless-interface/API.md
new file mode 100644
index 00000000000..bd116b13c09
--- /dev/null
+++ b/packages/amplify-headless-interface/API.md
@@ -0,0 +1,662 @@
+## API Report File for "amplify-headless-interface"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export enum AccessType {
+    // (undocumented)
+    AuthorizedAndGuestUsers = "AuthorizedAndGuestUsers",
+    // (undocumented)
+    AuthorizedUsers = "AuthorizedUsers"
+}
+
+// @public (undocumented)
+export interface AddApiRequest {
+    // (undocumented)
+    serviceConfiguration: AppSyncServiceConfiguration;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export interface AddAuthRequest {
+    // (undocumented)
+    resourceName: string;
+    // (undocumented)
+    serviceConfiguration: CognitoServiceConfiguration;
+    // (undocumented)
+    version: 2;
+}
+
+// @public (undocumented)
+export interface AddGeoRequest {
+    // (undocumented)
+    serviceConfiguration: GeoServiceConfiguration;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export interface AddS3ServiceConfiguration extends S3ServiceConfigurationBase {
+    // (undocumented)
+    bucketName?: string;
+    // (undocumented)
+    lambdaTrigger?: LambdaTriggerConfig;
+    // (undocumented)
+    permissions: S3Permissions;
+    // (undocumented)
+    resourceName?: string;
+}
+
+// @public (undocumented)
+export interface AddStorageRequest {
+    // (undocumented)
+    serviceConfiguration: AddS3ServiceConfiguration;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export interface AppSyncAPIKeyAuthType {
+    // (undocumented)
+    apiKeyExpirationDate?: Date;
+    // (undocumented)
+    expirationTime?: number;
+    // (undocumented)
+    keyDescription?: string;
+    // (undocumented)
+    mode: 'API_KEY';
+}
+
+// @public (undocumented)
+export interface AppSyncAPIKeyExpiration {
+    // (undocumented)
+    days: number;
+}
+
+// @public (undocumented)
+export type AppSyncAuthType = AppSyncAPIKeyAuthType | AppSyncAWSIAMAuthType | AppSyncCognitoUserPoolsAuthType | AppSyncOpenIDConnectAuthType | AppSyncLambdaAuthType;
+
+// @public (undocumented)
+export interface AppSyncAWSIAMAuthType {
+    // (undocumented)
+    mode: 'AWS_IAM';
+}
+
+// @public (undocumented)
+export interface AppSyncCognitoUserPoolsAuthType {
+    // (undocumented)
+    cognitoUserPoolId?: string;
+    // (undocumented)
+    mode: 'AMAZON_COGNITO_USER_POOLS';
+}
+
+// @public (undocumented)
+export interface AppSyncLambdaAuthType {
+    // (undocumented)
+    lambdaFunction: string;
+    // (undocumented)
+    mode: 'AWS_LAMBDA';
+    // (undocumented)
+    ttlSeconds?: string;
+}
+
+// @public (undocumented)
+export interface AppSyncOpenIDConnectAuthType {
+    // (undocumented)
+    mode: 'OPENID_CONNECT';
+    // (undocumented)
+    openIDAuthTTL?: string;
+    // (undocumented)
+    openIDClientID: string;
+    // (undocumented)
+    openIDIatTTL?: string;
+    // (undocumented)
+    openIDIssuerURL: string;
+    // (undocumented)
+    openIDProviderName: string;
+}
+
+// @public (undocumented)
+export interface AppSyncServiceConfiguration {
+    // (undocumented)
+    additionalAuthTypes?: AppSyncAuthType[];
+    // (undocumented)
+    apiKeyExpiration?: AppSyncAPIKeyExpiration;
+    // (undocumented)
+    apiName: string;
+    // (undocumented)
+    conflictResolution?: ConflictResolution;
+    // (undocumented)
+    defaultAuthType: AppSyncAuthType;
+    // (undocumented)
+    serviceName: 'AppSync';
+    // (undocumented)
+    transformSchema: string;
+}
+
+// @public (undocumented)
+export type AppSyncServiceModification = Pick<AppSyncServiceConfiguration, 'serviceName'> & Partial<Pick<AppSyncServiceConfiguration, 'transformSchema' | 'defaultAuthType' | 'additionalAuthTypes' | 'conflictResolution' | 'apiKeyExpiration'>>;
+
+// @public (undocumented)
+export interface BaseCognitoServiceConfiguration {
+    // (undocumented)
+    serviceName: 'Cognito';
+    // (undocumented)
+    userPoolConfiguration: CognitoUserPoolConfiguration;
+}
+
+// @public (undocumented)
+export interface BaseCognitoServiceModification {
+    // (undocumented)
+    serviceName: 'Cognito';
+    // (undocumented)
+    userPoolModification: CognitoUserPoolModification;
+}
+
+// @public (undocumented)
+export interface BaseGeoServiceConfiguration {
+    // (undocumented)
+    accessType: AccessType;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    serviceName: string;
+    // (undocumented)
+    setAsDefault: boolean;
+}
+
+// @public (undocumented)
+export interface BaseGeoServiceModification {
+    // (undocumented)
+    accessType: AccessType;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    serviceName: string;
+    // (undocumented)
+    setAsDefault: boolean;
+}
+
+// @public (undocumented)
+export interface CognitoAdminQueries {
+    // (undocumented)
+    permissions: {
+        restrictAccess: boolean;
+        groupName?: string;
+    };
+}
+
+// @public (undocumented)
+export type CognitoAutoVerifiedAttributesConfiguration = Array<CognitoAutoVerifyEmailConfiguration | CognitoAutoVerifyPhoneNumberConfiguration>;
+
+// @public (undocumented)
+export interface CognitoAutoVerifyEmailConfiguration {
+    // (undocumented)
+    type: 'EMAIL';
+    // (undocumented)
+    verificationMessage?: string;
+    // (undocumented)
+    verificationSubject?: string;
+}
+
+// @public (undocumented)
+export interface CognitoAutoVerifyPhoneNumberConfiguration {
+    // (undocumented)
+    type: 'PHONE_NUMBER';
+    // (undocumented)
+    verificationMessage?: string;
+}
+
+// @public (undocumented)
+export interface CognitoIdentityPool {
+    // (undocumented)
+    identityPoolConfiguration?: CognitoIdentityPoolConfiguration;
+    // (undocumented)
+    includeIdentityPool: true;
+}
+
+// @public (undocumented)
+export interface CognitoIdentityPoolConfiguration {
+    // (undocumented)
+    identityPoolName?: string;
+    // (undocumented)
+    identitySocialFederation?: CognitoIdentitySocialFederation[];
+    // (undocumented)
+    unauthenticatedLogin?: boolean;
+}
+
+// @public (undocumented)
+export type CognitoIdentityPoolModification = Pick<CognitoIdentityPoolConfiguration, 'unauthenticatedLogin' | 'identitySocialFederation'>;
+
+// @public (undocumented)
+export interface CognitoIdentitySocialFederation {
+    // (undocumented)
+    clientId: string;
+    // (undocumented)
+    provider: 'FACEBOOK' | 'GOOGLE' | 'AMAZON' | 'APPLE';
+}
+
+// @public (undocumented)
+export type CognitoMFAConfiguration = CognitoMFAOff | CognitoMFASettings;
+
+// @public (undocumented)
+export interface CognitoMFAOff {
+    // (undocumented)
+    mode: 'OFF';
+}
+
+// @public (undocumented)
+export interface CognitoMFASettings {
+    // (undocumented)
+    mfaTypes: ('SMS' | 'TOTP')[];
+    // (undocumented)
+    mode: 'ON' | 'OPTIONAL';
+    // (undocumented)
+    smsMessage: string;
+}
+
+// @public (undocumented)
+export interface CognitoOAuthConfiguration {
+    // (undocumented)
+    domainPrefix?: string;
+    // (undocumented)
+    oAuthGrantType: 'CODE' | 'IMPLICIT';
+    // (undocumented)
+    oAuthScopes: ('PHONE' | 'EMAIL' | 'OPENID' | 'PROFILE' | 'AWS.COGNITO.SIGNIN.USER.ADMIN')[];
+    // (undocumented)
+    redirectSigninURIs: string[];
+    // (undocumented)
+    redirectSignoutURIs: string[];
+    // (undocumented)
+    socialProviderConfigurations?: CognitoSocialProviderConfiguration[];
+}
+
+// @public (undocumented)
+export enum CognitoPasswordConstraint {
+    // (undocumented)
+    REQUIRE_DIGIT = "REQUIRE_DIGIT",
+    // (undocumented)
+    REQUIRE_LOWERCASE = "REQUIRE_LOWERCASE",
+    // (undocumented)
+    REQUIRE_SYMBOL = "REQUIRE_SYMBOL",
+    // (undocumented)
+    REQUIRE_UPPERCASE = "REQUIRE_UPPERCASE"
+}
+
+// @public (undocumented)
+export interface CognitoPasswordPolicy {
+    // (undocumented)
+    additionalConstraints?: CognitoPasswordConstraint[];
+    // (undocumented)
+    minimumLength?: number;
+}
+
+// @public (undocumented)
+export type CognitoServiceConfiguration = BaseCognitoServiceConfiguration & (NoCognitoIdentityPool | CognitoIdentityPool);
+
+// @public (undocumented)
+export type CognitoServiceModification = BaseCognitoServiceModification & (NoCognitoIdentityPool | ModifyCognitoIdentityPool);
+
+// Warning: (ae-forgotten-export) The symbol "SocialProviderConfig" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "SignInWithAppleSocialProviderConfig" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export type CognitoSocialProviderConfiguration = SocialProviderConfig | SignInWithAppleSocialProviderConfig;
+
+// @public (undocumented)
+export enum CognitoUserAliasAttributes {
+    // (undocumented)
+    EMAIL = "EMAIL",
+    // (undocumented)
+    PHONE_NUMBER = "PHONE_NUMBER",
+    // (undocumented)
+    PREFERRED_USERNAME = "PREFERRED_USERNAME"
+}
+
+// @public (undocumented)
+export interface CognitoUserPoolConfiguration {
+    // (undocumented)
+    adminQueries?: CognitoAdminQueries;
+    // (undocumented)
+    aliasAttributes?: CognitoUserAliasAttributes[];
+    // (undocumented)
+    autoVerifiedAttributes?: CognitoAutoVerifiedAttributesConfiguration;
+    // (undocumented)
+    mfa?: CognitoMFAConfiguration;
+    // (undocumented)
+    oAuth?: CognitoOAuthConfiguration;
+    // (undocumented)
+    passwordPolicy?: CognitoPasswordPolicy;
+    // (undocumented)
+    readAttributes?: (CognitoUserProperty | CognitoUserPropertyVerified)[];
+    // (undocumented)
+    refreshTokenPeriod?: number;
+    // (undocumented)
+    requiredSignupAttributes: CognitoUserProperty[];
+    // (undocumented)
+    signinMethod: CognitoUserPoolSigninMethod;
+    // (undocumented)
+    userPoolGroups?: CognitoUserPoolGroup[];
+    // (undocumented)
+    userPoolName?: string;
+    // (undocumented)
+    writeAttributes?: CognitoUserProperty[];
+}
+
+// @public (undocumented)
+export interface CognitoUserPoolGroup {
+    // (undocumented)
+    customPolicy?: string;
+    // (undocumented)
+    groupName: string;
+}
+
+// @public (undocumented)
+export type CognitoUserPoolModification = Pick<CognitoUserPoolConfiguration, 'userPoolGroups' | 'adminQueries' | 'mfa' | 'passwordPolicy' | 'refreshTokenPeriod' | 'readAttributes' | 'writeAttributes' | 'autoVerifiedAttributes'> & {
+    oAuth?: Partial<CognitoOAuthConfiguration>;
+};
+
+// @public (undocumented)
+export enum CognitoUserPoolSigninMethod {
+    // (undocumented)
+    EMAIL = "EMAIL",
+    // (undocumented)
+    EMAIL_AND_PHONE_NUMBER = "EMAIL_AND_PHONE_NUMBER",
+    // (undocumented)
+    PHONE_NUMBER = "PHONE_NUMBER",
+    // (undocumented)
+    USERNAME = "USERNAME"
+}
+
+// @public (undocumented)
+export enum CognitoUserProperty {
+    // (undocumented)
+    ADDRESS = "ADDRESS",
+    // (undocumented)
+    BIRTHDATE = "BIRTHDATE",
+    // (undocumented)
+    EMAIL = "EMAIL",
+    // (undocumented)
+    FAMILY_NAME = "FAMILY_NAME",
+    // (undocumented)
+    GENDER = "GENDER",
+    // (undocumented)
+    GIVEN_NAME = "GIVEN_NAME",
+    // (undocumented)
+    LOCALE = "LOCALE",
+    // (undocumented)
+    MIDDLE_NAME = "MIDDLE_NAME",
+    // (undocumented)
+    NAME = "NAME",
+    // (undocumented)
+    NICKNAME = "NICKNAME",
+    // (undocumented)
+    PHONE_NUMBER = "PHONE_NUMBER",
+    // (undocumented)
+    PICTURE = "PICTURE",
+    // (undocumented)
+    PREFERRED_USERNAME = "PREFERRED_USERNAME",
+    // (undocumented)
+    PROFILE = "PROFILE",
+    // (undocumented)
+    UPDATED_AT = "UPDATED_AT",
+    // (undocumented)
+    WEBSITE = "WEBSITE",
+    // (undocumented)
+    ZONE_INFO = "ZONE_INFO"
+}
+
+// @public (undocumented)
+export enum CognitoUserPropertyVerified {
+    // (undocumented)
+    EMAIL_VERIFIED = "EMAIL_VERIFIED",
+    // (undocumented)
+    PHONE_NUMBER_VERIFIED = "PHONE_NUMBER_VERIFIED"
+}
+
+// @public (undocumented)
+export interface ConflictResolution {
+    // (undocumented)
+    defaultResolutionStrategy?: ResolutionStrategy;
+    // (undocumented)
+    perModelResolutionStrategy?: PerModelResolutionstrategy[];
+}
+
+// @public (undocumented)
+export enum CrudOperation {
+    // (undocumented)
+    CREATE_AND_UPDATE = "CREATE_AND_UPDATE",
+    // (undocumented)
+    DELETE = "DELETE",
+    // (undocumented)
+    READ = "READ"
+}
+
+// @public (undocumented)
+export interface ExistingLambdaConflictResolver {
+    // (undocumented)
+    arn?: string;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    region?: string;
+    // (undocumented)
+    type: 'EXISTING';
+}
+
+// @public (undocumented)
+export type GeoServiceConfiguration = BaseGeoServiceConfiguration & MapConfiguration;
+
+// @public (undocumented)
+export type GeoServiceModification = BaseGeoServiceModification & MapModification;
+
+// @public (undocumented)
+export interface ImportAuthRequest {
+    // (undocumented)
+    identityPoolId?: string;
+    // (undocumented)
+    nativeClientId: string;
+    // (undocumented)
+    userPoolId: string;
+    // (undocumented)
+    version: 1;
+    // (undocumented)
+    webClientId: string;
+}
+
+// @public (undocumented)
+export interface ImportS3ServiceConfiguration extends S3ServiceConfigurationBase {
+    // (undocumented)
+    bucketName: string;
+}
+
+// @public (undocumented)
+export interface ImportStorageRequest {
+    // (undocumented)
+    serviceConfiguration: ImportS3ServiceConfiguration;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export type LambdaConflictResolver = NewLambdaConflictResolver | ExistingLambdaConflictResolver;
+
+// @public (undocumented)
+export interface LambdaResolutionStrategy {
+    // (undocumented)
+    resolver: LambdaConflictResolver;
+    // (undocumented)
+    type: 'LAMBDA';
+}
+
+// @public (undocumented)
+export interface LambdaTriggerConfig {
+    // (undocumented)
+    mode: 'new' | 'existing';
+    // (undocumented)
+    name: string;
+}
+
+// @public (undocumented)
+export interface MapConfiguration {
+    // (undocumented)
+    mapStyle: MapStyle;
+    // (undocumented)
+    serviceName: "Map";
+}
+
+// @public (undocumented)
+export interface MapModification {
+    // (undocumented)
+    serviceName: "Map";
+}
+
+// @public (undocumented)
+export enum MapStyle {
+    // (undocumented)
+    HybridHereExploreSatellite = "HybridHereExploreSatellite",
+    // (undocumented)
+    RasterEsriImagery = "RasterEsriImagery",
+    // (undocumented)
+    RasterHereExploreSatellite = "RasterHereExploreSatellite",
+    // (undocumented)
+    VectorEsriDarkGrayCanvas = "VectorEsriDarkGrayCanvas",
+    // (undocumented)
+    VectorEsriLightGrayCanvas = "VectorEsriLightGrayCanvas",
+    // (undocumented)
+    VectorEsriNavigation = "VectorEsriNavigation",
+    // (undocumented)
+    VectorEsriStreets = "VectorEsriStreets",
+    // (undocumented)
+    VectorEsriTopographic = "VectorEsriTopographic",
+    // (undocumented)
+    VectorHereBerlin = "VectorHereBerlin",
+    // (undocumented)
+    VectorHereExplore = "VectorHereExplore",
+    // (undocumented)
+    VectorHereExploreTruck = "VectorHereExploreTruck"
+}
+
+// @public (undocumented)
+export interface ModifyCognitoIdentityPool {
+    // (undocumented)
+    identityPoolModification: CognitoIdentityPoolModification;
+    // (undocumented)
+    includeIdentityPool: true;
+}
+
+// @public (undocumented)
+export interface NewLambdaConflictResolver {
+    // (undocumented)
+    type: 'NEW';
+}
+
+// @public (undocumented)
+export interface NoCognitoIdentityPool {
+    // (undocumented)
+    includeIdentityPool: false;
+}
+
+// @public (undocumented)
+export interface PermissionGroups {
+    // (undocumented)
+    [k: string]: CrudOperation[];
+}
+
+// @public (undocumented)
+export interface PerModelResolutionstrategy {
+    // (undocumented)
+    entityName: string;
+    // (undocumented)
+    resolutionStrategy: ResolutionStrategy;
+}
+
+// @public (undocumented)
+export interface PredefinedResolutionStrategy {
+    // (undocumented)
+    type: 'OPTIMISTIC_CONCURRENCY' | 'AUTOMERGE' | 'NONE';
+}
+
+// @public (undocumented)
+export interface RemoveS3ServiceConfiguration extends S3ServiceConfigurationBase {
+    // (undocumented)
+    deleteBucketAndContents?: boolean;
+    // (undocumented)
+    resourceName: string;
+}
+
+// @public (undocumented)
+export interface RemoveStorageRequest {
+    // (undocumented)
+    serviceConfiguration: RemoveS3ServiceConfiguration;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export type ResolutionStrategy = PredefinedResolutionStrategy | LambdaResolutionStrategy;
+
+// @public (undocumented)
+export interface S3Permissions {
+    // (undocumented)
+    auth: CrudOperation[];
+    // (undocumented)
+    groups?: PermissionGroups;
+    // (undocumented)
+    guest?: CrudOperation[];
+}
+
+// @public (undocumented)
+export interface S3ServiceConfigurationBase {
+    // (undocumented)
+    serviceName: 'S3';
+}
+
+// @public (undocumented)
+export interface UpdateApiRequest {
+    // (undocumented)
+    serviceModification: AppSyncServiceModification;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export interface UpdateAuthRequest {
+    // (undocumented)
+    serviceModification: CognitoServiceModification;
+    // (undocumented)
+    version: 2;
+}
+
+// @public (undocumented)
+export interface UpdateGeoRequest {
+    // (undocumented)
+    serviceModification: GeoServiceModification;
+    // (undocumented)
+    version: 1;
+}
+
+// @public (undocumented)
+export interface UpdateS3ServiceModification extends S3ServiceConfigurationBase {
+    // (undocumented)
+    lambdaTrigger?: LambdaTriggerConfig;
+    // (undocumented)
+    permissions: S3Permissions;
+    // (undocumented)
+    resourceName: string;
+}
+
+// @public (undocumented)
+export interface UpdateStorageRequest {
+    // (undocumented)
+    serviceModification: UpdateS3ServiceModification;
+    // (undocumented)
+    version: 1;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-headless-interface/package.json b/packages/amplify-headless-interface/package.json
index 15ea2239189..76b5705872d 100644
--- a/packages/amplify-headless-interface/package.json
+++ b/packages/amplify-headless-interface/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "generateSchemas": "ts-node ./scripts/generateSchemas.ts"
+    "generateSchemas": "ts-node ./scripts/generateSchemas.ts",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-java-function-runtime-provider/API.md b/packages/amplify-java-function-runtime-provider/API.md
new file mode 100644
index 00000000000..7f38284fde9
--- /dev/null
+++ b/packages/amplify-java-function-runtime-provider/API.md
@@ -0,0 +1,18 @@
+## API Report File for "amplify-java-function-runtime-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionRuntimeContributorFactory } from 'amplify-function-plugin-interface';
+import { GetPackageAssetPaths } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactory;
+
+// @public (undocumented)
+export const getPackageAssetPaths: GetPackageAssetPaths;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-java-function-runtime-provider/package.json b/packages/amplify-java-function-runtime-provider/package.json
index bdb844ebb2e..141aca873ec 100644
--- a/packages/amplify-java-function-runtime-provider/package.json
+++ b/packages/amplify-java-function-runtime-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-java-function-template-provider/API.md b/packages/amplify-java-function-template-provider/API.md
new file mode 100644
index 00000000000..0c0b5ffdcb7
--- /dev/null
+++ b/packages/amplify-java-function-template-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-java-function-template-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionTemplateContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionTemplateContributorFactory: FunctionTemplateContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-java-function-template-provider/package.json b/packages/amplify-java-function-template-provider/package.json
index d4402608e29..b0eeae6b8ec 100644
--- a/packages/amplify-java-function-template-provider/package.json
+++ b/packages/amplify-java-function-template-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.5"
diff --git a/packages/amplify-nodejs-function-runtime-provider/API.md b/packages/amplify-nodejs-function-runtime-provider/API.md
new file mode 100644
index 00000000000..ea26c54299e
--- /dev/null
+++ b/packages/amplify-nodejs-function-runtime-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-nodejs-function-runtime-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionRuntimeContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-nodejs-function-runtime-provider/package.json b/packages/amplify-nodejs-function-runtime-provider/package.json
index 41bb48033de..cada4be16f9 100644
--- a/packages/amplify-nodejs-function-runtime-provider/package.json
+++ b/packages/amplify-nodejs-function-runtime-provider/package.json
@@ -20,7 +20,8 @@
     "watch": "tsc -w",
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "test": "jest --logHeapUsage"
+    "test": "jest --logHeapUsage",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-nodejs-function-template-provider/API.md b/packages/amplify-nodejs-function-template-provider/API.md
new file mode 100644
index 00000000000..c30f4c0ec4d
--- /dev/null
+++ b/packages/amplify-nodejs-function-template-provider/API.md
@@ -0,0 +1,14 @@
+## API Report File for "amplify-nodejs-function-template-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionTemplateContributorFactory } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionTemplateContributorFactory: FunctionTemplateContributorFactory;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-nodejs-function-template-provider/package.json b/packages/amplify-nodejs-function-template-provider/package.json
index 9c3c7353866..c493e0f3791 100644
--- a/packages/amplify-nodejs-function-template-provider/package.json
+++ b/packages/amplify-nodejs-function-template-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-opensearch-simulator/API.md b/packages/amplify-opensearch-simulator/API.md
new file mode 100644
index 00000000000..f5f3bbe729b
--- /dev/null
+++ b/packages/amplify-opensearch-simulator/API.md
@@ -0,0 +1,79 @@
+## API Report File for "@aws-amplify/amplify-opensearch-simulator"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+/// <reference types="node" />
+
+import { $TSAny } from 'amplify-cli-core';
+import execa from 'execa';
+import { GetPackageAssetPaths } from 'amplify-cli-core';
+
+// Warning: (ae-forgotten-export) The symbol "OpenSearchEmulatorOptions" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const buildArgs: (options: OpenSearchEmulatorOptions, pathToOpenSearchData: string) => string[];
+
+// @public (undocumented)
+export const ensureOpenSearchLocalExists: (pathToOpenSearchData: string) => Promise<void>;
+
+// @public (undocumented)
+export const exitingEmulatorPromise: (proc: execa.ExecaChildProcess<string>, prematureExit: $TSAny) => Promise<unknown>;
+
+// @public (undocumented)
+export const getOpensearchLocalDirectory: () => string;
+
+// @public (undocumented)
+export const getPackageAssetPaths: GetPackageAssetPaths;
+
+// @public (undocumented)
+export const getPathToOpenSearchBinary: (pathToOpenSearchLocal?: string | undefined) => Promise<string>;
+
+// @public (undocumented)
+export const launch: (pathToOpenSearchData: string, givenOptions?: OpenSearchEmulatorOptions, retry?: number, startTime?: number) => Promise<OpenSearchEmulator>;
+
+// @public (undocumented)
+export class OpenSearchEmulator {
+    constructor(proc: execa.ExecaChildProcess<string>, opts: OpenSearchEmulatorOptions);
+    // (undocumented)
+    opts: OpenSearchEmulatorOptions;
+    // (undocumented)
+    get pid(): number | undefined;
+    // (undocumented)
+    get port(): number | undefined;
+    // (undocumented)
+    proc: execa.ExecaChildProcess<string>;
+    // (undocumented)
+    terminate(): Promise<void>;
+    // (undocumented)
+    get url(): string;
+}
+
+// @public (undocumented)
+export const openSearchLocalExists: (pathToOpenSearchLocal: string) => Promise<boolean>;
+
+// @public (undocumented)
+export const packageName = "@aws-amplify/amplify-opensearch-simulator";
+
+// @public (undocumented)
+export const relativePathToOpensearchLocal: string;
+
+// @public (undocumented)
+export const startingEmulatorPromise: (opts: Required<OpenSearchEmulatorOptions>, proc: execa.ExecaChildProcess<string>, port: number) => Promise<unknown>;
+
+// @public (undocumented)
+export const startOpensearchEmulator: (opts: Required<OpenSearchEmulatorOptions>, proc: execa.ExecaChildProcess<string>, port: number, startTime: number, givenOptions: OpenSearchEmulatorOptions, pathToOpenSearchData: string, retry: number) => Promise<OpenSearchEmulator | undefined>;
+
+// @public (undocumented)
+export const supportedOpenSearchVersion = "1.3.0";
+
+// @public (undocumented)
+export const unzipOpensearchBuildFile: (opensearchSimulatorGunZippedTarball: Buffer, pathToOpenSearchLib: string) => Promise<void>;
+
+// @public (undocumented)
+export const writeOpensearchEmulatorArtifacts: (pathToOpenSearchLocal: string, opensearchSimulatorGunZippedTarball: $TSAny, latestSig: $TSAny, latestPublicKey: $TSAny) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-opensearch-simulator/package.json b/packages/amplify-opensearch-simulator/package.json
index 60fe8b3f4b9..cf6bc77e666 100644
--- a/packages/amplify-opensearch-simulator/package.json
+++ b/packages/amplify-opensearch-simulator/package.json
@@ -21,7 +21,8 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "test": "jest"
+    "test": "jest",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-prompts/API.md b/packages/amplify-prompts/API.md
new file mode 100644
index 00000000000..2dbdf54014e
--- /dev/null
+++ b/packages/amplify-prompts/API.md
@@ -0,0 +1,244 @@
+## API Report File for "amplify-prompts"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+/// <reference types="node" />
+
+import { IFlowData } from 'amplify-cli-shared-interfaces';
+
+// @public (undocumented)
+export const alphanumeric: (message?: string) => Validator;
+
+// @public (undocumented)
+export class AmplifyPrinter implements Printer {
+    constructor(outputStream?: NodeJS.WritableStream);
+    // (undocumented)
+    blankLine: () => void;
+    // (undocumented)
+    debug: (line: string) => void;
+    // (undocumented)
+    error: (line: string) => void;
+    // Warning: (ae-forgotten-export) The symbol "Color" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    info: (line: string, color?: Color) => void;
+    // (undocumented)
+    success: (line: string) => void;
+    // (undocumented)
+    warn: (line: string) => void;
+}
+
+// @public (undocumented)
+export class AmplifySpinner {
+    constructor();
+    // (undocumented)
+    resetMessage(text: string | null): void;
+    // (undocumented)
+    start(text: string | null): void;
+    // (undocumented)
+    stop(text?: string | null, success?: boolean): void;
+}
+
+// @public (undocumented)
+export const and: (validators: [Validator, Validator, ...Validator[]], message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export type BarOptions = {
+    progressBarFormatter: (payload: ProgressPayload, value: number, total: number) => string;
+    itemFormatter: (payload: ItemPayload) => {
+        renderString: string;
+        color: string;
+    };
+    loneWolf: boolean;
+    hideCursor: boolean;
+    barCompleteChar: string;
+    barIncompleteChar: string;
+    barSize: number;
+    itemCompleteStatus: string[];
+    itemFailedStatus: string[];
+    prefixText: string;
+    successText: string;
+    failureText: string;
+};
+
+// Warning: (ae-forgotten-export) The symbol "EqualsFunction" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "SingleFilterFunction" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const byValue: <T>(selection: T, equals?: EqualsFunction<T>) => SingleFilterFunction<T>;
+
+// Warning: (ae-forgotten-export) The symbol "MultiFilterFunction" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const byValues: <T>(selection: T[], equals?: EqualsFunction<T>) => MultiFilterFunction<T>;
+
+// @public (undocumented)
+export const exact: (expected: string, message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export type Formatter = {
+    list: (items: string[]) => void;
+};
+
+// @public (undocumented)
+export const formatter: Formatter;
+
+// @public (undocumented)
+export const integer: (message?: string) => Validator;
+
+// @public (undocumented)
+export const isDebug: boolean;
+
+// @public (undocumented)
+export const isHeadless: boolean;
+
+// @public (undocumented)
+export const isInteractiveShell: boolean;
+
+// @public (undocumented)
+export const isSilent: boolean;
+
+// @public (undocumented)
+export const isYes: boolean;
+
+// @public (undocumented)
+export type ItemPayload = {
+    LogicalResourceId: string;
+    ResourceType: string;
+    ResourceStatus: string;
+    Timestamp: string;
+};
+
+// @public (undocumented)
+export const matchRegex: (validatorRegex: RegExp, message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export const maxLength: (maxLen: number, message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export const minLength: (minLen: number, message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export class MultiProgressBar {
+    constructor(options: BarOptions);
+    // (undocumented)
+    create(bars: {
+        name: string;
+        value: number;
+        total: number;
+        payload: ProgressPayload;
+    }[]): void;
+    // (undocumented)
+    finishAllBars(): void;
+    // (undocumented)
+    finishBar(name: string): void;
+    // (undocumented)
+    getBar(name: string): {
+        name: string;
+        bar: ProgressBar_2;
+    } | undefined;
+    // (undocumented)
+    getBarCount(): number;
+    // (undocumented)
+    incrementBar(name: string, value: number): void;
+    // (undocumented)
+    isActive: boolean;
+    // (undocumented)
+    isTTY(): boolean;
+    // (undocumented)
+    render(): void;
+    // (undocumented)
+    stop(): void;
+    // (undocumented)
+    updateBar(name: string, updateObj: {
+        name: string;
+        payload: ItemPayload;
+    }): void;
+    // (undocumented)
+    updatePrefixText(newPrefixText: string): void;
+    // Warning: (ae-forgotten-export) The symbol "TerminalLine" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    writeLines(terminalLine: TerminalLine): void;
+}
+
+// @public (undocumented)
+export const not: (validator: Validator, message: string) => Validator;
+
+// @public (undocumented)
+export const or: (validators: [Validator, Validator, ...Validator[]], message?: string | undefined) => Validator;
+
+// @public (undocumented)
+export type Printer = {
+    debug: (line: string) => void;
+    info: (line: string, color?: Color) => void;
+    blankLine: () => void;
+    success: (line: string) => void;
+    warn: (line: string) => void;
+    error: (line: string) => void;
+};
+
+// @public (undocumented)
+export const printer: Printer;
+
+// @public (undocumented)
+class ProgressBar_2 {
+    constructor(options: BarOptions);
+    // (undocumented)
+    addItem(name: string, itemPayload: ItemPayload): void;
+    // (undocumented)
+    barCompleteString: string;
+    // (undocumented)
+    barIncompleteString: string;
+    // (undocumented)
+    barSize: number;
+    // (undocumented)
+    createBarString(): string;
+    // (undocumented)
+    finish(): void;
+    // Warning: (ae-forgotten-export) The symbol "Item" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    getItem(name: string): Item | undefined;
+    // (undocumented)
+    getRenderStrings(): TerminalLine[];
+    // (undocumented)
+    getValue(): number;
+    // (undocumented)
+    hasItem(name: string): boolean;
+    // (undocumented)
+    increment(value?: number): void;
+    // (undocumented)
+    isFailed(): boolean;
+    // (undocumented)
+    isFinished(): boolean;
+    // (undocumented)
+    render(): void;
+    // (undocumented)
+    start(total: number, startValue: number, payload: ProgressPayload): void;
+    // (undocumented)
+    stop(): void;
+    // (undocumented)
+    updateItem(name: string, newPayload: ItemPayload): void;
+}
+export { ProgressBar_2 as ProgressBar }
+
+// @public (undocumented)
+export type ProgressPayload = {
+    progressName: string;
+    envName: string;
+};
+
+// Warning: (ae-forgotten-export) The symbol "Prompter" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export const prompter: Prompter;
+
+// @public (undocumented)
+export type Validator = (value: string) => true | string | Promise<true | string>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-prompts/package.json b/packages/amplify-prompts/package.json
index 1b0fa8e6af8..5f4a50d3a91 100644
--- a/packages/amplify-prompts/package.json
+++ b/packages/amplify-prompts/package.json
@@ -8,7 +8,8 @@
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "demo": "yarn build && node lib/demo/demo.js",
     "test": "jest --logHeapUsage --color",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "repository": {
     "type": "git",
diff --git a/packages/amplify-provider-awscloudformation/API.md b/packages/amplify-provider-awscloudformation/API.md
new file mode 100644
index 00000000000..0be81ee760d
--- /dev/null
+++ b/packages/amplify-provider-awscloudformation/API.md
@@ -0,0 +1,52 @@
+## API Report File for "amplify-provider-awscloudformation"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSAny } from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
+import { $TSObject } from 'amplify-cli-core';
+import * as AWS_2 from 'aws-sdk';
+import { IAmplifyResource } from 'amplify-cli-core';
+import { Template } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const cfnRootStackFileName = "root-cloudformation-stack.json";
+
+// Warning: (ae-forgotten-export) The symbol "LocationService" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function getConfiguredLocationServiceClient(context: $TSContext, options?: {}): Promise<LocationService>;
+
+// Warning: (ae-forgotten-export) The symbol "SSM" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function getConfiguredSSMClient(context: any): Promise<SSM>;
+
+// @public (undocumented)
+export const getLocationRegionMapping: () => $TSObject;
+
+// @public (undocumented)
+export const getLocationSupportedRegion: (region: string) => string;
+
+// Warning: (ae-forgotten-export) The symbol "AwsSdkConfig" needs to be exported by the entry point index.d.ts
+//
+// @public (undocumented)
+export function loadConfigurationForEnv(context: $TSContext, env: string, appId?: string): Promise<AwsSdkConfig>;
+
+// @public (undocumented)
+export const resolveAppId: (context: $TSContext) => string;
+
+// @public (undocumented)
+export const rootStackFileName = "root-cloudformation-stack.json";
+
+// @public (undocumented)
+export const storeRootStackTemplate: (context: $TSContext, template?: Template) => Promise<void>;
+
+// @public (undocumented)
+export const transformResourceWithOverrides: (context: $TSContext, resource?: IAmplifyResource) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
index ee6a0e3443e..633f90a376a 100644
--- a/packages/amplify-provider-awscloudformation/package.json
+++ b/packages/amplify-provider-awscloudformation/package.json
@@ -21,7 +21,8 @@
     "test": "yarn jest",
     "test-ci": "yarn jest --ci",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "watch": "tsc --watch"
+    "watch": "tsc --watch",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-category-custom": "2.5.5",
diff --git a/packages/amplify-python-function-runtime-provider/API.md b/packages/amplify-python-function-runtime-provider/API.md
new file mode 100644
index 00000000000..632c72a1498
--- /dev/null
+++ b/packages/amplify-python-function-runtime-provider/API.md
@@ -0,0 +1,18 @@
+## API Report File for "amplify-python-function-runtime-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionRuntimeContributorFactory } from 'amplify-function-plugin-interface';
+import { GetPackageAssetPaths } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const functionRuntimeContributorFactory: FunctionRuntimeContributorFactory;
+
+// @public (undocumented)
+export const getPackageAssetPaths: GetPackageAssetPaths;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-python-function-runtime-provider/package.json b/packages/amplify-python-function-runtime-provider/package.json
index d03ca1752ce..8618402dd3d 100644
--- a/packages/amplify-python-function-runtime-provider/package.json
+++ b/packages/amplify-python-function-runtime-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-cli-core": "3.4.0",
diff --git a/packages/amplify-python-function-template-provider/API.md b/packages/amplify-python-function-template-provider/API.md
new file mode 100644
index 00000000000..e2810af6cc3
--- /dev/null
+++ b/packages/amplify-python-function-template-provider/API.md
@@ -0,0 +1,18 @@
+## API Report File for "amplify-python-function-template-provider"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { FunctionTemplateContributorFactory } from 'amplify-function-plugin-interface';
+import { FunctionTemplateParameters } from 'amplify-function-plugin-interface';
+
+// @public (undocumented)
+export const functionTemplateContributorFactory: FunctionTemplateContributorFactory;
+
+// @public (undocumented)
+export function helloWorld(): Promise<FunctionTemplateParameters>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-python-function-template-provider/package.json b/packages/amplify-python-function-template-provider/package.json
index 20a632461ac..2978d9bbe15 100644
--- a/packages/amplify-python-function-template-provider/package.json
+++ b/packages/amplify-python-function-template-provider/package.json
@@ -18,7 +18,8 @@
   ],
   "scripts": {
     "build": "tsc",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "amplify-function-plugin-interface": "1.9.5"
diff --git a/packages/amplify-storage-simulator/API.md b/packages/amplify-storage-simulator/API.md
new file mode 100644
index 00000000000..88f49affd79
--- /dev/null
+++ b/packages/amplify-storage-simulator/API.md
@@ -0,0 +1,43 @@
+## API Report File for "amplify-storage-simulator"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+
+// @public (undocumented)
+export class AmplifyStorageSimulator {
+    constructor(serverConfig: StorageSimulatorServerConfig);
+    // Warning: (ae-forgotten-export) The symbol "StorageServer" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    get getServer(): StorageServer;
+    // (undocumented)
+    start(): Promise<void>;
+    // (undocumented)
+    stop(): void;
+    // (undocumented)
+    get url(): string;
+}
+
+// @public (undocumented)
+export interface StorageSimulatorDataSourceBaseConfig {
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public (undocumented)
+export type StorageSimulatorServerConfig = {
+    port: number;
+    route: string;
+    localDirS3: string;
+};
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-storage-simulator/package.json b/packages/amplify-storage-simulator/package.json
index 661afb6ede1..51f1143c8d9 100644
--- a/packages/amplify-storage-simulator/package.json
+++ b/packages/amplify-storage-simulator/package.json
@@ -19,7 +19,8 @@
   "scripts": {
     "test": "jest --logHeapUsage",
     "build": "tsc",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "body-parser": "^1.19.2",
diff --git a/packages/amplify-util-headless-input/API.md b/packages/amplify-util-headless-input/API.md
new file mode 100644
index 00000000000..7070c5f5ca6
--- /dev/null
+++ b/packages/amplify-util-headless-input/API.md
@@ -0,0 +1,54 @@
+## API Report File for "amplify-util-headless-input"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { AddApiRequest } from 'amplify-headless-interface';
+import { AddAuthRequest } from 'amplify-headless-interface';
+import { AddGeoRequest } from 'amplify-headless-interface';
+import { AddStorageRequest } from 'amplify-headless-interface';
+import { ImportAuthRequest } from 'amplify-headless-interface';
+import { ImportStorageRequest } from 'amplify-headless-interface';
+import { RemoveStorageRequest } from 'amplify-headless-interface';
+import { UpdateApiRequest } from 'amplify-headless-interface';
+import { UpdateAuthRequest } from 'amplify-headless-interface';
+import { UpdateGeoRequest } from 'amplify-headless-interface';
+import { UpdateStorageRequest } from 'amplify-headless-interface';
+
+// @public (undocumented)
+export const validateAddApiRequest: (raw: string) => Promise<AddApiRequest>;
+
+// @public (undocumented)
+export const validateAddAuthRequest: (raw: string) => Promise<AddAuthRequest>;
+
+// @public (undocumented)
+export const validateAddGeoRequest: (raw: string) => Promise<AddGeoRequest>;
+
+// @public (undocumented)
+export const validateAddStorageRequest: (raw: string) => Promise<AddStorageRequest>;
+
+// @public (undocumented)
+export const validateImportAuthRequest: (raw: string) => Promise<ImportAuthRequest>;
+
+// @public (undocumented)
+export const validateImportStorageRequest: (raw: string) => Promise<ImportStorageRequest>;
+
+// @public (undocumented)
+export const validateRemoveStorageRequest: (raw: string) => Promise<RemoveStorageRequest>;
+
+// @public (undocumented)
+export const validateUpdateApiRequest: (raw: string) => Promise<UpdateApiRequest>;
+
+// @public (undocumented)
+export const validateUpdateAuthRequest: (raw: string) => Promise<UpdateAuthRequest>;
+
+// @public (undocumented)
+export const validateUpdateGeoRequest: (raw: string) => Promise<UpdateGeoRequest>;
+
+// @public (undocumented)
+export const validateUpdateStorageRequest: (raw: string) => Promise<UpdateStorageRequest>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-util-headless-input/package.json b/packages/amplify-util-headless-input/package.json
index be39ec4f939..e567c60ddc5 100644
--- a/packages/amplify-util-headless-input/package.json
+++ b/packages/amplify-util-headless-input/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
-    "test": "jest --logHeapUsage"
+    "test": "jest --logHeapUsage",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "amplify",
diff --git a/packages/amplify-util-import/API.md b/packages/amplify-util-import/API.md
new file mode 100644
index 00000000000..409f5ddacd5
--- /dev/null
+++ b/packages/amplify-util-import/API.md
@@ -0,0 +1,69 @@
+## API Report File for "amplify-util-import"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { Buckets } from 'aws-sdk/clients/s3';
+import { GetUserPoolMfaConfigResponse } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { IdentityPool } from 'aws-sdk/clients/cognitoidentity';
+import { IdentityPoolShortDescription } from 'aws-sdk/clients/cognitoidentity';
+import { IdentityProviderType } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { TableDescription } from 'aws-sdk/clients/dynamodb';
+import { TableName } from 'aws-sdk/clients/dynamodb';
+import { UserPoolClientType } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { UserPoolDescriptionType } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+import { UserPoolType } from 'aws-sdk/clients/cognitoidentityserviceprovider';
+
+// @public (undocumented)
+export interface ICognitoUserPoolService {
+    // (undocumented)
+    getUserPoolDetails(userPoolId: string): Promise<UserPoolType>;
+    // (undocumented)
+    getUserPoolMfaConfig(userPoolId: string): Promise<GetUserPoolMfaConfigResponse>;
+    // (undocumented)
+    listUserPoolClients(userPoolId: string): Promise<UserPoolClientType[]>;
+    // (undocumented)
+    listUserPoolIdentityProviders(userPoolId: string): Promise<IdentityProviderType[]>;
+    // (undocumented)
+    listUserPools(): Promise<UserPoolDescriptionType[]>;
+}
+
+// @public (undocumented)
+export interface IDynamoDBService {
+    // (undocumented)
+    getTableDetails(tableName: string): Promise<TableDescription>;
+    // (undocumented)
+    listTables(): Promise<TableName[]>;
+    // (undocumented)
+    tableExists(tableName: string): Promise<boolean>;
+}
+
+// @public (undocumented)
+export interface IIdentityPoolService {
+    // (undocumented)
+    getIdentityPoolRoles(identityPoolId: string): Promise<{
+        authRoleArn: string;
+        authRoleName: string;
+        unauthRoleArn: string;
+        unauthRoleName: string;
+    }>;
+    // (undocumented)
+    listIdentityPoolDetails(): Promise<IdentityPool[]>;
+    // (undocumented)
+    listIdentityPools(): Promise<IdentityPoolShortDescription[]>;
+}
+
+// @public (undocumented)
+export interface IS3Service {
+    // (undocumented)
+    bucketExists(bucketName: string): Promise<boolean>;
+    // (undocumented)
+    getBucketLocation(bucketName: string): Promise<string>;
+    // (undocumented)
+    listBuckets(): Promise<Buckets>;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-util-import/package.json b/packages/amplify-util-import/package.json
index 333e2edf374..c2b1203775e 100644
--- a/packages/amplify-util-import/package.json
+++ b/packages/amplify-util-import/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
-    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules"
+    "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "keywords": [
     "aws",
diff --git a/packages/amplify-util-mock/API.md b/packages/amplify-util-mock/API.md
new file mode 100644
index 00000000000..4913cf1ee8b
--- /dev/null
+++ b/packages/amplify-util-mock/API.md
@@ -0,0 +1,15 @@
+## API Report File for "amplify-util-mock"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+// @public (undocumented)
+export function executeAmplifyCommand(context: any): Promise<void>;
+
+// @public (undocumented)
+export function handleAmplifyEvent(context: any, args: any): Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
index 4f70ea0b5cd..71fe0c59db2 100644
--- a/packages/amplify-util-mock/package.json
+++ b/packages/amplify-util-mock/package.json
@@ -25,7 +25,8 @@
     "watch": "tsc -w",
     "clean": "rimraf lib tsconfig.tsbuildinfo node_modules",
     "velocity": "jest ./src/__tests__/velocity/*.test.ts",
-    "jest": "jest"
+    "jest": "jest",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
     "@aws-amplify/amplify-appsync-simulator": "2.8.0",
diff --git a/packages/amplify-util-uibuilder/API.md b/packages/amplify-util-uibuilder/API.md
new file mode 100644
index 00000000000..b94751c42ba
--- /dev/null
+++ b/packages/amplify-util-uibuilder/API.md
@@ -0,0 +1,19 @@
+## API Report File for "@aws-amplify/amplify-util-uibuilder"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { $TSContext } from 'amplify-cli-core';
+
+// @public (undocumented)
+export const executeAmplifyCommand: (context: $TSContext, cmd: string) => Promise<void>;
+
+// @public (undocumented)
+export const handleAmplifyEvent: (context: $TSContext, { event }: {
+    event: string;
+}) => Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
index dfc18dbb46e..e4f7c7aa559 100644
--- a/packages/amplify-util-uibuilder/package.json
+++ b/packages/amplify-util-uibuilder/package.json
@@ -5,7 +5,8 @@
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
-    "test": "jest --logHeapUsage"
+    "test": "jest --logHeapUsage",
+    "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
diff --git a/scripts/api-extractor.json b/scripts/api-extractor.json
new file mode 100644
index 00000000000..1558fe03f04
--- /dev/null
+++ b/scripts/api-extractor.json
@@ -0,0 +1,44 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "bundledPackages": [],
+  "newlineKind": "lf",
+
+  "apiReport": {
+    "enabled": true,
+    "reportFileName": "API.md",
+    "reportFolder": "<projectFolder>/"
+  },
+
+  "docModel": {
+    "enabled": false
+  },
+
+  "dtsRollup": {
+    "enabled": false
+  },
+
+  "tsdocMetadata": {
+    "enabled": false
+  },
+
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "none"
+      }
+    },
+
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "none"
+      }
+    },
+
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "none"
+      }
+    }
+  }
+}
diff --git a/scripts/extract-api.ts b/scripts/extract-api.ts
new file mode 100644
index 00000000000..51b3e811f7a
--- /dev/null
+++ b/scripts/extract-api.ts
@@ -0,0 +1,39 @@
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import {
+  Extractor,
+  ExtractorConfig
+} from '@microsoft/api-extractor';
+
+const configTemplatePath = path.join(__dirname, 'api-extractor.json');
+
+const extractApi = (packagePath: string): void => {
+  const hasTypeScript = fs.pathExistsSync(path.join(packagePath, 'tsconfig.json'));
+  const hasEntryPoint = fs.pathExistsSync(path.join(packagePath, 'lib', 'index.js'));
+  if (!hasTypeScript || !hasEntryPoint) {
+    console.log('Skipping ' + packagePath);
+    return;
+  } else {
+    console.log('Extracting ' + packagePath)
+  }
+
+  const pkgConfigPath = path.join(packagePath, 'api-extractor.json');
+  fs.copySync(configTemplatePath, pkgConfigPath);
+  try {
+    const extractorConfig = ExtractorConfig.loadFileAndPrepare(pkgConfigPath);
+    Extractor.invoke(
+      extractorConfig,
+      {
+        localBuild: true,
+        showVerboseMessages: false
+      });
+  } finally {
+    const tmpPath = path.join(packagePath, 'temp');
+    if (fs.pathExistsSync(tmpPath)) {
+      fs.removeSync(tmpPath);
+    }
+    fs.removeSync(pkgConfigPath);
+  }
+}
+
+extractApi(process.cwd());
diff --git a/scripts/package.json b/scripts/package.json
index 2eb694e041d..639ebbaa0f3 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -17,6 +17,7 @@
     "fs-extra": "^10.0.0",
     "glob": "^7.2.0",
     "js-yaml": "^4.1.0",
+    "@microsoft/api-extractor": "^7.33.5",
     "ts-node": "^10.4.0",
     "typescript": "^4.4.4"
   }
diff --git a/scripts/verify_extract_api.sh b/scripts/verify_extract_api.sh
new file mode 100755
index 00000000000..bd872255024
--- /dev/null
+++ b/scripts/verify_extract_api.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+changed_api_extracts=$(git status | grep API.md | wc -l)
+
+if [[ changed_api_extracts -gt 0 ]]; then
+  echo "Detected api change. Please run 'yarn extract-api' and add API.md file changes to the change set."
+  exit 1;
+fi
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 4d25715a330..0ab1deccbb9 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -14,6 +14,80 @@
   dependencies:
     "@cspotcode/source-map-consumer" "0.8.0"
 
+"@microsoft/api-extractor-model@7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.25.2.tgz#a3e69e952122bbe3f0fc339a8ce0d9d20dd06406"
+  integrity sha512-+h1uCrLQXFAKMUdghhdDcnniDB+6UA/lS9ArlB4QZQ34UbLuXNy2oQ6fafFK8cKXU4mUPTF/yGRjv7JKD5L7eg==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.53.2"
+
+"@microsoft/api-extractor@^7.33.5":
+  version "7.33.5"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.33.5.tgz#6f6791aa0b30fe1581002912ebd4565ef8313323"
+  integrity sha512-ENoWpTWarKNuodpRFDQr3jyBigHuv98KuJ8H5qXc1LZ1aP5Mk77lCo88HbPisTmSnGevJJHTScfd/DPznOb4CQ==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.25.2"
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.53.2"
+    "@rushstack/rig-package" "0.3.17"
+    "@rushstack/ts-command-line" "4.13.0"
+    colors "~1.2.1"
+    lodash "~4.17.15"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    source-map "~0.6.1"
+    typescript "~4.8.4"
+
+"@microsoft/tsdoc-config@~0.16.1":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf"
+  integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    ajv "~6.12.6"
+    jju "~1.4.0"
+    resolve "~1.19.0"
+
+"@microsoft/tsdoc@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
+  integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
+
+"@rushstack/node-core-library@3.53.2":
+  version "3.53.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.53.2.tgz#f442e121f9e6c8bef9a23b7337e6399ab5c0c579"
+  integrity sha512-FggLe5DQs0X9MNFeJN3/EXwb+8hyZUTEp2i+V1e8r4Va4JgkjBNY0BuEaQI+3DW6S4apV3UtXU3im17MSY00DA==
+  dependencies:
+    "@types/node" "12.20.24"
+    colors "~1.2.1"
+    fs-extra "~7.0.1"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    z-schema "~5.0.2"
+
+"@rushstack/rig-package@0.3.17":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.3.17.tgz#687bd55603f2902447f3be246d93afac97095a1f"
+  integrity sha512-nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA==
+  dependencies:
+    resolve "~1.17.0"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/ts-command-line@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.13.0.tgz#a56aa90e5742c25d330cdb0cda1da19225d7bfcf"
+  integrity sha512-crLT31kl+qilz0eBRjqqYO06CqwbElc0EvzS6jI69B9Ikt1SkkSzIZ2iDP7zt/rd1ZYipKIS9hf9CQR9swDIKg==
+  dependencies:
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    colors "~1.2.1"
+    string-argv "~0.3.1"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -34,6 +108,11 @@
   resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
   integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
 
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
 "@types/fs-extra@^9.0.13":
   version "9.0.13"
   resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
@@ -64,6 +143,11 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-16.11.5.tgz#e91be5ba4ab88c06095e7b61f9ad1767a1093faf"
   integrity sha512-NyUV2DGcqYIx9op++MG2+Z4Nhw1tPhi0Wfs81TgncuX1aJC4zf2fgCJlJhl4BW9bCSS04e34VkqmOS96w0XQdg==
 
+"@types/node@12.20.24":
+  version "12.20.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.24.tgz#c37ac69cb2948afb4cef95f424fa0037971a9a5c"
+  integrity sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==
+
 acorn-walk@^8.1.1:
   version "8.2.0"
   resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
@@ -74,6 +158,16 @@ acorn@^8.4.1:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
   integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
 
+ajv@~6.12.6:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -84,6 +178,13 @@ argparse@^2.0.1:
   resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+argparse@~1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -97,6 +198,16 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+colors@~1.2.1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
+  integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
+
+commander@^2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -136,6 +247,16 @@ execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
 fs-extra@^10.0.0:
   version "10.0.0"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
@@ -145,11 +266,25 @@ fs-extra@^10.0.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@~7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -167,16 +302,33 @@ glob@^7.2.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+graceful-fs@^4.1.2:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
 graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   version "4.2.8"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
   integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+import-lazy@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -190,6 +342,13 @@ inherits@2:
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+is-core-module@^2.1.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-stream@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
@@ -200,6 +359,11 @@ isexe@^2.0.0:
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+jju@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
+  integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
+
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -207,6 +371,18 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -216,6 +392,28 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
+lodash@~4.17.15:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -269,6 +467,38 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-parse@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+resolve@~1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@~1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
+semver@~7.3.0:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -286,11 +516,31 @@ signal-exit@^3.0.3:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
   integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
 
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+string-argv@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-json-comments@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 ts-node@^10.4.0:
   version "10.4.0"
   resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.4.0.tgz#680f88945885f4e6cf450e7f0d6223dd404895f7"
@@ -314,11 +564,33 @@ typescript@^4.4.4:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
   integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
 
+typescript@~4.8.4:
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+validator@^13.7.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
+  integrity sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -331,7 +603,23 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
+z-schema@~5.0.2:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.4.tgz#ecad8bc5ef3283ae032d603286386cfb1380cce5"
+  integrity sha512-gm/lx3hDzJNcLwseIeQVm1UcwhWIKpSB4NqH89pTBtFns4k/HDHudsICtvG05Bvw/Mv3jMyk700y5dadueLHdA==
+  dependencies:
+    lodash.get "^4.4.2"
+    lodash.isequal "^4.5.0"
+    validator "^13.7.0"
+  optionalDependencies:
+    commander "^2.20.3"

From 163ab8f74e846f9ea43081c5c045e7d65f28f05c Mon Sep 17 00:00:00 2001
From: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Date: Fri, 18 Nov 2022 14:11:15 -0500
Subject: [PATCH 15/30] fix: handle lambda permissions for notifications
 category (#11357)

* fix: handle lambda permissions for notifications category

* chore: PR feedback
---
 .../execPermissionsWalkthrough.ts             | 27 +++++------
 .../src/errors/amplify-exception.ts           |  1 +
 .../__tests__/function-permissions.test.ts    | 45 +++++++++++++++++++
 3 files changed, 58 insertions(+), 15 deletions(-)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/function-permissions.test.ts

diff --git a/packages/amplify-category-function/src/provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.ts b/packages/amplify-category-function/src/provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.ts
index b0de5c138af..ea35f34db67 100644
--- a/packages/amplify-category-function/src/provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.ts
+++ b/packages/amplify-category-function/src/provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.ts
@@ -1,5 +1,6 @@
-import { $TSAny, $TSContext, FeatureFlags, pathManager, stateManager } from 'amplify-cli-core';
+import { $TSAny, $TSContext, AmplifyError, FeatureFlags, pathManager, stateManager } from 'amplify-cli-core';
 import { FunctionDependency, FunctionParameters } from 'amplify-function-plugin-interface';
+import { printer } from 'amplify-prompts';
 import * as TransformPackage from 'graphql-transformer-core';
 import inquirer, { CheckboxQuestion, DistinctChoice } from 'inquirer';
 import _ from 'lodash';
@@ -97,7 +98,7 @@ export const askExecRolePermissionsQuestions = async (
     }
 
     if (_.isEmpty(resourcesList)) {
-      context.print.warning(`No resources found for ${selectedCategory}`);
+      printer.warn(`No resources found for ${selectedCategory}`);
       continue;
     }
 
@@ -113,7 +114,7 @@ export const askExecRolePermissionsQuestions = async (
         selectedResources = _.concat(resourcesList);
       }
 
-      for (let resourceName of selectedResources) {
+      for (const resourceName of selectedResources) {
         // If the resource is AppSync, use GraphQL operations for permission policies.
         // Otherwise, default to CRUD permissions.
         const serviceType = _.get(amplifyMeta, [selectedCategory, resourceName, 'service']);
@@ -130,7 +131,7 @@ export const askExecRolePermissionsQuestions = async (
         // In case of some resources they are not in the meta file so check for resource existence as well
         const isMobileHubImportedResource = _.get(amplifyMeta, [selectedCategory, resourceName, 'mobileHubMigrated'], false);
         if (isMobileHubImportedResource) {
-          context.print.warning(
+          printer.warn(
             `Policies cannot be added for ${selectedCategory}/${resourceName}, since it is a MobileHub imported resource.`,
           );
           continue;
@@ -155,18 +156,14 @@ export const askExecRolePermissionsQuestions = async (
         }
       }
     } catch (e) {
-      if (e.name === 'MethodNotFound') {
-        context.print.warning(`${selectedCategory} category does not support resource policies yet.`);
+      if (e.name === 'PluginMethodNotFoundError') {
+        printer.warn(`${selectedCategory} category does not support resource policies yet.`);
       } else {
-        context.print.warning(`Policies cannot be added for ${selectedCategory}`);
+        throw new AmplifyError('PluginPolicyAddError', {
+          message: `Policies cannot be added for ${selectedCategory}`,
+          details: e.message,
+        }, e);
       }
-
-      if (e.stack) {
-        context.print.info(e.stack);
-      }
-
-      context.usageData.emitError(e);
-      process.exitCode = 1;
     }
   }
 
@@ -319,7 +316,7 @@ export async function generateEnvVariablesForCfn(context: $TSContext, resources:
   const envVarStringList = Array.from(envVars).sort().join('\n\t');
 
   if (envVarStringList) {
-    context.print.info(`${envVarPrintoutPrefix}${envVarStringList}`);
+    printer.info(`${envVarPrintoutPrefix}${envVarStringList}`);
   }
   return { environmentMap, dependsOn, envVarStringList };
 }
diff --git a/packages/amplify-cli-core/src/errors/amplify-exception.ts b/packages/amplify-cli-core/src/errors/amplify-exception.ts
index 16c9d8b9f7f..3ad6465f94b 100644
--- a/packages/amplify-cli-core/src/errors/amplify-exception.ts
+++ b/packages/amplify-cli-core/src/errors/amplify-exception.ts
@@ -127,6 +127,7 @@ export type AmplifyErrorType =
   | 'PermissionsError'
   | 'PluginMethodNotFoundError'
   | 'PluginNotFoundError'
+  | 'PluginPolicyAddError'
   | 'ProfileConfigurationError'
   | 'ProjectAppIdResolveError'
   | 'ProjectInitError'
diff --git a/packages/amplify-e2e-tests/src/__tests__/function-permissions.test.ts b/packages/amplify-e2e-tests/src/__tests__/function-permissions.test.ts
new file mode 100644
index 00000000000..188e7161f0c
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/function-permissions.test.ts
@@ -0,0 +1,45 @@
+import {
+  addNotificationChannel,
+  addFunction,
+  amplifyPushUpdate,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  initJSProjectWithProfile,
+} from '@aws-amplify/amplify-e2e-core';
+import { getShortId } from '../import-helpers';
+
+describe('amplify add function with permissions', () => {
+  let projRoot: string;
+
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('function-permissions');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('add notifications and function permissions', async () => {
+    await initJSProjectWithProfile(projRoot, {});
+
+    const settings = { resourceName: `notifications${getShortId()}` };
+    await addNotificationChannel(projRoot, settings, 'SMS');
+    await addFunction(
+      projRoot,
+      {
+        name: 'testFunction',
+        functionTemplate: 'Hello World',
+        additionalPermissions: {
+          permissions: ['notifications'],
+          resources: [settings.resourceName],
+          choices: ['auth', 'analytics', 'notifications'],
+          operations: ['create', 'read'],
+        },
+      },
+      'nodejs',
+    );
+    await amplifyPushUpdate(projRoot);
+  });
+});

From b5a8783c5199e2465533a17771d2b521ce3d68fb Mon Sep 17 00:00:00 2001
From: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Date: Fri, 18 Nov 2022 16:31:24 -0500
Subject: [PATCH 16/30] fix: should not print auth warn when adding auth to new
 project (#11374)

* fix: should not print auth warn when adding auth to new project

* chore: PR feedback

* fix: move warning before continue confirmation prompt
---
 .../amplify-helpers}/auto-updates.test.ts     | 34 ++++++++-
 .../amplify-helpers/auto-updates.ts           | 15 ++++
 .../amplify-helpers/push-resources.ts         |  2 +
 .../amplify-helpers/update-tracked-files.ts   | 34 ++++-----
 .../src/push-resources.ts                     |  2 -
 .../src/utils/auto-updates.ts                 | 70 -------------------
 6 files changed, 63 insertions(+), 94 deletions(-)
 rename packages/{amplify-provider-awscloudformation/src/__tests__/utils => amplify-cli/src/__tests__/extensions/amplify-helpers}/auto-updates.test.ts (84%)
 create mode 100644 packages/amplify-cli/src/extensions/amplify-helpers/auto-updates.ts
 delete mode 100644 packages/amplify-provider-awscloudformation/src/utils/auto-updates.ts

diff --git a/packages/amplify-provider-awscloudformation/src/__tests__/utils/auto-updates.test.ts b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/auto-updates.test.ts
similarity index 84%
rename from packages/amplify-provider-awscloudformation/src/__tests__/utils/auto-updates.test.ts
rename to packages/amplify-cli/src/__tests__/extensions/amplify-helpers/auto-updates.test.ts
index 84fa3b6ffe8..bf0ffc7081d 100644
--- a/packages/amplify-provider-awscloudformation/src/__tests__/utils/auto-updates.test.ts
+++ b/packages/amplify-cli/src/__tests__/extensions/amplify-helpers/auto-updates.test.ts
@@ -1,5 +1,6 @@
 import { printer } from 'amplify-prompts';
-import { showBuildDirChangesMessage } from '../../utils/auto-updates';
+import * as fs from 'fs-extra';
+import { showBuildDirChangesMessage } from '../../../extensions/amplify-helpers/auto-updates';
 
 const cloudBackendCfnTemplatePath = '/amplify/#cloud-backend/auth/cognito/build/cognito-cloudformation-template.json';
 const backendCfnTemplatePath = '/amplify/backend/auth/cognito/build/cognito-cloudformation-template.json';
@@ -8,6 +9,10 @@ let setInCloudBackendDir: boolean;
 let setInCloudBackendDirWithoutRequireVerification: boolean;
 let setInBackendDir: boolean;
 
+jest.mock('fs-extra');
+const fsMock = fs as jest.Mocked<typeof fs>;
+fsMock.existsSync.mockReturnValue(true);
+
 jest.mock('amplify-prompts');
 jest.mock('amplify-cli-core', () => {
   const { stateManager } = jest.requireActual('amplify-cli-core');
@@ -74,9 +79,34 @@ describe('showBuildDirChangesMessage', () => {
     setInCloudBackendDir = false;
     setInCloudBackendDirWithoutRequireVerification = false;
     setInBackendDir = false;
+
+    fsMock.existsSync.mockReturnValue(true);
+  });
+
+  describe('project does not have auth in current-cloud-backend directory', () => {
+    beforeEach(() => {
+      setInCloudBackendDir = false;
+      setInCloudBackendDirWithoutRequireVerification = false;
+      setInBackendDir = true;
+
+      fsMock.existsSync.mockReturnValue(false);
+    });
+
+    it('does not call warn', async () => {
+      await showBuildDirChangesMessage();
+      expect(printerMock.warn).not.toBeCalled();
+    });
   });
 
-  describe('project does not have auth', () => {
+  describe('project does not have auth AttributesRequireVerificationBeforeUpdate attribute in template', () => {
+    beforeEach(() => {
+      setInCloudBackendDir = false;
+      setInCloudBackendDirWithoutRequireVerification = false;
+      setInBackendDir = false;
+
+      fsMock.existsSync.mockReturnValue(true);
+    });
+
     it('does not call warn', async () => {
       await showBuildDirChangesMessage();
       expect(printerMock.warn).not.toBeCalled();
diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/auto-updates.ts b/packages/amplify-cli/src/extensions/amplify-helpers/auto-updates.ts
new file mode 100644
index 00000000000..fad5694392a
--- /dev/null
+++ b/packages/amplify-cli/src/extensions/amplify-helpers/auto-updates.ts
@@ -0,0 +1,15 @@
+import { printer } from 'amplify-prompts';
+import { detectCognitoAttributesRequireVerificationBeforeUpdateDiff } from './update-tracked-files';
+
+/**
+ * Displays messages to users when CLI makes updates for them in their build directories and is not detected by version control
+ * or 'amplify status'
+ */
+export const showBuildDirChangesMessage = async (): Promise<void> => {
+  if (await detectCognitoAttributesRequireVerificationBeforeUpdateDiff()) {
+    printer.warn(
+      `Amplify CLI now supports verifying a Cognito user email address that has been changed and will automatically update your auth \
+configuration. Read more: https://docs.amplify.aws/lib/auth/manageusers/q/platform/js/#updating-and-verifying-a-cognito-user-email-address`,
+    );
+  }
+};
diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/push-resources.ts b/packages/amplify-cli/src/extensions/amplify-helpers/push-resources.ts
index b1e4776ba1e..70238f0052d 100644
--- a/packages/amplify-cli/src/extensions/amplify-helpers/push-resources.ts
+++ b/packages/amplify-cli/src/extensions/amplify-helpers/push-resources.ts
@@ -12,6 +12,7 @@ import { onCategoryOutputsChange } from './on-category-outputs-change';
 import { showResourceTable } from './resource-status';
 import { isValidGraphQLAuthError, handleValidGraphQLAuthError } from './apply-auth-mode';
 import { ManuallyTimedCodePath } from '../../domain/amplify-usageData/UsageDataTypes';
+import { showBuildDirChangesMessage } from './auto-updates';
 
 /**
  * Entry point for pushing resources to the cloud
@@ -90,6 +91,7 @@ export const pushResources = async (
     if (context.exeInfo.iterativeRollback) {
       printer.info('The CLI will rollback the last known iterative deployment.');
     }
+    await showBuildDirChangesMessage();
     continueToPush = await context.amplify.confirmPrompt('Are you sure you want to continue?');
   }
 
diff --git a/packages/amplify-cli/src/extensions/amplify-helpers/update-tracked-files.ts b/packages/amplify-cli/src/extensions/amplify-helpers/update-tracked-files.ts
index 99a6db42730..2225976c89f 100644
--- a/packages/amplify-cli/src/extensions/amplify-helpers/update-tracked-files.ts
+++ b/packages/amplify-cli/src/extensions/amplify-helpers/update-tracked-files.ts
@@ -12,37 +12,31 @@ const {
  * Updates Cognito files that are tracked so that the diff is detected for an `amplify push`
  */
 export const updateCognitoTrackedFiles = async (): Promise<void> => {
+  if (await detectCognitoAttributesRequireVerificationBeforeUpdateDiff()) {
+    const { resourceName } = stateManager.getResourceFromMeta(stateManager.getMeta(), 'auth', 'Cognito', undefined, false)!;
+    await addExtraLineToCliInputsJson(pathManager.getBackendDirPath(), resourceName);
+  }
+};
+
+/**
+ * Detects Cognito AttributesRequireVerificationBeforeUpdate attribute drift
+ */
+export const detectCognitoAttributesRequireVerificationBeforeUpdateDiff = async (): Promise<boolean> => {
   const currentCloudBackendDir = pathManager.getCurrentCloudBackendDirPath();
   const localBackendDir = pathManager.getBackendDirPath();
+
   const amplifyMeta = stateManager.getMeta();
   const cognitoResource = stateManager.getResourceFromMeta(amplifyMeta, 'auth', 'Cognito', undefined, false);
 
   if (!fs.existsSync(currentCloudBackendDir) || !cognitoResource) {
-    return;
+    return false;
   }
 
   const { resourceName } = cognitoResource;
-
-  if (await detectCognitoDiff(currentCloudBackendDir, localBackendDir, resourceName)) {
-    await addExtraLineToCliInputsJson(localBackendDir, resourceName);
+  if (!fs.existsSync(path.join(currentCloudBackendDir, 'auth', resourceName))) {
+    return false;
   }
-};
 
-const detectCognitoDiff = async (
-  currentCloudBackendDir: string,
-  localBackendDir: string,
-  resourceName: string,
-): Promise<boolean> => detectCognitoAttributesRequireVerificationBeforeUpdateDiff(
-  currentCloudBackendDir,
-  localBackendDir,
-  resourceName,
-);
-
-const detectCognitoAttributesRequireVerificationBeforeUpdateDiff = async (
-  currentCloudBackendDir: string,
-  localBackendDir: string,
-  resourceName: string,
-): Promise<boolean> => {
   const cloudBackendUserAttrUpdateSettings = await readCfnTemplateUserAttributeSettings(currentCloudBackendDir, resourceName);
   const backendUserAttrUpdateSettings = await readCfnTemplateUserAttributeSettings(localBackendDir, resourceName);
   const updateNotInCloudBackend: boolean = !cloudBackendUserAttrUpdateSettings?.AttributesRequireVerificationBeforeUpdate
diff --git a/packages/amplify-provider-awscloudformation/src/push-resources.ts b/packages/amplify-provider-awscloudformation/src/push-resources.ts
index 2e5a218bc4d..9a489d03366 100644
--- a/packages/amplify-provider-awscloudformation/src/push-resources.ts
+++ b/packages/amplify-provider-awscloudformation/src/push-resources.ts
@@ -64,7 +64,6 @@ import { isAmplifyAdminApp } from './utils/admin-helpers';
 import { fileLogger } from './utils/aws-logger';
 import { APIGW_AUTH_STACK_LOGICAL_ID, loadApiCliInputs } from './utils/consolidate-apigw-policies';
 import { createEnvLevelConstructs } from './utils/env-level-constructs';
-import { showBuildDirChangesMessage } from './utils/auto-updates';
 import { NETWORK_STACK_LOGICAL_ID } from './network/stack';
 import { preProcessCFNTemplate, writeCustomPoliciesToCFNTemplate } from './pre-push-cfn-processor/cfn-pre-processor';
 import { AUTH_TRIGGER_STACK, AUTH_TRIGGER_TEMPLATE } from './utils/upload-auth-trigger-template';
@@ -196,7 +195,6 @@ export const run = async (context: $TSContext, resourceDefinition: $TSObject, re
     await prePushLambdaLayerPrompt(context, resources);
     await prepareBuildableResources(context, resources);
     await buildOverridesEnabledResources(context, resources);
-    await showBuildDirChangesMessage();
 
     // Removed api transformation to generate resources before starting deploy/
 
diff --git a/packages/amplify-provider-awscloudformation/src/utils/auto-updates.ts b/packages/amplify-provider-awscloudformation/src/utils/auto-updates.ts
deleted file mode 100644
index ee31c0c06aa..00000000000
--- a/packages/amplify-provider-awscloudformation/src/utils/auto-updates.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import * as path from 'path';
-import {
-  $TSAny,
-  $TSMeta,
-  JSONUtilities,
-  pathManager,
-  stateManager,
-} from 'amplify-cli-core';
-import { printer } from 'amplify-prompts';
-
-const {
-  readJson,
-} = JSONUtilities;
-
-/**
- * Displays messages to users when CLI makes updates for them in their build directories and is not detected by version control
- * or 'amplify status'
- */
-export const showBuildDirChangesMessage = async (): Promise<void> => {
-  const currentCloudBackendDir = pathManager.getCurrentCloudBackendDirPath();
-  const localBackendDir = pathManager.getBackendDirPath();
-  const amplifyMeta = stateManager.getMeta();
-
-  await showCognitoAttributesRequireVerificationBeforeUpdateMessage(currentCloudBackendDir, localBackendDir, amplifyMeta);
-};
-
-const showCognitoAttributesRequireVerificationBeforeUpdateMessage = async (
-  currentCloudBackendDir: string,
-  localBackendDir: string,
-  amplifyMeta: $TSMeta,
-): Promise<void> => {
-  const cognitoResource = stateManager.getResourceFromMeta(amplifyMeta, 'auth', 'Cognito', undefined, false);
-
-  if (!cognitoResource) {
-    return;
-  }
-
-  const { resourceName } = cognitoResource;
-  const cloudBackendUserAttrUpdateSettings = await readCfnTemplateUserAttributeSettings(currentCloudBackendDir, resourceName);
-  const backendUserAttrUpdateSettings = await readCfnTemplateUserAttributeSettings(localBackendDir, resourceName);
-  const updateNotInCloudBackend: boolean = !cloudBackendUserAttrUpdateSettings?.AttributesRequireVerificationBeforeUpdate
-    || cloudBackendUserAttrUpdateSettings?.AttributesRequireVerificationBeforeUpdate[0] !== 'email';
-  const updateInLocalBackend: boolean = backendUserAttrUpdateSettings?.AttributesRequireVerificationBeforeUpdate.length === 1
-    && backendUserAttrUpdateSettings?.AttributesRequireVerificationBeforeUpdate[0] === 'email';
-
-  if (updateNotInCloudBackend && updateInLocalBackend) {
-    printer.warn(
-      `Amplify CLI now supports verifying a Cognito user email address that has been changed and will automatically update your auth \
-configuration. Read more: https://docs.amplify.aws/lib/auth/manageusers/q/platform/js/#updating-and-verifying-a-cognito-user-email-address`,
-    );
-  }
-};
-
-type UserAttributeUpdateSettings = {
-  AttributesRequireVerificationBeforeUpdate: string[]
-}
-
-const readCfnTemplateUserAttributeSettings = async (
-  backendDir: string,
-  resourceName: string,
-): Promise<UserAttributeUpdateSettings | undefined> => {
-  const cfnTemplatePath = path.join(backendDir, 'auth', resourceName, 'build', `${resourceName}-cloudformation-template.json`);
-  const cfnTemplate: $TSAny = readJson(cfnTemplatePath, { throwIfNotExist: false });
-
-  if (!cfnTemplate) {
-    return undefined;
-  }
-
-  return cfnTemplate.Resources.UserPool?.Properties?.UserAttributeUpdateSettings;
-};

From 7d17da99408c06ec9f38ad9f0072383ef2850cdd Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Fri, 18 Nov 2022 15:48:28 -0800
Subject: [PATCH 17/30] chore: move extractor dependency up (#11442)

* chore: move extractor dependency up

* chore: move extractor dependency up

* chore: poke ci
---
 .circleci/config.base.yml        |   3 -
 package.json                     |   1 +
 packages/amplify-cli-core/API.md |   2 +-
 scripts/package.json             |   1 -
 yarn.lock                        | 176 +++++++++++++++++++++++++++++--
 5 files changed, 169 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index 745beb062b9..b0e97b78a9b 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -166,9 +166,6 @@ jobs:
       - run:
           name: extract api
           command: |
-            cd scripts
-            yarn install
-            cd ..
             yarn verify-api-extract
 
   mock_e2e_tests:
diff --git a/package.json b/package.json
index d153180da94..d82c075f2d4 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
     "@commitlint/config-lerna-scopes": "^16.2.2",
     "@commitlint/cz-commitlint": "^16.2.3",
     "@commitlint/prompt": "^16.2.3",
+    "@microsoft/api-extractor": "^7.33.5",
     "@types/glob": "^7.1.1",
     "@types/jest": "^26.0.20",
     "@types/js-yaml": "^4.0.0",
diff --git a/packages/amplify-cli-core/API.md b/packages/amplify-cli-core/API.md
index 94378a26624..2fa8a840245 100644
--- a/packages/amplify-cli-core/API.md
+++ b/packages/amplify-cli-core/API.md
@@ -123,7 +123,7 @@ export class AmplifyError extends AmplifyException {
 }
 
 // @public (undocumented)
-export type AmplifyErrorType = 'AmplifyStudioError' | 'AmplifyStudioLoginError' | 'AmplifyStudioNotEnabledError' | 'ApiCategorySchemaNotFoundError' | 'AuthImportError' | 'BucketAlreadyExistsError' | 'BucketNotFoundError' | 'CategoryNotEnabledError' | 'CloudFormationTemplateError' | 'CommandNotSupportedError' | 'ConfigurationError' | 'DeploymentError' | 'DeploymentInProgressError' | 'DirectoryError' | 'DirectoryAlreadyExistsError' | 'DuplicateLogicalIdError' | 'EnvironmentConfigurationError' | 'EnvironmentNameError' | 'EnvironmentNotInitializedError' | 'FeatureFlagsValidationError' | 'FrameworkNotSupportedError' | 'FunctionTooLargeError' | 'InputValidationError' | 'InvalidAmplifyAppIdError' | 'InvalidCustomResourceError' | 'InvalidOverrideError' | 'InvalidStackError' | 'IterativeRollbackError' | 'LambdaLayerDeleteError' | 'MigrationError' | 'MissingAmplifyMetaFileError' | 'MissingOverridesInstallationRequirementsError' | 'ModelgenError' | 'NestedProjectInitError' | 'NoUpdateBackendError' | 'NotImplementedError' | 'OpenSslCertificateError' | 'ParameterNotFoundError' | 'PermissionsError' | 'PluginMethodNotFoundError' | 'PluginNotFoundError' | 'ProfileConfigurationError' | 'ProjectAppIdResolveError' | 'ProjectInitError' | 'ProjectNotFoundError' | 'ProjectNotInitializedError' | 'PushResourcesError' | 'RegionNotAvailableError' | 'RemoveNotificationAppError' | 'ResourceAlreadyExistsError' | 'ResourceInUseError' | 'ResourceNotReadyError' | 'StackNotFoundError' | 'StackStateError' | 'UserInputError' | 'MockProcessError' | 'SearchableMockUnsupportedPlatformError' | 'SearchableMockUnavailablePortError' | 'SearchableMockProcessError';
+export type AmplifyErrorType = 'AmplifyStudioError' | 'AmplifyStudioLoginError' | 'AmplifyStudioNotEnabledError' | 'ApiCategorySchemaNotFoundError' | 'AuthImportError' | 'BucketAlreadyExistsError' | 'BucketNotFoundError' | 'CategoryNotEnabledError' | 'CloudFormationTemplateError' | 'CommandNotSupportedError' | 'ConfigurationError' | 'DeploymentError' | 'DeploymentInProgressError' | 'DirectoryError' | 'DirectoryAlreadyExistsError' | 'DuplicateLogicalIdError' | 'EnvironmentConfigurationError' | 'EnvironmentNameError' | 'EnvironmentNotInitializedError' | 'FeatureFlagsValidationError' | 'FrameworkNotSupportedError' | 'FunctionTooLargeError' | 'InputValidationError' | 'InvalidAmplifyAppIdError' | 'InvalidCustomResourceError' | 'InvalidOverrideError' | 'InvalidStackError' | 'IterativeRollbackError' | 'LambdaLayerDeleteError' | 'MigrationError' | 'MissingAmplifyMetaFileError' | 'MissingOverridesInstallationRequirementsError' | 'ModelgenError' | 'NestedProjectInitError' | 'NoUpdateBackendError' | 'NotImplementedError' | 'OpenSslCertificateError' | 'ParameterNotFoundError' | 'PermissionsError' | 'PluginMethodNotFoundError' | 'PluginNotFoundError' | 'PluginPolicyAddError' | 'ProfileConfigurationError' | 'ProjectAppIdResolveError' | 'ProjectInitError' | 'ProjectNotFoundError' | 'ProjectNotInitializedError' | 'PushResourcesError' | 'RegionNotAvailableError' | 'RemoveNotificationAppError' | 'ResourceAlreadyExistsError' | 'ResourceInUseError' | 'ResourceNotReadyError' | 'StackNotFoundError' | 'StackStateError' | 'UserInputError' | 'MockProcessError' | 'SearchableMockUnsupportedPlatformError' | 'SearchableMockUnavailablePortError' | 'SearchableMockProcessError';
 
 // @public (undocumented)
 export abstract class AmplifyException extends Error {
diff --git a/scripts/package.json b/scripts/package.json
index 639ebbaa0f3..2eb694e041d 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -17,7 +17,6 @@
     "fs-extra": "^10.0.0",
     "glob": "^7.2.0",
     "js-yaml": "^4.1.0",
-    "@microsoft/api-extractor": "^7.33.5",
     "ts-node": "^10.4.0",
     "typescript": "^4.4.4"
   }
diff --git a/yarn.lock b/yarn.lock
index 82adf84f2fb..d4613e37872 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7487,6 +7487,48 @@
   dependencies:
     "@lezer/common" "^0.15.0"
 
+"@microsoft/api-extractor-model@7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.25.2.tgz#a3e69e952122bbe3f0fc339a8ce0d9d20dd06406"
+  integrity sha512-+h1uCrLQXFAKMUdghhdDcnniDB+6UA/lS9ArlB4QZQ34UbLuXNy2oQ6fafFK8cKXU4mUPTF/yGRjv7JKD5L7eg==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.53.2"
+
+"@microsoft/api-extractor@^7.33.5":
+  version "7.33.6"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.33.6.tgz#37899ac455257d70d317f06e2356dff5af9f0fcb"
+  integrity sha512-EYu1qWiMyvP/P+7na76PbE7+eOtvuYIvQa2DhZqkSQSLYP2sKLmZaSMK5Jvpgdr0fK/xLFujK5vLf3vpfcmC8g==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.25.2"
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "3.53.2"
+    "@rushstack/rig-package" "0.3.17"
+    "@rushstack/ts-command-line" "4.13.1"
+    colors "~1.2.1"
+    lodash "~4.17.15"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    source-map "~0.6.1"
+    typescript "~4.8.4"
+
+"@microsoft/tsdoc-config@~0.16.1":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf"
+  integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    ajv "~6.12.6"
+    jju "~1.4.0"
+    resolve "~1.19.0"
+
+"@microsoft/tsdoc@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
+  integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
+
 "@n1ru4l/graphql-live-query@^0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc"
@@ -7992,6 +8034,38 @@
   resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz#6801033be7ff87a6b7cadaf5b337c9f366a3c4b0"
   integrity sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==
 
+"@rushstack/node-core-library@3.53.2":
+  version "3.53.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.53.2.tgz#f442e121f9e6c8bef9a23b7337e6399ab5c0c579"
+  integrity sha512-FggLe5DQs0X9MNFeJN3/EXwb+8hyZUTEp2i+V1e8r4Va4JgkjBNY0BuEaQI+3DW6S4apV3UtXU3im17MSY00DA==
+  dependencies:
+    "@types/node" "12.20.24"
+    colors "~1.2.1"
+    fs-extra "~7.0.1"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    z-schema "~5.0.2"
+
+"@rushstack/rig-package@0.3.17":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.3.17.tgz#687bd55603f2902447f3be246d93afac97095a1f"
+  integrity sha512-nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA==
+  dependencies:
+    resolve "~1.17.0"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/ts-command-line@4.13.1":
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.13.1.tgz#148b644b627131480363b4853b558ba5eaa0d75c"
+  integrity sha512-UTQMRyy/jH1IS2U+6pyzyn9xQ2iMcoUKkTcZUzOP/aaMiKlWLwCTDiBVwhw/M1crDx6apF9CwyjuWO9r1SBdJQ==
+  dependencies:
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    colors "~1.2.1"
+    string-argv "~0.3.1"
+
 "@semantic-ui-react/css-patch@^1.0.0":
   version "1.0.0"
   resolved "https://registry.npmjs.org/@semantic-ui-react/css-patch/-/css-patch-1.0.0.tgz#903637479eca4010749e81f15b91dfd5f019b08d"
@@ -8278,6 +8352,11 @@
   dependencies:
     "@types/glob" "*"
 
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
 "@types/aria-query@^4.2.0":
   version "4.2.2"
   resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
@@ -8695,6 +8774,11 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz#62797cee3b8b497f6547503b2312254d4fe3c2bb"
   integrity sha512-eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==
 
+"@types/node@12.20.24":
+  version "12.20.24"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.24.tgz#c37ac69cb2948afb4cef95f424fa0037971a9a5c"
+  integrity sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==
+
 "@types/node@>=12":
   version "17.0.23"
   resolved "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
@@ -9553,7 +9637,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6:
+ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.12.6, ajv@~6.12.6:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -9898,9 +9982,9 @@ arg@^5.0.1:
   resolved "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb"
   integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==
 
-argparse@^1.0.7:
+argparse@^1.0.7, argparse@~1.0.9:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
@@ -11682,6 +11766,11 @@ colors@1.4.0, colors@^1.1.2, colors@^1.2.1:
   resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
+colors@~1.2.1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
+  integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
+
 colorspace@1.1.x:
   version "1.1.4"
   resolved "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
@@ -11713,7 +11802,7 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0:
+commander@^2.20.0, commander@^2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -14505,6 +14594,15 @@ fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@~7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -15872,7 +15970,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-import-lazy@^4.0.0:
+import-lazy@^4.0.0, import-lazy@~4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
@@ -16157,6 +16255,13 @@ is-ci@^3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
+is-core-module@^2.1.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.10.0"
   resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
@@ -17221,7 +17326,7 @@ jest@^26.6.3:
     import-local "^3.0.2"
     jest-cli "^26.6.3"
 
-jju@^1.1.0:
+jju@^1.1.0, jju@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
   integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
@@ -17823,6 +17928,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -17898,7 +18008,7 @@ lodash@4.17.15:
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@4.x, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.0:
+lodash@4.x, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.0, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -21543,6 +21653,21 @@ resolve@^2.0.0-next.3:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@~1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@~1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -21891,6 +22016,13 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@~7.3.0:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.npmjs.org/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
@@ -22575,6 +22707,11 @@ streamsearch@^1.1.0:
   resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
+string-argv@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
 string-env-interpolation@1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
@@ -22779,9 +22916,9 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 strip-json-comments@~2.0.1:
@@ -23610,6 +23747,11 @@ typescript@^4.6.3:
   resolved "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
   integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
+typescript@~4.8.4:
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+
 ua-parser-js@^0.7.30:
   version "0.7.31"
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
@@ -24008,6 +24150,11 @@ validate-npm-package-name@^4.0.0:
   dependencies:
     builtins "^5.0.0"
 
+validator@^13.7.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
+  integrity sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==
+
 value-or-promise@1.0.11, value-or-promise@^1.0.11:
   version "1.0.11"
   resolved "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
@@ -24943,6 +25090,17 @@ yup@^0.32.11:
     property-expr "^2.0.4"
     toposort "^2.0.2"
 
+z-schema@~5.0.2:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.4.tgz#ecad8bc5ef3283ae032d603286386cfb1380cce5"
+  integrity sha512-gm/lx3hDzJNcLwseIeQVm1UcwhWIKpSB4NqH89pTBtFns4k/HDHudsICtvG05Bvw/Mv3jMyk700y5dadueLHdA==
+  dependencies:
+    lodash.get "^4.4.2"
+    lodash.isequal "^4.5.0"
+    validator "^13.7.0"
+  optionalDependencies:
+    commander "^2.20.3"
+
 zen-observable-ts@0.8.19:
   version "0.8.19"
   resolved "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz#c094cd20e83ddb02a11144a6e2a89706946b5694"

From 2ac7164931aba7fc70900d6f2680e030e9d12123 Mon Sep 17 00:00:00 2001
From: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Date: Sat, 19 Nov 2022 13:24:22 -0500
Subject: [PATCH 18/30] fix: print table summary on verbose status (#11438)

---
 packages/amplify-cli-core/src/cliViewAPI.ts   |  2 +-
 .../src/__tests__/input-validation.test.ts    | 14 ++++++
 packages/amplify-cli/src/index.ts             | 49 -------------------
 packages/amplify-cli/src/input-manager.ts     | 49 +++++++++++++++++++
 4 files changed, 64 insertions(+), 50 deletions(-)
 create mode 100644 packages/amplify-cli/src/__tests__/input-validation.test.ts

diff --git a/packages/amplify-cli-core/src/cliViewAPI.ts b/packages/amplify-cli-core/src/cliViewAPI.ts
index 506e693c192..1825560c44d 100644
--- a/packages/amplify-cli-core/src/cliViewAPI.ts
+++ b/packages/amplify-cli-core/src/cliViewAPI.ts
@@ -34,7 +34,7 @@ export class ViewResourceTableParams {
   getCategoryFromCLIOptions(cliOptions: object) {
     if (cliOptions) {
       return Object.keys(cliOptions)
-        .filter(key => key != 'verbose' && key !== 'yes')
+        .filter(key => key !== 'verbose' && key !== 'yes')
         .map(category => category.toLowerCase());
     } else {
       return [];
diff --git a/packages/amplify-cli/src/__tests__/input-validation.test.ts b/packages/amplify-cli/src/__tests__/input-validation.test.ts
new file mode 100644
index 00000000000..72f54d19bae
--- /dev/null
+++ b/packages/amplify-cli/src/__tests__/input-validation.test.ts
@@ -0,0 +1,14 @@
+import { Input } from '../domain/input';
+import { verifyInput } from '../input-manager';
+import { PluginPlatform } from '../domain/plugin-platform';
+
+describe('input validation tests', () => {
+  it('status -v option should be treated as verbose', () => {
+    const input = new Input(['status', '-v']);
+    input.command = 'status';
+    input.options = { v: true };
+
+    verifyInput(new PluginPlatform(), input);
+    expect(input?.options?.verbose).toBe(true);
+  });
+});
diff --git a/packages/amplify-cli/src/index.ts b/packages/amplify-cli/src/index.ts
index a6e85e35314..d031684a5f4 100644
--- a/packages/amplify-cli/src/index.ts
+++ b/packages/amplify-cli/src/index.ts
@@ -51,50 +51,6 @@ process.on('unhandledRejection', error => {
   throw error;
 });
 
-const convertKeysToLowerCase = <T>(obj: Record<string, T>): Record<string, T> => {
-  const newObj = {};
-  Object.entries(obj).forEach(([key, value]) => { newObj[key.toLowerCase()] = value; });
-  return newObj;
-};
-
-const normalizeStatusCommandOptions = (input: Input): Input => {
-  const options = input.options ? input.options : {};
-  const allowedVerboseIndicators = [constants.VERBOSE, 'v'];
-  // Normalize 'amplify status -v' to verbose, since -v is interpreted as 'version'
-  allowedVerboseIndicators.forEach(verboseFlag => {
-    if (options.verboseFlag !== undefined) {
-      if (typeof options[verboseFlag] === 'string') {
-        const pluginName = (options[verboseFlag] as string).toLowerCase();
-        options[pluginName] = true;
-      }
-      delete options[verboseFlag];
-      options.verbose = true;
-    }
-  });
-
-  // Merge plugins and sub-commands as options (except help/verbose)
-  const returnInput = input;
-  if (returnInput.plugin) {
-    options[returnInput.plugin] = true;
-    delete returnInput.plugin;
-  }
-  if (returnInput.subCommands) {
-    const allowedSubCommands = [constants.HELP, constants.VERBOSE]; // list of sub-commands supported in Status
-    const inputSubCommands: string[] = [];
-    returnInput.subCommands.forEach(subCommand => {
-      // plugins are inferred as sub-commands when positionally supplied
-      if (!allowedSubCommands.includes(subCommand)) {
-        options[subCommand.toLowerCase()] = true;
-      } else {
-        inputSubCommands.push(subCommand);
-      }
-    });
-    returnInput.subCommands = inputSubCommands;
-  }
-  returnInput.options = convertKeysToLowerCase(options); // normalize keys to lower case
-  return input;
-};
-
 /**
  * Command line entry point
  */
@@ -109,11 +65,6 @@ export const run = async (startTime: number): Promise<void> => {
     notify({ defer: false, isGlobal: true });
   }
 
-  // Normalize status command options
-  if (input.command === 'status') {
-    input = normalizeStatusCommandOptions(input);
-  }
-
   // Initialize Banner messages. These messages are set on the server side
   const pkg = JSONUtilities.readJson<$TSAny>(path.join(__dirname, '..', 'package.json'));
   BannerMessage.initialize(pkg.version);
diff --git a/packages/amplify-cli/src/input-manager.ts b/packages/amplify-cli/src/input-manager.ts
index db4c80f83fb..37e561a7bc1 100644
--- a/packages/amplify-cli/src/input-manager.ts
+++ b/packages/amplify-cli/src/input-manager.ts
@@ -98,6 +98,11 @@ function normalizeInput(input: Input): Input {
 export function verifyInput(pluginPlatform: PluginPlatform, input: Input): InputVerificationResult {
   const result = new InputVerificationResult();
 
+  // Normalize status command options
+  if (input.command === 'status') {
+    input = normalizeStatusCommandOptions(input);
+  }
+
   input.plugin = input.plugin || constants.CORE;
 
   normalizeInput(input);
@@ -206,3 +211,47 @@ function aliasArgs(argv: string[]) {
     insertAmplifyIgnore(gitIgnoreFilePath);
   }
 }
+
+const convertKeysToLowerCase = <T>(obj: Record<string, T>): Record<string, T> => {
+  const newObj = {};
+  Object.entries(obj).forEach(([key, value]) => { newObj[key.toLowerCase()] = value; });
+  return newObj;
+};
+
+const normalizeStatusCommandOptions = (input: Input): Input => {
+  const options = input.options ? input.options : {};
+  const allowedVerboseIndicators = [constants.VERBOSE, 'v'];
+  // Normalize 'amplify status -v' to verbose, since -v is interpreted as 'version'
+  allowedVerboseIndicators.forEach(verboseFlag => {
+    if (options[verboseFlag] !== undefined) {
+      if (typeof options[verboseFlag] === 'string') {
+        const pluginName = (options[verboseFlag] as string).toLowerCase();
+        options[pluginName] = true;
+      }
+      delete options[verboseFlag];
+      options.verbose = true;
+    }
+  });
+
+  // Merge plugins and sub-commands as options (except help/verbose)
+  const returnInput = input;
+  if (returnInput.plugin) {
+    options[returnInput.plugin] = true;
+    delete returnInput.plugin;
+  }
+  if (returnInput.subCommands) {
+    const allowedSubCommands = [constants.HELP, constants.VERBOSE]; // list of sub-commands supported in Status
+    const inputSubCommands: string[] = [];
+    returnInput.subCommands.forEach(subCommand => {
+      // plugins are inferred as sub-commands when positionally supplied
+      if (!allowedSubCommands.includes(subCommand)) {
+        options[subCommand.toLowerCase()] = true;
+      } else {
+        inputSubCommands.push(subCommand);
+      }
+    });
+    returnInput.subCommands = inputSubCommands;
+  }
+  returnInput.options = convertKeysToLowerCase(options); // normalize keys to lower case
+  return returnInput;
+};

From 2859c9e8e3b33039a8b714cf47540075719eeea6 Mon Sep 17 00:00:00 2001
From: Hein Jeong <73264629+hein-j@users.noreply.github.com>
Date: Sat, 19 Nov 2022 11:55:15 -0800
Subject: [PATCH 19/30] chore: update codegen-ui to 2.5.5 (#11443)

Co-authored-by: Hein Jeong <heinje@amazon.com>
---
 packages/amplify-util-uibuilder/package.json   |  6 +++---
 .../__tests__/notifyMissingPackages.test.ts    |  4 ++--
 yarn.lock                                      | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
index dfc18dbb46e..9319f0dc34a 100644
--- a/packages/amplify-util-uibuilder/package.json
+++ b/packages/amplify-util-uibuilder/package.json
@@ -13,8 +13,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.5.4",
-    "@aws-amplify/codegen-ui-react": "2.5.4",
+    "@aws-amplify/codegen-ui": "2.5.5",
+    "@aws-amplify/codegen-ui-react": "2.5.5",
     "amplify-cli-core": "3.4.0",
     "amplify-prompts": "2.6.1",
     "aws-sdk": "^2.1233.0",
@@ -68,4 +68,4 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts b/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts
index 232e2e046e7..770241d53eb 100644
--- a/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts
+++ b/packages/amplify-util-uibuilder/src/__tests__/notifyMissingPackages.test.ts
@@ -52,13 +52,13 @@ describe('should notify when packages are missing', () => {
       },
     };
     notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
-    expect(printerDependency.printer.warn).toBeCalledTimes(1);
+    expect(printerDependency.printer.warn).toBeCalledTimes(2);
   });
 
   it('notifies for partial missing dependencies', async () => {
     JSONUtilitiesDependency.JSONUtilities.readJson = jest.fn().mockImplementation(() => ({
       projectPath: __dirname,
-      dependencies: { '@aws-amplify/ui-react': '1.2.0' },
+      dependencies: { '@aws-amplify/ui-react': '4.2.0' },
     }));
     const context = {
       input: {
diff --git a/yarn.lock b/yarn.lock
index 10b5aa4de12..1c9b34f9f86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -216,21 +216,21 @@
   dependencies:
     "@aws-amplify/core" "4.3.11"
 
-"@aws-amplify/codegen-ui-react@2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@aws-amplify/codegen-ui-react/-/codegen-ui-react-2.5.4.tgz#216dc54b56926043976016ecf1c2e28349676f60"
-  integrity sha512-75rjC7TJ9NCMjPbNd8y4VJlC50H+NKVEoAsDb8IG8UZk6Sf3TOqclvfaDQxf+V916qSOCgc6GjLSohQbS0V6iw==
+"@aws-amplify/codegen-ui-react@2.5.5":
+  version "2.5.5"
+  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui-react/-/codegen-ui-react-2.5.5.tgz#804e0c69258eb337fe23e06aa60c4779f377affb"
+  integrity sha512-5A6+ztnEudXQhjwuDLRykEfQWhk1CxnKVWM05wT5pD2peXEhfb/mmKpcZ4CtWh34ilDHk1QdpP+mM8QPuAd1xA==
   dependencies:
-    "@aws-amplify/codegen-ui" "2.5.4"
+    "@aws-amplify/codegen-ui" "2.5.5"
     "@typescript/vfs" "~1.3.5"
     typescript "<=4.5.0"
   optionalDependencies:
     prettier "2.3.2"
 
-"@aws-amplify/codegen-ui@2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@aws-amplify/codegen-ui/-/codegen-ui-2.5.4.tgz#9042f861bff7bafa0897a9faeb2ac91a857933a9"
-  integrity sha512-k6HUHiGAB49R6UdTM0rDhPf+PAWpzP/E8s0Gt9HJODMoO8kvIBwlSIIrCVRZizhB2wzO7CjHm/cPQL4OlXPudw==
+"@aws-amplify/codegen-ui@2.5.5":
+  version "2.5.5"
+  resolved "https://registry.npmjs.org/@aws-amplify/codegen-ui/-/codegen-ui-2.5.5.tgz#33b31b52240878590dcf230ea7c8a92261143f89"
+  integrity sha512-7OnjqnMVD0AnlcrEmKyu9IL7s5+zPhj5lAH+z6OFCuGYCONGTZgJJkR7RGs48bmayzm9jvpAPMVLwPSQENcqSQ==
   dependencies:
     change-case "^4.1.2"
     yup "^0.32.11"

From 1a0f1e69e460fedfd1b57696290d84947c0f025e Mon Sep 17 00:00:00 2001
From: josef <josef.aidt@gmail.com>
Date: Mon, 21 Nov 2022 08:29:44 -0800
Subject: [PATCH 20/30] chore: change Array.forEach to for...of in JS function
 templates (#10985)

* chore: change Array.forEach to for...of in JS function templates

* chore: remove unnecessary closing parentheses
---
 .../resources/lambda/trigger/trigger-dynamodb.js.ejs          | 4 ++--
 .../resources/lambda/trigger/trigger-kinesis.js.ejs           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-dynamodb.js.ejs b/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-dynamodb.js.ejs
index 7a725402777..ff4fc582d36 100644
--- a/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-dynamodb.js.ejs
+++ b/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-dynamodb.js.ejs
@@ -5,10 +5,10 @@
  */
 exports.handler = event => {
   console.log(`EVENT: ${JSON.stringify(event)}`);
-  event.Records.forEach(record => {
+  for (const record of event.Records) {
     console.log(record.eventID);
     console.log(record.eventName);
     console.log('DynamoDB Record: %j', record.dynamodb);
-  });
+  }
   return Promise.resolve('Successfully processed DynamoDB record');
 };
diff --git a/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-kinesis.js.ejs b/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-kinesis.js.ejs
index ccb7702ad6b..2e9eedee364 100644
--- a/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-kinesis.js.ejs
+++ b/packages/amplify-nodejs-function-template-provider/resources/lambda/trigger/trigger-kinesis.js.ejs
@@ -7,11 +7,11 @@ exports.handler = event => {
   console.log(`EVENT: ${JSON.stringify(event)}`);
   let res = '';
   if ('Records' in event) {
-    event.Records.forEach(record => {
+    for (const record of event.Records) {
       console.log(record.eventID);
       console.log(record.eventName);
       console.log('Kinesis Record: %j', record.kinesis);
-    });
+    }
     res += 'Successfully processed DynamoDB record';
   } else {
     res += 'Kinesis records not present in event';

From f91ef7f55e7585960d1e1dab0ddd34f25b985543 Mon Sep 17 00:00:00 2001
From: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:38:38 -0500
Subject: [PATCH 21/30] chore: upgrade react-dev-utils to 12.0.1 (#11449)

---
 .../amplify-graphiql-explorer/package.json    |  2 +-
 yarn.lock                                     | 86 +++++++++++--------
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
index 6174e85ec91..9727500cbd7 100644
--- a/packages/amplify-graphiql-explorer/package.json
+++ b/packages/amplify-graphiql-explorer/package.json
@@ -48,7 +48,7 @@
     "prompts": "^2.4.2",
     "react": "^17.0.2",
     "react-app-polyfill": "^3.0.0",
-    "react-dev-utils": "^12.0.0",
+    "react-dev-utils": "^12.0.1",
     "react-dom": "^17.0.2",
     "react-refresh": "^0.11.0",
     "resolve": "^1.20.0",
diff --git a/yarn.lock b/yarn.lock
index d4613e37872..3003b8b6097 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3551,7 +3551,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -3565,7 +3565,7 @@
   dependencies:
     "@babel/highlight" "^7.16.0"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
@@ -9573,11 +9573,16 @@ add-stream@^1.0.0:
   resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==
 
-address@^1.0.1, address@^1.1.2:
+address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.npmjs.org/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+address@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/address/-/address-1.2.1.tgz#25bb61095b7522d65b357baa11bc05492d4c8acd"
+  integrity sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==
+
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
@@ -12247,7 +12252,7 @@ cosmiconfig@^5.2.1:
 
 cosmiconfig@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
   integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
   dependencies:
     "@types/parse-json" "^4.0.0"
@@ -12924,7 +12929,7 @@ detect-node@^2.0.4:
 
 detect-port-alt@^1.1.6:
   version "1.1.6"
-  resolved "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
+  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
   integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
   dependencies:
     address "^1.0.1"
@@ -14338,7 +14343,7 @@ filelist@^1.0.1:
 
 filesize@^8.0.6:
   version "8.0.7"
-  resolved "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
   integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
 
 fill-range@^4.0.0:
@@ -14397,7 +14402,7 @@ find-up@^2.0.0, find-up@^2.1.0:
 
 find-up@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
   integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
@@ -14468,9 +14473,9 @@ forever-agent@~0.6.1:
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 fork-ts-checker-webpack-plugin@^6.5.0:
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz#fd689e2d9de6ac76abb620909eea56438cd0f232"
-  integrity sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340"
+  integrity sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==
   dependencies:
     "@babel/code-frame" "^7.8.3"
     "@types/json-schema" "^7.0.5"
@@ -14610,7 +14615,7 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@1.0.3:
+fs-monkey@1.0.3, fs-monkey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
@@ -14986,7 +14991,7 @@ global-dirs@^3.0.0:
 
 global-modules@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
   integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
   dependencies:
     global-prefix "^3.0.0"
@@ -15386,7 +15391,7 @@ gunzip-maybe@^1.4.2:
 
 gzip-size@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
   integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
   dependencies:
     duplexer "^0.1.2"
@@ -15916,9 +15921,9 @@ immer@^9.0.12:
   integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ==
 
 immer@^9.0.7:
-  version "9.0.12"
-  resolved "https://registry.npmjs.org/immer/-/immer-9.0.12.tgz#2d33ddf3ee1d247deab9d707ca472c8c942a0f20"
-  integrity sha512-lk7UNmSbAukB5B6dh9fnh5D0bJTOFKxVg2cyJWTYrWRfhLrLMBquONcUs3aFq507hNoIZEDDh8lb8UtOizSMhA==
+  version "9.0.16"
+  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.16.tgz#8e7caab80118c2b54b37ad43e05758cdefad0198"
+  integrity sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==
 
 immutable-tuple@^0.4.9:
   version "0.4.10"
@@ -16533,7 +16538,7 @@ is-relative@^1.0.0:
 
 is-root@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
+  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
   integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
 
 is-shared-array-buffer@^1.0.1:
@@ -17854,9 +17859,9 @@ loader-utils@^2.0.0, loader-utils@^2.0.3:
     json5 "^2.1.2"
 
 loader-utils@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f"
-  integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
+  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -17868,7 +17873,7 @@ locate-path@^2.0.0:
 
 locate-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
   integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
@@ -18252,7 +18257,14 @@ media-typer@0.3.0:
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-memfs@^3.1.2, memfs@^3.4.1:
+memfs@^3.1.2:
+  version "3.4.11"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.11.tgz#3a34837ade675825d805a2c135e88cefe5e53aaf"
+  integrity sha512-GvsCITGAyDCxxsJ+X6prJexFQEhOCJaIlUbsAvjzSI5o5O7j2dle3jWvz5Z5aOdpOxW6ol3vI1+0ut+641F1+w==
+  dependencies:
+    fs-monkey "^1.0.3"
+
+memfs@^3.4.1:
   version "3.4.1"
   resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
   integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
@@ -18434,7 +18446,7 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -19538,7 +19550,7 @@ p-locate@^2.0.0:
 
 p-locate@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
   integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
@@ -20010,7 +20022,7 @@ pkg-fetch@3.2.5:
 
 pkg-up@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
   dependencies:
     find-up "^3.0.0"
@@ -21037,9 +21049,9 @@ react-app-polyfill@^3.0.0:
     regenerator-runtime "^0.13.9"
     whatwg-fetch "^3.6.2"
 
-react-dev-utils@^12.0.0:
+react-dev-utils@^12.0.1:
   version "12.0.1"
-  resolved "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
   integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
   dependencies:
     "@babel/code-frame" "^7.16.0"
@@ -21078,7 +21090,7 @@ react-dom@^17.0.2:
 
 react-error-overlay@^6.0.11:
   version "6.0.11"
-  resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
+  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
   integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
 
 react-fast-compare@^3.0.1:
@@ -21262,11 +21274,11 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 recursive-readdir@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
-  integrity sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
+  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
   dependencies:
-    minimatch "3.0.4"
+    minimatch "^3.0.5"
 
 redent@^3.0.0:
   version "3.0.0"
@@ -21883,7 +21895,7 @@ scheduler@^0.20.2:
 
 schema-utils@2.7.0:
   version "2.7.0"
-  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
   integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
   dependencies:
     "@types/json-schema" "^7.0.4"
@@ -22171,9 +22183,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
-  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8"
+  integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==
 
 shellwords@^0.1.1:
   version "0.1.1"
@@ -23136,7 +23148,7 @@ tailwindcss@^3.0.2:
 
 tapable@^1.0.0:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:

From 36bc08e12a69fabd916597b8676dac49ba70110f Mon Sep 17 00:00:00 2001
From: Zeyu Li <lizeyu@amazon.com>
Date: Mon, 21 Nov 2022 10:57:30 -0800
Subject: [PATCH 22/30] chore: bump amplify codegen to 3.3.3 (#11414)

---
 packages/amplify-cli/package.json              |  2 +-
 .../__snapshots__/studio-modelgen.test.ts.snap |  2 +-
 .../package.json                               |  2 +-
 packages/amplify-util-mock/package.json        |  2 +-
 yarn.lock                                      | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index 0d80e354c35..0efa1ffa14e 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -54,7 +54,7 @@
     "amplify-cli-core": "3.4.0",
     "amplify-cli-logger": "1.2.1",
     "amplify-cli-shared-interfaces": "1.1.0",
-    "amplify-codegen": "^3.3.2",
+    "amplify-codegen": "^3.3.3",
     "amplify-console-hosting": "2.3.5",
     "amplify-container-hosting": "2.5.6",
     "amplify-dotnet-function-runtime-provider": "1.6.10",
diff --git a/packages/amplify-e2e-tests/src/__tests__/__snapshots__/studio-modelgen.test.ts.snap b/packages/amplify-e2e-tests/src/__tests__/__snapshots__/studio-modelgen.test.ts.snap
index 3406d6886d8..f8a9b02f2d3 100644
--- a/packages/amplify-e2e-tests/src/__tests__/__snapshots__/studio-modelgen.test.ts.snap
+++ b/packages/amplify-e2e-tests/src/__tests__/__snapshots__/studio-modelgen.test.ts.snap
@@ -49,7 +49,7 @@ exports[`upload Studio CMS assets on push of Studio enabled project uploads expe
     },
     \\"enums\\": {},
     \\"nonModels\\": {},
-    \\"codegenVersion\\": \\"3.3.2\\",
+    \\"codegenVersion\\": \\"3.3.3\\",
     \\"version\\": \\"6f85ca0ee370ac8e0674a44cc5a4f6a6\\"
 };"
 `;
diff --git a/packages/amplify-provider-awscloudformation/package.json b/packages/amplify-provider-awscloudformation/package.json
index 633f90a376a..1c140684f00 100644
--- a/packages/amplify-provider-awscloudformation/package.json
+++ b/packages/amplify-provider-awscloudformation/package.json
@@ -56,7 +56,7 @@
     "@aws-cdk/region-info": "~1.172.0",
     "amplify-cli-core": "3.4.0",
     "amplify-cli-logger": "1.2.1",
-    "amplify-codegen": "^3.3.2",
+    "amplify-codegen": "^3.3.3",
     "amplify-prompts": "2.6.1",
     "amplify-util-import": "2.3.0",
     "archiver": "^5.3.0",
diff --git a/packages/amplify-util-mock/package.json b/packages/amplify-util-mock/package.json
index 71fe0c59db2..e8fdcebea0f 100644
--- a/packages/amplify-util-mock/package.json
+++ b/packages/amplify-util-mock/package.json
@@ -34,7 +34,7 @@
     "@hapi/topo": "^5.0.0",
     "amplify-category-function": "4.2.1",
     "amplify-cli-core": "3.4.0",
-    "amplify-codegen": "^3.3.2",
+    "amplify-codegen": "^3.3.3",
     "amplify-dynamodb-simulator": "2.5.1",
     "amplify-prompts": "2.6.1",
     "amplify-provider-awscloudformation": "6.9.1",
diff --git a/yarn.lock b/yarn.lock
index 3003b8b6097..4b266511f95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -181,10 +181,10 @@
     "@aws-amplify/api-graphql" "2.2.18"
     "@aws-amplify/api-rest" "2.0.29"
 
-"@aws-amplify/appsync-modelgen-plugin@2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@aws-amplify/appsync-modelgen-plugin/-/appsync-modelgen-plugin-2.3.0.tgz#7a1ce65fce338f26f48256807fb7775d10bd25e8"
-  integrity sha512-8228aL1CrJVkxfqX64U44G/Kjw0pnpWM8W4p8x9vHYhsuzTvPyH08ZS/elzytQxkDjumrxL7yhIlweRRuO8zwA==
+"@aws-amplify/appsync-modelgen-plugin@2.3.1":
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/@aws-amplify/appsync-modelgen-plugin/-/appsync-modelgen-plugin-2.3.1.tgz#b785afdc66572c1a5312a4c836eb1729527ab36e"
+  integrity sha512-bAj2d7Pa0isFAH3qqxDfIeMTu+8yYbmbOkKhh0TGBWkT6Ce8RZWdV7zeBP7txrJpWjauAcu/jjDZ8p18oa+fiQ==
   dependencies:
     "@graphql-codegen/plugin-helpers" "^1.18.8"
     "@graphql-codegen/visitor-plugin-common" "^1.22.0"
@@ -9688,12 +9688,12 @@ amdefine@>=0.0.4:
   resolved "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-amplify-codegen@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/amplify-codegen/-/amplify-codegen-3.3.2.tgz#25711da17f32b06936699ba1fcf926c86933884b"
-  integrity sha512-Jq2fNH6dUQTtEZxX6fJ/uu4MF+JRoFVFIpidaehBe6ZE+YPSNqoETqUwu+xtNDYhrT3XHPy5kCStDxXgK31uQQ==
+amplify-codegen@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.npmjs.org/amplify-codegen/-/amplify-codegen-3.3.3.tgz#47b30826801149c01cac8dd341516fdf5a8cf87a"
+  integrity sha512-mVyT4yYq3sY48YtcTXp1R1sTGGkyDhsu23Xubz9kbmhixqSj8wlkfqUTbGhlgpk44fysvzsKBp1d0TNMgLTEjA==
   dependencies:
-    "@aws-amplify/appsync-modelgen-plugin" "2.3.0"
+    "@aws-amplify/appsync-modelgen-plugin" "2.3.1"
     "@aws-amplify/graphql-docs-generator" "3.0.2"
     "@aws-amplify/graphql-types-generator" "3.0.0"
     "@graphql-codegen/core" "1.8.3"

From 091d1d68e0553c2e04e3f73db1d3b52d3655bd70 Mon Sep 17 00:00:00 2001
From: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Date: Mon, 21 Nov 2022 14:00:54 -0500
Subject: [PATCH 23/30] fix: pull project with removed notifications (#11378)

* fix: pull project with removed notifications
---
 .../src/multi-env-manager.ts                  | 67 ++++++++--------
 .../src/notifications-amplify-meta-api.ts     | 15 ++--
 .../amplify-e2e-core/src/init/amplifyPull.ts  |  3 +-
 .../__tests__/notifications-sms-pull.test.ts  | 53 +++++++++++++
 .../src/cleanup-e2e-resources.ts              | 76 ++++++++++++++++++-
 .../notifications-migration-4.test.ts         | 51 +++++++++++++
 .../notifications-helpers.ts                  | 14 ++++
 scripts/split-e2e-tests.ts                    |  1 +
 8 files changed, 234 insertions(+), 46 deletions(-)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/notifications-sms-pull.test.ts
 create mode 100644 packages/amplify-migration-tests/src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts

diff --git a/packages/amplify-category-notifications/src/multi-env-manager.ts b/packages/amplify-category-notifications/src/multi-env-manager.ts
index 5b23c86c6ec..68cc6a9621e 100644
--- a/packages/amplify-category-notifications/src/multi-env-manager.ts
+++ b/packages/amplify-category-notifications/src/multi-env-manager.ts
@@ -123,44 +123,41 @@ const constructPinpointNotificationsMeta = async (context: $TSContext) : Promise
   // from cloud meta and as no new resources are created during pull, we should not look for
   // Pinpoint app in analytics category.
   const isPulling = context.input.command === 'pull' || (context.input.command === 'env' && context.input.subCommands[0] === 'pull');
+  const currentAmplifyMeta = stateManager.getCurrentMeta(undefined, {
+    throwIfNotExist: false,
+  });
 
-  if (isPulling) {
-    const currentAmplifyMeta = stateManager.getCurrentMeta(undefined, {
-      throwIfNotExist: false,
-    });
-
-    if (currentAmplifyMeta) {
-      const currentNotificationsMeta = currentAmplifyMeta[AmplifyCategories.NOTIFICATIONS];
-
-      // We only support single Pinpoint across notifications and analytics categories
-      if (currentNotificationsMeta && Object.keys(currentNotificationsMeta).length > 0) {
-        const pinpointResource = _.get(currentNotificationsMeta, Object.keys(currentNotificationsMeta)[0], undefined);
-        // if pinpoint resource ID is not found in Notifications, we will ge it from the Analytics category
-        if (!(pinpointResource.output.Id)) {
-          const analyticsPinpointApp: Partial<ICategoryMeta>|undefined = getPinpointAppFromAnalyticsMeta(currentAmplifyMeta);
-          // eslint-disable-next-line max-depth
-          if (analyticsPinpointApp) {
-            pinpointResource.output.Id = analyticsPinpointApp.Id;
-            pinpointResource.output.Region = analyticsPinpointApp.Region;
-            pinpointResource.output.Name = analyticsPinpointApp.Name;
-            pinpointResource.ResourceName = analyticsPinpointApp.regulatedResourceName;
-          }
-        }
-
-        if (!pinpointResource.output.Id) {
-          throw new AmplifyError('ResourceNotReadyError', {
-            message: 'Pinpoint resource ID not found.',
-            resolution: 'Run "amplify add analytics" to create a new Pinpoint resource.',
-          });
+  if (isPulling && currentAmplifyMeta) {
+    const currentNotificationsMeta = currentAmplifyMeta[AmplifyCategories.NOTIFICATIONS];
+
+    // We only support single Pinpoint across notifications and analytics categories
+    if (currentNotificationsMeta && Object.keys(currentNotificationsMeta).length > 0) {
+      const pinpointResource = _.get(currentNotificationsMeta, Object.keys(currentNotificationsMeta)[0], undefined);
+      // if pinpoint resource ID is not found in Notifications, we will ge it from the Analytics category
+      if (!(pinpointResource.output.Id)) {
+        const analyticsPinpointApp: Partial<ICategoryMeta>|undefined = getPinpointAppFromAnalyticsMeta(currentAmplifyMeta);
+        // eslint-disable-next-line max-depth
+        if (analyticsPinpointApp) {
+          pinpointResource.output.Id = analyticsPinpointApp.Id;
+          pinpointResource.output.Region = analyticsPinpointApp.Region;
+          pinpointResource.output.Name = analyticsPinpointApp.Name;
+          pinpointResource.ResourceName = analyticsPinpointApp.regulatedResourceName;
         }
+      }
 
-        pinpointApp = {
-          Id: pinpointResource.output.Id,
-        };
-        pinpointApp.Name = pinpointResource.output.Name || pinpointResource.output.appName;
-        pinpointApp.Region = pinpointResource.output.Region;
-        pinpointApp.lastPushTimeStamp = pinpointResource.lastPushTimeStamp;
+      if (!pinpointResource.output.Id) {
+        throw new AmplifyError('ResourceNotReadyError', {
+          message: 'Pinpoint resource ID not found.',
+          resolution: 'Run "amplify add analytics" to create a new Pinpoint resource.',
+        });
       }
+
+      pinpointApp = {
+        Id: pinpointResource.output.Id,
+      };
+      pinpointApp.Name = pinpointResource.output.Name || pinpointResource.output.appName;
+      pinpointApp.Region = pinpointResource.output.Region;
+      pinpointApp.lastPushTimeStamp = pinpointResource.lastPushTimeStamp;
     }
   }
 
@@ -214,7 +211,7 @@ const constructPinpointNotificationsMeta = async (context: $TSContext) : Promise
       }
     }
 
-    if (pinpointApp) {
+    if (pinpointApp && (!isPulling || (isPulling && currentAmplifyMeta[AmplifyCategories.NOTIFICATIONS]))) {
       await notificationManager.pullAllChannels(context, pinpointApp);
       pinpointNotificationsMeta = {
         Name: pinpointApp.Name,
diff --git a/packages/amplify-category-notifications/src/notifications-amplify-meta-api.ts b/packages/amplify-category-notifications/src/notifications-amplify-meta-api.ts
index 8b2a28f7ec1..33c7ab20205 100644
--- a/packages/amplify-category-notifications/src/notifications-amplify-meta-api.ts
+++ b/packages/amplify-category-notifications/src/notifications-amplify-meta-api.ts
@@ -247,20 +247,21 @@ export const constructPartialNotificationsAppMeta = (
 export const constructResourceMeta = (amplifyMeta : $TSMeta,
   resourceName: string, pinpointOutput:
   Partial<ICategoryMeta>): Partial<ICategoryMeta> => {
-  const tmpAmplifyMeta = amplifyMeta;
-  if (!tmpAmplifyMeta[AmplifyCategories.NOTIFICATIONS]) {
-    tmpAmplifyMeta[AmplifyCategories.NOTIFICATIONS] = { [resourceName]: { output: {} } };
+  if (!amplifyMeta[AmplifyCategories.NOTIFICATIONS] || Object.keys(amplifyMeta[AmplifyCategories.NOTIFICATIONS]).length === 0) {
+    // eslint-disable-next-line no-param-reassign
+    amplifyMeta[AmplifyCategories.NOTIFICATIONS] = { [resourceName]: { output: {} } };
   }
-  tmpAmplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName] = {
-    ...tmpAmplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName],
+  // eslint-disable-next-line no-param-reassign
+  amplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName] = {
+    ...amplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName],
     service: AmplifySupportedService.PINPOINT,
     output: {
-      ...tmpAmplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName].output,
+      ...amplifyMeta[AmplifyCategories.NOTIFICATIONS][resourceName].output,
       ...pinpointOutput,
     },
     lastPushTimeStamp: new Date(),
   };
-  return tmpAmplifyMeta;
+  return amplifyMeta;
 };
 
 /**
diff --git a/packages/amplify-e2e-core/src/init/amplifyPull.ts b/packages/amplify-e2e-core/src/init/amplifyPull.ts
index a45e726a8e8..7863011a6cf 100644
--- a/packages/amplify-e2e-core/src/init/amplifyPull.ts
+++ b/packages/amplify-e2e-core/src/init/amplifyPull.ts
@@ -15,6 +15,7 @@ export const amplifyPull = (
     envName?: string;
     yesFlag?: boolean;
   },
+  testingWithLatestCodebase = false,
 ): Promise<void> => {
   // Note:- Table checks have been removed since they are not necessary for push/pull flows and prone to breaking because
   // of stylistic changes. A simpler content based check will be added in the future.
@@ -36,7 +37,7 @@ export const amplifyPull = (
     args.push('--yes');
   }
 
-  const chain = spawn(getCLIPath(), args, { cwd, stripColors: true });
+  const chain = spawn(getCLIPath(testingWithLatestCodebase), args, { cwd, stripColors: true });
 
   if (settings.emptyDir) {
     chain
diff --git a/packages/amplify-e2e-tests/src/__tests__/notifications-sms-pull.test.ts b/packages/amplify-e2e-tests/src/__tests__/notifications-sms-pull.test.ts
new file mode 100644
index 00000000000..9f9981c1181
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/notifications-sms-pull.test.ts
@@ -0,0 +1,53 @@
+import {
+  addNotificationChannel,
+  amplifyPull,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getAppId,
+  initJSProjectWithProfile,
+  removeAllNotificationChannel,
+} from '@aws-amplify/amplify-e2e-core';
+import {
+  getShortId,
+} from '../import-helpers';
+
+describe('notification category pull test', () => {
+  const testChannel = 'SMS';
+  const testChannelSelection = 'SMS';
+  const projectPrefix = `notification${testChannel}`.substring(0, 19);
+  const projectSettings = {
+    name: projectPrefix,
+    disableAmplifyAppCreation: false,
+  };
+
+  let projectRoot: string;
+
+  beforeEach(async () => {
+    projectRoot = await createNewProjectDir(projectPrefix);
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectRoot);
+    deleteProjectDir(projectRoot);
+  });
+
+  it(`should add and remove the ${testChannel} channel and pull in new directory`, async () => {
+    await initJSProjectWithProfile(projectRoot, projectSettings);
+
+    const settings = { resourceName: `${projectPrefix}${getShortId()}` };
+    await addNotificationChannel(projectRoot, settings, testChannelSelection);
+
+    const appId = getAppId(projectRoot);
+    expect(appId).toBeDefined();
+
+    await removeAllNotificationChannel(projectRoot);
+
+    const projectRootPull = await createNewProjectDir('removed-notifications-pull');
+    try {
+      await amplifyPull(projectRootPull, { override: false, emptyDir: true, appId });
+    } finally {
+      deleteProjectDir(projectRootPull);
+    }
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
index 04783eb1709..c04c8158048 100644
--- a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
+++ b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
@@ -11,6 +11,7 @@ import { deleteS3Bucket } from '@aws-amplify/amplify-e2e-core';
 
 // Ensure to update scripts/split-e2e-tests.ts is also updated this gets updated
 const AWS_REGIONS_TO_RUN_TESTS = [
+  'us-east-1',
   'us-east-2',
   'us-west-2',
   'eu-west-2',
@@ -59,6 +60,14 @@ type S3BucketInfo = {
   cciInfo?: CircleCIJobDetails;
 };
 
+type PinpointAppInfo = {
+  id: string;
+  name: string;
+  arn: string;
+  region: string;
+  cciInfo?: CircleCIJobDetails;
+};
+
 type IamRoleInfo = {
   name: string;
   cciInfo?: CircleCIJobDetails;
@@ -73,6 +82,7 @@ type ReportEntry = {
   stacks: Record<string, StackInfo>;
   buckets: Record<string, S3BucketInfo>;
   roles: Record<string, IamRoleInfo>;
+  pinpointApps: Record<string, PinpointAppInfo>;
 };
 
 type JobFilterPredicate = (job: ReportEntry) => boolean;
@@ -91,6 +101,7 @@ type AWSAccountInfo = {
   sessionToken: string;
 };
 
+const PINPOINT_TEST_REGEX = /integtest/;
 const BUCKET_TEST_REGEX = /test/;
 const IAM_TEST_REGEX = /!RotateE2eAwsToken-e2eTestContextRole|-integtest$|^amplify-|^eu-|^us-|^ap-/;
 const STALE_DURATION_MS = 2 * 60 * 60 * 1000; // 2 hours in milliseconds
@@ -118,6 +129,12 @@ const testRoleStalenessFilter = (resource: aws.IAM.Role): boolean => {
   return isTestResource && isStaleResource;
 };
 
+const testPinpointAppStalenessFilter = (resource: aws.Pinpoint.ApplicationResponse): boolean => {
+  const isTestResource = resource.Name.match(PINPOINT_TEST_REGEX);
+  const isStaleResource = (Date.now() - new Date(resource.CreationDate).getTime()) > STALE_DURATION_MS;
+  return isTestResource && isStaleResource;
+};
+
 /**
  * Get all S3 buckets in the account, and filter down to the ones we consider stale.
  */
@@ -138,6 +155,25 @@ const getOrphanTestIamRoles = async (account: AWSAccountInfo): Promise<IamRoleIn
   return staleRoles.map(it => ({ name: it.RoleName }));
 };
 
+const getOrphanPinpointApplications = async (account: AWSAccountInfo, region: string): Promise<PinpointAppInfo[]> => {
+  const pinpoint = new aws.Pinpoint(getAWSConfig(account, region));
+  const apps: PinpointAppInfo[] = [];
+  let nextToken = null;
+
+  do {
+    const result = await pinpoint.getApps({
+      Token: nextToken,
+    }).promise();
+    apps.push(...result.ApplicationsResponse.Item.filter(testPinpointAppStalenessFilter).map(it => ({
+      id: it.Id, name: it.Name, arn: it.Arn, region,
+    })));
+
+    nextToken = result.ApplicationsResponse.NextToken;
+  } while (nextToken);
+
+  return apps;
+};
+
 /**
  * Get the relevant AWS config object for a given account and region.
  */
@@ -342,6 +378,7 @@ const mergeResourcesByCCIJob = (
   s3Buckets: S3BucketInfo[],
   orphanS3Buckets: S3BucketInfo[],
   orphanIamRoles: IamRoleInfo[],
+  orphanPinpointApplications: PinpointAppInfo[],
 ): Record<string, ReportEntry> => {
   const result: Record<string, ReportEntry> = {};
 
@@ -412,6 +449,16 @@ const mergeResourcesByCCIJob = (
     roles: src,
   }));
 
+  const orphanPinpointApps = {
+    [ORPHAN]: orphanPinpointApplications,
+  };
+
+  _.mergeWith(result, orphanPinpointApps, (val, src, key) => ({
+    ...val,
+    jobId: key,
+    pinpointApps: src,
+  }));
+
   return result;
 };
 
@@ -527,6 +574,23 @@ const deleteBucket = async (account: AWSAccountInfo, accountIndex: number, bucke
   }
 };
 
+const deletePinpointApps = async (account: AWSAccountInfo, accountIndex: number, apps: PinpointAppInfo[]): Promise<void> => {
+  await Promise.all(apps.map(app => deletePinpointApp(account, accountIndex, app)));
+};
+
+const deletePinpointApp = async (account: AWSAccountInfo, accountIndex: number, app: PinpointAppInfo): Promise<void> => {
+  const {
+    id, name, region,
+  } = app;
+  try {
+    console.log(`[ACCOUNT ${accountIndex}] Deleting Pinpoint App ${name}`);
+    const pinpoint = new aws.Pinpoint(getAWSConfig(account, region));
+    await pinpoint.deleteApp({ ApplicationId: id }).promise();
+  } catch (e) {
+    console.log(`[ACCOUNT ${accountIndex}] Deleting pinpoint app ${name} failed with error ${e.message}`);
+  }
+};
+
 const deleteCfnStacks = async (account: AWSAccountInfo, accountIndex: number, stacks: StackInfo[]): Promise<void> => {
   await Promise.all(stacks.map(stack => deleteCfnStack(account, accountIndex, stack)));
 };
@@ -578,6 +642,10 @@ const deleteResources = async (
     if (resources.roles) {
       await deleteIamRoles(account, accountIndex, Object.values(resources.roles));
     }
+
+    if (resources.pinpointApps) {
+      await deletePinpointApps(account, accountIndex, Object.values(resources.pinpointApps));
+    }
   }
 };
 
@@ -626,8 +694,8 @@ const getAccountsToCleanup = async (): Promise<AWSAccountInfo[]> => {
     const orgAccounts = await orgApi.listAccounts().promise();
     const allAccounts = orgAccounts.Accounts;
     let nextToken = orgAccounts.NextToken;
-    while(nextToken){
-      const nextPage = await orgApi.listAccounts({"NextToken": nextToken }).promise();
+    while (nextToken) {
+      const nextPage = await orgApi.listAccounts({ NextToken: nextToken }).promise();
       allAccounts.push(...nextPage.Accounts);
       nextToken = nextPage.NextToken;
     }
@@ -672,6 +740,7 @@ const cleanupAccount = async (account: AWSAccountInfo, accountIndex: number, fil
   const appPromises = AWS_REGIONS_TO_RUN_TESTS.map(region => getAmplifyApps(account, region));
   const stackPromises = AWS_REGIONS_TO_RUN_TESTS.map(region => getStacks(account, region));
   const bucketPromise = getS3Buckets(account);
+  const orphanPinpointApplicationsPromise = AWS_REGIONS_TO_RUN_TESTS.map(region => getOrphanPinpointApplications(account, region));
   const orphanBucketPromise = getOrphanS3TestBuckets(account);
   const orphanIamRolesPromise = getOrphanTestIamRoles(account);
 
@@ -680,8 +749,9 @@ const cleanupAccount = async (account: AWSAccountInfo, accountIndex: number, fil
   const buckets = await bucketPromise;
   const orphanBuckets = await orphanBucketPromise;
   const orphanIamRoles = await orphanIamRolesPromise;
+  const orphanPinpointApplications = (await Promise.all(orphanPinpointApplicationsPromise)).flat();
 
-  const allResources = mergeResourcesByCCIJob(apps, stacks, buckets, orphanBuckets, orphanIamRoles);
+  const allResources = mergeResourcesByCCIJob(apps, stacks, buckets, orphanBuckets, orphanIamRoles, orphanPinpointApplications);
   const staleResources = _.pickBy(allResources, filterPredicate);
 
   generateReport(staleResources);
diff --git a/packages/amplify-migration-tests/src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts b/packages/amplify-migration-tests/src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts
new file mode 100644
index 00000000000..87ca903858c
--- /dev/null
+++ b/packages/amplify-migration-tests/src/__tests__/migration_tests/notifications-migration/notifications-migration-4.test.ts
@@ -0,0 +1,51 @@
+import {
+  amplifyPull,
+  amplifyPushAuth,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getAppId,
+} from '@aws-amplify/amplify-e2e-core';
+import { initJSProjectWithProfile, versionCheck } from '../../../migration-helpers';
+import { addLegacySmsNotificationChannel, removeLegacyAllNotificationChannel } from '../../../migration-helpers/notifications-helpers';
+import { getShortId } from '../../../migration-helpers/utils';
+
+describe('amplify add notifications', () => {
+  let projectRoot: string;
+  const migrateFromVersion = { v: '10.0.0' };
+  const migrateToVersion = { v: 'uninitialized' };
+
+  beforeEach(async () => {
+    projectRoot = await createNewProjectDir('notification-migration-4');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectRoot, undefined, true);
+    deleteProjectDir(projectRoot);
+  });
+
+  beforeAll(async () => {
+    await versionCheck(process.cwd(), false, migrateFromVersion);
+    await versionCheck(process.cwd(), true, migrateToVersion);
+  });
+
+  it('should pull app if notifications added and removed with an older version', async () => {
+    expect(migrateFromVersion.v).not.toEqual(migrateToVersion.v);
+    const settings = { resourceName: `notification${getShortId()}` };
+
+    await initJSProjectWithProfile(projectRoot, { disableAmplifyAppCreation: false }, false);
+    const appId = getAppId(projectRoot);
+    expect(appId).toBeDefined();
+
+    await addLegacySmsNotificationChannel(projectRoot, settings.resourceName);
+    await amplifyPushAuth(projectRoot, false);
+
+    await removeLegacyAllNotificationChannel(projectRoot);
+    const projectRootPull = await createNewProjectDir('removed-notifications-pull');
+    try {
+      await amplifyPull(projectRootPull, { override: false, emptyDir: true, appId }, true);
+    } finally {
+      deleteProjectDir(projectRootPull);
+    }
+  });
+});
diff --git a/packages/amplify-migration-tests/src/migration-helpers/notifications-helpers.ts b/packages/amplify-migration-tests/src/migration-helpers/notifications-helpers.ts
index ebf90353c18..3fcdeec932a 100644
--- a/packages/amplify-migration-tests/src/migration-helpers/notifications-helpers.ts
+++ b/packages/amplify-migration-tests/src/migration-helpers/notifications-helpers.ts
@@ -27,3 +27,17 @@ export const addLegacySmsNotificationChannel = async (
     .sendEof()
     .runAsync();
 };
+
+/**
+ * Removes all notifications channels
+ */
+export const removeLegacyAllNotificationChannel = async (
+  cwd: string,
+): Promise<void> => spawn(getCLIPath(false), ['remove', 'notifications'], { cwd, stripColors: true })
+  .wait('Choose what to remove. (Use arrow keys)')
+  .sendKeyDown() // The Pinpoint application
+  .sendCarriageReturn()
+  .wait(`Confirm that you want to delete the associated Amazon Pinpoint application`)
+  .sendConfirmYes()
+  .sendEof()
+  .runAsync();
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
index dbeaf9bb4ee..70cc6635774 100644
--- a/scripts/split-e2e-tests.ts
+++ b/scripts/split-e2e-tests.ts
@@ -87,6 +87,7 @@ const WINDOWS_TEST_ALLOWLIST: string[] = [
 
 // Ensure to update packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts is also updated this gets updated
 const AWS_REGIONS_TO_RUN_TESTS = [
+  'us-east-1',
   'us-east-2',
   'us-west-2',
   'eu-west-2',

From 256b180a8194463898cb71035441bad1f43472b2 Mon Sep 17 00:00:00 2001
From: aws-amplify-bot <aws@amazon.com>
Date: Mon, 21 Nov 2022 21:11:52 +0000
Subject: [PATCH 24/30] chore(release): Publish latest [ci skip]

 - @aws-amplify/cli@10.5.1
 - @aws-amplify/cli-internal@10.5.1
 - @aws-amplify/amplify-util-uibuilder@1.6.2
---
 packages/amplify-cli-npm/CHANGELOG.md        | 8 ++++++++
 packages/amplify-cli-npm/package.json        | 4 ++--
 packages/amplify-cli/CHANGELOG.md            | 8 ++++++++
 packages/amplify-cli/package.json            | 4 ++--
 packages/amplify-util-uibuilder/CHANGELOG.md | 8 ++++++++
 packages/amplify-util-uibuilder/package.json | 4 ++--
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/amplify-cli-npm/CHANGELOG.md b/packages/amplify-cli-npm/CHANGELOG.md
index 67b3062e24c..2847ef48eea 100644
--- a/packages/amplify-cli-npm/CHANGELOG.md
+++ b/packages/amplify-cli-npm/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.5.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@10.5.0...@aws-amplify/cli@10.5.1) (2022-11-21)
+
+**Note:** Version bump only for package @aws-amplify/cli
+
+
+
+
+
 # [10.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli@10.4.1...@aws-amplify/cli@10.5.0) (2022-11-17)
 
 
diff --git a/packages/amplify-cli-npm/package.json b/packages/amplify-cli-npm/package.json
index 5b26df6f5d5..003fdd573e0 100644
--- a/packages/amplify-cli-npm/package.json
+++ b/packages/amplify-cli-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli",
-  "version": "10.5.0",
+  "version": "10.5.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "tar-stream": "^2.2.0"
   },
   "devDependencies": {
-    "@aws-amplify/cli-internal": "10.5.0",
+    "@aws-amplify/cli-internal": "10.5.1",
     "@types/tar": "^6.1.1",
     "rimraf": "^3.0.2"
   }
diff --git a/packages/amplify-cli/CHANGELOG.md b/packages/amplify-cli/CHANGELOG.md
index 5ea129538cb..d7c85373853 100644
--- a/packages/amplify-cli/CHANGELOG.md
+++ b/packages/amplify-cli/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.5.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@10.5.0...@aws-amplify/cli-internal@10.5.1) (2022-11-21)
+
+**Note:** Version bump only for package @aws-amplify/cli-internal
+
+
+
+
+
 # [10.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/cli-internal@10.4.1...@aws-amplify/cli-internal@10.5.0) (2022-11-17)
 
 
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index ea239df583f..ab19ca80170 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/cli-internal",
-  "version": "10.5.0",
+  "version": "10.5.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "@aws-amplify/amplify-category-custom": "2.5.5",
     "@aws-amplify/amplify-category-storage": "3.6.1",
     "@aws-amplify/amplify-environment-parameters": "1.2.1",
-    "@aws-amplify/amplify-util-uibuilder": "1.6.1",
+    "@aws-amplify/amplify-util-uibuilder": "1.6.2",
     "@aws-amplify/graphql-auth-transformer": "^1.1.4",
     "@aws-cdk/cloudformation-diff": "~1.172.0",
     "amplify-app": "4.3.5",
diff --git a/packages/amplify-util-uibuilder/CHANGELOG.md b/packages/amplify-util-uibuilder/CHANGELOG.md
index ba450664091..a106f8e1dba 100644
--- a/packages/amplify-util-uibuilder/CHANGELOG.md
+++ b/packages/amplify-util-uibuilder/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.6.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.1...@aws-amplify/amplify-util-uibuilder@1.6.2) (2022-11-21)
+
+**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
+
+
+
+
+
 ## [1.6.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0...@aws-amplify/amplify-util-uibuilder@1.6.1) (2022-11-17)
 
 
diff --git a/packages/amplify-util-uibuilder/package.json b/packages/amplify-util-uibuilder/package.json
index 9319f0dc34a..750142d956b 100644
--- a/packages/amplify-util-uibuilder/package.json
+++ b/packages/amplify-util-uibuilder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -68,4 +68,4 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   }
-}
\ No newline at end of file
+}

From 4423b74b494bc10502ffa152fb5f96b2938e6984 Mon Sep 17 00:00:00 2001
From: Kamil Sobol <sobkamil@amazon.com>
Date: Mon, 21 Nov 2022 15:17:37 -0800
Subject: [PATCH 25/30] chore: fix merge commit message (#11452)

---
 scripts/finish-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/finish-release.sh b/scripts/finish-release.sh
index 448d6a94e3e..a67a59d98ec 100755
--- a/scripts/finish-release.sh
+++ b/scripts/finish-release.sh
@@ -25,7 +25,7 @@ git pull "$remote_name" dev
 git checkout -B dev-main-merge
 git fetch "$remote_name" main
 set +e
-git merge "$remote_name"/main -m "Merge release commit from main to dev"
+git merge "$remote_name"/main -m "chore: merge release commit from main to dev"
 merge_exit_code=$?
 set -e
 if [[ $merge_exit_code != 0 ]]; then

From a42d0170b3e84bec4a58a4d3ddab75b47977e07b Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Mon, 21 Nov 2022 17:24:34 -0800
Subject: [PATCH 26/30] fix: resource usage cost (#11433)

* fix: resource usage cost

* fix: register slow tests

* chore: dont wait forever, let stacks cleanup async

* chore: cleanup naming conventions for executors

* chore: cleanup naming

* chore: remove legacy logic
---
 .circleci/config.base.yml                     | 129 ++++++++++------
 .circleci/config.yml                          |   8 +-
 .../src/cleanup-e2e-resources.ts              |   3 +-
 scripts/split-e2e-tests.ts                    | 142 +++---------------
 4 files changed, 113 insertions(+), 169 deletions(-)

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index b0e97b78a9b..ada3905365f 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -17,7 +17,7 @@ parameters:
     default: true
 
 executors:
-  w: &windows-e2e-executor
+  w_medium: &windows-e2e-executor-medium
     machine:
       image: 'windows-server-2019-vs2019:stable'
       resource_class: 'windows.medium'
@@ -27,7 +27,7 @@ executors:
       AMPLIFY_DIR: C:/home/circleci/repo/out
       AMPLIFY_PATH: C:/home/circleci/repo/out/amplify.exe
 
-  winsetup: &windows-setup-executor
+  w_xlarge: &windows-e2e-executor-xlarge
     machine:
       image: 'windows-server-2019-vs2019:stable'
       resource_class: 'windows.xlarge'
@@ -36,8 +36,8 @@ executors:
     environment:
       AMPLIFY_DIR: C:/home/circleci/repo/out
       AMPLIFY_PATH: C:/home/circleci/repo/out/amplify.exe
-
-  l: &linux-e2e-executor
+# If you update this name, make sure to update it in split-e2e-tests.ts as well
+  l_large: &linux-e2e-executor-large
     docker:
       - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
     working_directory: ~/repo
@@ -45,13 +45,22 @@ executors:
     environment:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
+# If you update this name, make sure to update it in split-e2e-tests.ts as well
+  l_medium: &linux-e2e-executor-medium
+    docker:
+      - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
+    working_directory: ~/repo
+    resource_class: medium
+    environment:
+      AMPLIFY_DIR: /home/circleci/repo/out
+      AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux-x64
 
 defaults: &defaults
   working_directory: ~/repo
   parameters:
     os:
       type: executor
-      default: l
+      default: l_medium
   executor: << parameters.os >>
 
 clean_e2e_resources: &clean_e2e_resources
@@ -89,8 +98,8 @@ jobs:
     parameters:
       os:
         type: executor
-        default: l
-    executor: l
+        default: l_large
+    executor: l_large
     steps:
       - checkout
       - run: yarn run production-build
@@ -113,12 +122,12 @@ jobs:
     parameters:
       os:
         type: executor
-        default: winsetup
-    executor: winsetup
+        default: w_xlarge
+    executor: w_xlarge
     steps:
       - when:
           condition:
-            equal: [*windows-setup-executor, << parameters.os >>]
+            equal: [*windows-e2e-executor-xlarge, << parameters.os >>]
           steps:
             - checkout
             - run: yarn run production-build
@@ -132,7 +141,7 @@ jobs:
                   - .cache
                   - .ssh
   test:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -148,7 +157,7 @@ jobs:
       NODE_OPTIONS: --max-old-space-size=4096
 
   lint:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -169,7 +178,7 @@ jobs:
             yarn verify-api-extract
 
   mock_e2e_tests:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -188,7 +197,7 @@ jobs:
           path: packages/amplify-util-mock/
 
   publish_to_local_registry:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -226,7 +235,7 @@ jobs:
             - ~/repo/.amplify-pkg-version
 
   upload_pkg_binaries:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -249,7 +258,7 @@ jobs:
             - ~/repo/out
 
   build_pkg_binaries_linux:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -272,7 +281,7 @@ jobs:
             - ~/repo/out
 
   build_pkg_binaries_macos:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -295,7 +304,7 @@ jobs:
             - ~/repo/out
 
   build_pkg_binaries_win:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -318,7 +327,7 @@ jobs:
             - ~/repo/out
 
   build_pkg_binaries_arm:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -341,7 +350,7 @@ jobs:
             - ~/repo/out
 
   verify_pkg_binaries:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -404,19 +413,21 @@ jobs:
     parameters:
       os:
         type: executor
-        default: l
+        default: l_medium
     executor: << parameters.os >>
     working_directory: ~/repo
     steps:
       - when:
           condition:
-            equal: [*windows-e2e-executor, << parameters.os >>]
+            equal: [*windows-e2e-executor-medium, << parameters.os >>]
           steps:
             - attach_workspace:
                 at: ~/.
       - when:
           condition:
-            equal: [*linux-e2e-executor, << parameters.os >>]
+            or:
+              - equal: [*linux-e2e-executor-large, << parameters.os >>]
+              - equal: [*linux-e2e-executor-medium, << parameters.os >>]
           steps:
             - restore_cache:
                 key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -444,7 +455,11 @@ jobs:
       #     os: << parameters.os >>
 
   amplify_migration_tests_v5:
-    <<: *defaults
+    parameters:
+      os:
+        type: executor
+        default: l_large
+    executor: << parameters.os >>
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -470,7 +485,11 @@ jobs:
   amplify_migration_tests_v6:
     environment:
       AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify
-    <<: *defaults
+    parameters:
+      os:
+        type: executor
+        default: l_large
+    executor: << parameters.os >>
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -494,7 +513,11 @@ jobs:
     working_directory: ~/repo
 
   amplify_migration_tests_non_multi_env_layers:
-    <<: *defaults
+    parameters:
+      os:
+        type: executor
+        default: l_large
+    executor: << parameters.os >>
     environment:
       AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify
     steps:
@@ -520,7 +543,11 @@ jobs:
     working_directory: ~/repo
 
   amplify_migration_tests_multi_env_layers:
-    <<: *defaults
+    parameters:
+      os:
+        type: executor
+        default: l_large
+    executor: << parameters.os >>
     environment:
       AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify
     steps:
@@ -546,7 +573,11 @@ jobs:
     working_directory: ~/repo
 
   amplify_console_integration_tests:
-    <<: *defaults
+    parameters:
+      os:
+        type: executor
+        default: l_large
+    executor: << parameters.os >>
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -677,7 +708,7 @@ jobs:
           path: /root/aws-amplify-cypress-api/cypress/screenshots
 
   deploy:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -701,7 +732,7 @@ jobs:
             bash ./.circleci/publish.sh
       - run: *scan_e2e_test_artifacts
   github_prerelease:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -729,7 +760,7 @@ jobs:
             yarn ts-node scripts/github-prerelease.ts $version $commit
 
   github_prerelease_install_sanity_check:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -746,7 +777,7 @@ jobs:
           command: |
             amplify version
   github_release:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -761,7 +792,7 @@ jobs:
             version=$(cat .amplify-pkg-version)
             yarn ts-node scripts/github-release.ts $version $commit
   cleanup_resources:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -779,7 +810,7 @@ jobs:
     working_directory: ~/repo
 
   cleanup_resources_after_e2e_runs:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-large
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -797,7 +828,7 @@ jobs:
     working_directory: ~/repo
 
   wait_for_all:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-medium
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}
@@ -814,8 +845,8 @@ jobs:
     working_directory: ~/repo
 
 workflows:
-  version: 2
-  build_test_deploy:
+  version: 3
+  build_test_deploy_v3:
     jobs:
       - build:
           filters:
@@ -1126,11 +1157,11 @@ commands:
     parameters:
       os:
         type: executor
-        default: l
+        default: l_large
     steps:
       - when:
           condition:
-            equal: [*windows-e2e-executor, << parameters.os >>]
+            equal: [*windows-e2e-executor-medium, << parameters.os >>]
           steps:
             - run:
                 shell: powershell.exe
@@ -1151,7 +1182,9 @@ commands:
 
       - when:
           condition:
-            equal: [*linux-e2e-executor, << parameters.os >>]
+            or:
+              - equal: [*linux-e2e-executor-large, << parameters.os >>]
+              - equal: [*linux-e2e-executor-medium, << parameters.os >>]
           steps:
             - run:
                 name: Symlink Amplify packaged CLI
@@ -1169,11 +1202,11 @@ commands:
     parameters:
       os:
         type: executor
-        default: w
+        default: w_medium
     steps:
       - when:
           condition:
-            equal: [*windows-e2e-executor, << parameters.os >>]
+            equal: [*windows-e2e-executor-medium, << parameters.os >>]
           steps:
             - run:
                 shell: powershell.exe
@@ -1183,11 +1216,11 @@ commands:
     parameters:
       os:
         type: executor
-        default: l
+        default: l_medium
     steps:
       - when:
           condition:
-            equal: [*windows-e2e-executor, << parameters.os >>]
+            equal: [*windows-e2e-executor-medium, << parameters.os >>]
           steps:
             - run:
                 name: Run E2e Tests
@@ -1199,7 +1232,9 @@ commands:
                 no_output_timeout: 60m
       - when:
           condition:
-            equal: [*linux-e2e-executor, << parameters.os >>]
+            or:
+              - equal: [*linux-e2e-executor-large, << parameters.os >>]
+              - equal: [*linux-e2e-executor-medium, << parameters.os >>]
           steps:
             - run:
                 name: Run E2e Tests
@@ -1214,7 +1249,7 @@ commands:
     parameters:
       os:
         type: executor
-        default: l
+        default: l_large
     steps:
       - run:
           name: Scan E2E artifacts
@@ -1231,7 +1266,7 @@ commands:
     parameters:
       os:
         type: executor
-        default: l
+        default: l_large
     steps:
       - run:
           name: Clean job resources
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a625b8c2e2..b75cd8ddf75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -19,7 +19,7 @@ parameters:
     default: true
 
 executors:
-  linux: &linux-e2e-executor
+  l_large: &linux-e2e-executor-large
     docker:
       - image: public.ecr.aws/j4f5f3h7/amplify-cli-e2e-base-image-repo-public:latest
     working_directory: ~/repo
@@ -31,7 +31,7 @@ executors:
 # our defined job, and its steps
 jobs:
   setup:
-    executor: 'linux'
+    executor: 'l_large'
     steps:
       - checkout # checkout code
       - run: # run a command
@@ -46,7 +46,7 @@ jobs:
     parameters:
       os:
         type: executor
-        default: linux
+        default: l_large
     executor: << parameters.os >>
     steps:
       - checkout
@@ -126,7 +126,7 @@ jobs:
     parameters:
       os:
         type: executor
-        default: linux
+        default: l_large
     executor: << parameters.os >>
     steps:
       - attach_workspace:
diff --git a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
index c04c8158048..73a5d8f8c0b 100644
--- a/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
+++ b/packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts
@@ -602,7 +602,8 @@ const deleteCfnStack = async (account: AWSAccountInfo, accountIndex: number, sta
   try {
     const cfnClient = new aws.CloudFormation(getAWSConfig(account, region));
     await cfnClient.deleteStack({ StackName: stackName, RetainResources: resourceToRetain }).promise();
-    await cfnClient.waitFor('stackDeleteComplete', { StackName: stackName }).promise();
+    // we'll only wait up to 10 minutes before moving on
+    await cfnClient.waitFor('stackDeleteComplete', { StackName: stackName, $waiter: { 'maxAttempts': 20 }}).promise();
   } catch (e) {
     console.log(`Deleting CloudFormation stack ${stackName} failed with error ${e.message}`);
     if (e.code === 'ExpiredTokenException') {
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
index 70cc6635774..954e68dc8f8 100644
--- a/scripts/split-e2e-tests.ts
+++ b/scripts/split-e2e-tests.ts
@@ -85,6 +85,22 @@ const WINDOWS_TEST_ALLOWLIST: string[] = [
   'auth_5f_pkg',
 ];
 
+// some tests may require a larger executor, specify those here
+const JOBS_RUNNING_ON_LINUX_LARGE_VM: string[] = [
+  'api-migration-a_v6',
+  'auth_migration_update_v6',
+  'function-migration_pkg',
+  'geo-add-f_pkg',
+  'geo-import-1_pkg',
+  'import_auth_2_pkg',
+  'import_s3_2a_pkg',
+  'model-migration_pkg',
+  'notifications-migration-2_v5',
+  'schema-auth-14_pkg',
+  'schema-auth-15_pkg',
+  'schema-searchable_pkg',
+];
+
 // Ensure to update packages/amplify-e2e-tests/src/cleanup-e2e-resources.ts is also updated this gets updated
 const AWS_REGIONS_TO_RUN_TESTS = [
   'us-east-1',
@@ -115,100 +131,6 @@ const USE_PARENT_ACCOUNT = [
   'storage',
 ];
 
-// This array needs to be update periodically when new tests suites get added
-// or when a test suite changes drastically
-
-const KNOWN_SUITES_SORTED_ACCORDING_TO_RUNTIME = [
-  //<10m
-  'src/__tests__/plugin.test.ts',
-  'src/__tests__/init-special-case.test.ts',
-  'src/__tests__/datastore-modelgen.test.ts',
-  'src/__tests__/amplify-configure.test.ts',
-  'src/__tests__/tags.test.ts',
-  'src/__tests__/notifications.test.ts',
-  'src/__tests__/geo-headless.test.ts',
-  //<15m
-  'src/__tests__/schema-versioned.test.ts',
-  'src/__tests__/schema-data-access-patterns.test.ts',
-  'src/__tests__/interactions.test.ts',
-  'src/__tests__/schema-predictions.test.ts',
-  'src/__tests__/amplify-app.test.ts',
-  'src/__tests__/hosting.test.ts',
-  'src/__tests__/analytics.test.ts',
-  'src/__tests__/schema-iterative-update-2.test.ts',
-  'src/__tests__/containers-api.test.ts',
-  //<20m
-  'src/__tests__/predictions.test.ts',
-  'src/__tests__/hostingPROD.test.ts',
-  'src/__tests__/geo-update.test.ts',
-  'src/__tests__/geo-remove.test.ts',
-  'src/__tests__/geo-multi-env.test.ts',
-  //<25m
-  'src/__tests__/schema-key.test.ts',
-  'src/__tests__/function_3.test.ts',
-  'src/__tests__/schema-iterative-update-1.test.ts',
-  //<30m
-  'src/__tests__/schema-auth-3.test.ts',
-  'src/__tests__/function_2.test.ts',
-  'src/__tests__/auth_3.test.ts',
-  //<35m
-  'src/__tests__/migration/api.key.migration1.test.ts',
-  'src/__tests__/auth_4.test.ts',
-  'src/__tests__/auth_5e.test.ts',
-  'src/__tests__/schema-auth-7.test.ts',
-  'src/__tests__/api_3.test.ts',
-  'src/__tests__/import_auth_1.test.ts',
-  'src/__tests__/import_auth_2.test.ts',
-  'src/__tests__/import_s3_1.test.ts',
-  'src/__tests__/import_dynamodb_1.test.ts',
-  'src/__tests__/schema-iterative-rollback-1.test.ts',
-  //<40m
-  'src/__tests__/geo-import.test.ts',
-  'src/__tests__/schema-iterative-rollback-2.test.ts',
-  'src/__tests__/auth_2.test.ts',
-  'src/__tests__/migration/api.key.migration2.test.ts',
-  'src/__tests__/migration/api.key.migration3.test.ts',
-  'src/__tests__/function_1.test.ts',
-  'src/__tests__/function_4.test.ts',
-  //<45m
-  'src/__tests__/schema-function.test.ts',
-  'src/__tests__/migration/api.connection.migration.test.ts',
-  'src/__tests__/schema-connection.test.ts',
-  'src/__tests__/schema-iterative-update-3.test.ts',
-  'src/__tests__/schema-auth-1.test.ts',
-  //<50m
-  'src/__tests__/schema-auth-2.test.ts',
-  'src/__tests__/api_1.test.ts',
-  //<55m
-  'src/__tests__/storage.test.ts',
-  'src/__tests__/api_2.test.ts',
-  'src/__tests__/api_5.test.ts',
-  'src/__tests__/schema-iterative-update-4.test.ts',
-  'src/__tests__/schema-auth-10.test.ts',
-  //<2h
-  'src/__tests__/function_9.test.ts',
-  'src/__tests__/api_9.test.ts',
-  'src/__tests__/auth_6.test.ts',
-  'src/__tests__/delete.test.ts',
-  'src/__tests__/feature-flags.test.ts',
-  'src/__tests__/layer.test.ts',
-  'src/__tests__/schema-searchable.test.ts',
-  'src/__tests__/api_migration_update.test.ts',
-];
-
-/**
- * Sorts the test suite in ascending order. If the test is not included in known
- * tests it would be inserted at the begining o the array
- * @param tesSuites an array of test suites
- */
-function sortTestsBasedOnTime(tesSuites: string[]): string[] {
-  return tesSuites.sort((a, b) => {
-    const aIndx = KNOWN_SUITES_SORTED_ACCORDING_TO_RUNTIME.indexOf(a);
-    const bIndx = KNOWN_SUITES_SORTED_ACCORDING_TO_RUNTIME.indexOf(b);
-    return aIndx - bIndx;
-  });
-}
-
 export type WorkflowJob =
   | {
       [name: string]: {
@@ -235,7 +157,7 @@ export type CircleCIConfig = {
 const repoRoot = join(__dirname, '..');
 
 function getTestFiles(dir: string, pattern = 'src/**/*.test.ts'): string[] {
-  return sortTestsBasedOnTime(glob.sync(pattern, { cwd: dir })).reverse();
+  return glob.sync(pattern, { cwd: dir });
 }
 
 function generateJobName(baseName: string, testSuitePath: string): string {
@@ -331,17 +253,18 @@ function splitTests(
       Object.values(jobByRegion).forEach(regionJobs => {
         const newJobNames = Object.keys(regionJobs as object);
         const jobs = newJobNames.map((newJobName, index) => {
-          const requires = getRequiredJob(newJobNames, index, concurrency);
           if (typeof workflowJob === 'string') {
             return newJobName;
           } else {
+            // for the most up-to-date list of executors for e2e, see the config.base.yml file
+            let linuxVMSize = JOBS_RUNNING_ON_LINUX_LARGE_VM.includes(newJobName) ? 'l_large' : 'l_medium';
             return {
               [newJobName]: {
                 ...Object.values(workflowJob)[0],
-                requires: [...(requires ? [requires] : workflowJob[jobName].requires || [])],
+                requires: workflowJob[jobName].requires || [],
                 matrix: {
                   parameters: {
-                    os: WINDOWS_TEST_ALLOWLIST.includes(newJobName) ? ['l', 'w'] : ['l'],
+                    os: WINDOWS_TEST_ALLOWLIST.includes(newJobName) ? [linuxVMSize, 'w_medium'] : [linuxVMSize],
                   },
                 },
               },
@@ -414,21 +337,6 @@ function replaceWorkflowDependency(jobs: WorkflowJob[], jobName: string, jobsToR
   });
 }
 
-/**
- * Helper function that creates requires block for jobs to limit the concurrency of jobs in circle ci
- * @param jobNames - An array of jobs
- * @param index - current index of the job
- * @param concurrency - number of parallel jobs allowed
- */
-function getRequiredJob(jobNames: string[], index: number, concurrency: number = 4): string | void {
-  const mod = index % concurrency;
-  const mult = Math.floor(index / concurrency);
-  if (mult > 0) {
-    const prevIndex = (mult - 1) * concurrency + mod;
-    return jobNames[prevIndex];
-  }
-}
-
 function loadConfig(): CircleCIConfig {
   const configFile = join(repoRoot, '.circleci', 'config.base.yml');
   return <CircleCIConfig>yaml.load(fs.readFileSync(configFile, 'utf8'));
@@ -475,21 +383,21 @@ function main(): void {
   const splitPkgTests = splitTests(
     config,
     'amplify_e2e_tests_pkg',
-    'build_test_deploy',
+    'build_test_deploy_v3',
     join(repoRoot, 'packages', 'amplify-e2e-tests'),
     CONCURRENCY,
   );
   const splitGqlTests = splitTests(
     splitPkgTests,
     'graphql_e2e_tests',
-    'build_test_deploy',
+    'build_test_deploy_v3',
     join(repoRoot, 'packages', 'graphql-transformers-e2e-tests'),
     CONCURRENCY,
   );
   const splitV5MigrationTests = splitTests(
     splitGqlTests,
     'amplify_migration_tests_v5',
-    'build_test_deploy',
+    'build_test_deploy_v3',
     join(repoRoot, 'packages', 'amplify-migration-tests'),
     CONCURRENCY,
     true,
@@ -497,7 +405,7 @@ function main(): void {
   const splitV6MigrationTests = splitTests(
     splitV5MigrationTests,
     'amplify_migration_tests_v6',
-    'build_test_deploy',
+    'build_test_deploy_v3',
     join(repoRoot, 'packages', 'amplify-migration-tests'),
     CONCURRENCY,
     true,

From 4a4bd618c88239ebb75e728bd265f039f34ee5b3 Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Mon, 21 Nov 2022 19:56:44 -0800
Subject: [PATCH 27/30] chore: update to match new executor naming (#11454)

---
 .circleci/config.base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index ada3905365f..5a5f57ce75a 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -166,7 +166,7 @@ jobs:
       - run: chmod +x .circleci/lint_pr.sh && ./.circleci/lint_pr.sh
 
   verify-api-extract:
-    <<: *linux-e2e-executor
+    <<: *linux-e2e-executor-medium
     steps:
       - restore_cache:
           key: amplify-cli-repo-{{ .Branch }}-{{ .Revision }}

From b49a5d2ed5a74066692db8e161e5f102271c1352 Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Fri, 25 Nov 2022 11:19:36 -0800
Subject: [PATCH 28/30] chore: optimize bottlenecks in CI  (#11465)

* chore: fix e2e scanning to ignore node modules

* chore: skip teardown in favor of cleanup script for opensearch tests

* chore: update ignore list

* chore: add escape chars

* chore: exclude out dir

* chore: add yarn and other 3rd party paths to exclude list

* chore: enforce artifact scanning rules

* chore: fix relative pathing

* chore: fix comment

* chore: fix pathing on windows

* chore: cleanup, documentation

* chore: fix typo

* chore: fix typo
---
 .circleci/config.base.yml                     | 26 ++++-----
 .circleci/scan_artifacts.ts                   | 37 ++++++++++---
 .../graphql-v2/searchable-datastore.test.ts   |  9 ++-
 .../src/__tests__/schema-searchable.test.ts   |  9 ++-
 scripts/artifact-storage-path-allow-list.ts   | 47 ++++++++++++++++
 scripts/split-e2e-tests.ts                    | 55 +++++++++++++++++++
 6 files changed, 159 insertions(+), 24 deletions(-)
 create mode 100644 scripts/artifact-storage-path-allow-list.ts

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index 5a5f57ce75a..1c3fff78a4a 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -194,7 +194,7 @@ jobs:
           environment:
             JEST_JUNIT_OUTPUT: 'reports/junit/js-test-results.xml'
       - store_test_results:
-          path: packages/amplify-util-mock/
+          path: ~/repo/packages/amplify-util-mock/
 
   publish_to_local_registry:
     <<: *linux-e2e-executor-large
@@ -385,7 +385,7 @@ jobs:
             AMPLIFY_CLI_DISABLE_LOGGING: 'true'
           no_output_timeout: 90m
       - store_test_results:
-          path: packages/graphql-transformers-e2e-tests/
+          path: ~/repo/packages/graphql-transformers-e2e-tests/
   amplify_sudo_install_test:
     <<: *defaults
     steps:
@@ -448,9 +448,9 @@ jobs:
       - scan_e2e_test_artifacts:
           os: << parameters.os >>
       - store_test_results:
-          path: packages/amplify-e2e-tests/
+          path: ~/repo/packages/amplify-e2e-tests/
       - store_artifacts:
-          path: packages/amplify-e2e-tests/amplify-e2e-reports
+          path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
       # - clean_e2e_resources:
       #     os: << parameters.os >>
 
@@ -477,7 +477,7 @@ jobs:
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
-          path: packages/amplify-migration-tests/
+          path: ~/repo/packages/amplify-migration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
     working_directory: ~/repo
@@ -507,7 +507,7 @@ jobs:
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
-          path: packages/amplify-migration-tests/
+          path: ~/repo/packages/amplify-migration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
     working_directory: ~/repo
@@ -537,7 +537,7 @@ jobs:
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
-          path: packages/amplify-migration-tests/
+          path: ~/repo/packages/amplify-migration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
     working_directory: ~/repo
@@ -567,7 +567,7 @@ jobs:
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
-          path: packages/amplify-migration-tests/
+          path: ~/repo/packages/amplify-migration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
     working_directory: ~/repo
@@ -596,7 +596,7 @@ jobs:
           no_output_timeout: 90m
       - run: *scan_e2e_test_artifacts
       - store_test_results:
-          path: packages/amplify-console-integration-tests/
+          path: ~/repo/packages/amplify-console-integration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-console-integration-tests/console-integration-reports
     working_directory: ~/repo
@@ -699,13 +699,13 @@ jobs:
       - run: expect .circleci/delete_api.exp
       - run: *scan_e2e_test_artifacts
       - store_artifacts:
-          path: /root/aws-amplify-cypress-auth/cypress/videos
+          path: ~/aws-amplify-cypress-auth/cypress/videos
       - store_artifacts:
-          path: /root/aws-amplify-cypress-auth/cypress/screenshots
+          path: ~/aws-amplify-cypress-auth/cypress/screenshots
       - store_artifacts:
-          path: /root/aws-amplify-cypress-api/cypress/videos
+          path: ~/aws-amplify-cypress-api/cypress/videos
       - store_artifacts:
-          path: /root/aws-amplify-cypress-api/cypress/screenshots
+          path: ~/aws-amplify-cypress-api/cypress/screenshots
 
   deploy:
     <<: *linux-e2e-executor-large
diff --git a/.circleci/scan_artifacts.ts b/.circleci/scan_artifacts.ts
index 3149466d248..104708b656c 100755
--- a/.circleci/scan_artifacts.ts
+++ b/.circleci/scan_artifacts.ts
@@ -1,12 +1,22 @@
 import * as execa from 'execa';
 import * as path from 'path';
-const DEFAULT_SEARCH_FOLDER = path.normalize(path.join(__dirname, '..'));
+
+// This list contains a platform agnostic list of paths where artifacts are stored after each test.
+import { ARTIFACT_STORAGE_PATH_ALLOW_LIST } from '../scripts/artifact-storage-path-allow-list';
+
+// ROOT_FOLDER_ABSOLUTE_PATH resolves to the absolute value of ~
+// This is because of the location of this file in ~/repo/.circleci/scan_artifacts
+const ROOT_FOLDER_ABSOLUTE_PATH = path.normalize(path.join(__dirname, '..', '..'));
+
+
 export const hasMatchingContentInFolder = (
   patterns: string[],
-  folder = DEFAULT_SEARCH_FOLDER,
-  excludeFolder = '{*/node_modules,.git}',
+  folder: string,
+  excludeFolder = '{node_modules,.cache,.git,\.cache,\.git}',
 ): boolean => {
+  console.log("Scanning folder:", folder);
   const patternParam = patterns.reduce<string[]>((acc, v) => [...acc, '-e', v], []);
+
   try {
     execa.sync('grep', ['-r', `--exclude-dir=${excludeFolder}`, ...patternParam, folder]);
     return true;
@@ -15,6 +25,10 @@ export const hasMatchingContentInFolder = (
     if (e.exitCode === 1) {
       return false;
     }
+    if (e.message.includes('No such file or directory')){
+      console.log("No artifacts found at:", folder);
+      return false;
+    }
     throw new Error('Scanning artifacts failed');
   }
 };
@@ -23,10 +37,19 @@ const main = () => {
   const envVarNameWithCredentialValues = (process.env.ENV_VAR_WITH_SECRETS || '').split(',').map(v => v.trim());
   const values = envVarNameWithCredentialValues.map(v => process.env[v]).filter(Boolean);
   if (values.length) {
-    const hasContent = hasMatchingContentInFolder(values);
-    if (hasContent) {
-      console.log('Scanning artifact has found secret value. Failing the build');
-      process.exit(1);
+    for(let folder of ARTIFACT_STORAGE_PATH_ALLOW_LIST){
+      if (folder.startsWith("~/")) {
+        const normalizedFolder = path.normalize(folder.replace("~", ROOT_FOLDER_ABSOLUTE_PATH));
+        const hasContent = hasMatchingContentInFolder(values, normalizedFolder);
+        if (hasContent) {
+          console.log('Scanning artifact has found secret value. Failing the build: ', normalizedFolder);
+          process.exit(1);
+        }
+      } else {
+        console.log('Paths in ARTIFACT_STORAGE_PATH_ALLOW_LIST must start with ~/');
+        console.log('Update the path to use ~/ and make sure to do the same in the config.yaml/config.base.yaml files');
+        process.exit(1);
+      }
     }
   }
 };
diff --git a/packages/amplify-e2e-tests/src/__tests__/graphql-v2/searchable-datastore.test.ts b/packages/amplify-e2e-tests/src/__tests__/graphql-v2/searchable-datastore.test.ts
index 152c709cafd..a2a4c57098b 100644
--- a/packages/amplify-e2e-tests/src/__tests__/graphql-v2/searchable-datastore.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/graphql-v2/searchable-datastore.test.ts
@@ -26,8 +26,13 @@ describe('transformer model searchable migration test', () => {
   });
 
   afterEach(async () => {
-    await deleteProject(projRoot);
-    deleteProjectDir(projRoot);
+    if (process.env.CIRCLECI) {
+      console.log('Skipping cloud deletion since we are in CI, and cleanup script will delete this stack in cleanup step.');
+      deleteProjectDir(projRoot);
+    } else {
+      await deleteProject(projRoot);
+      deleteProjectDir(projRoot);
+    }
   });
 
   it('migration of searchable directive - search should return expected results', async () => {
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-searchable.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-searchable.test.ts
index 90eaa4e9bd5..3bec1deb3bd 100644
--- a/packages/amplify-e2e-tests/src/__tests__/schema-searchable.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-searchable.test.ts
@@ -12,8 +12,13 @@ describe('api directives @searchable', () => {
   });
 
   afterEach(async () => {
-    await deleteProject(projectDir);
-    deleteProjectDir(projectDir);
+    if (process.env.CIRCLECI) {
+      console.log('Skipping cloud deletion since we are in CI, and cleanup script will delete this stack in cleanup step.');
+      deleteProjectDir(projectDir);
+    } else {
+      await deleteProject(projectDir);
+      deleteProjectDir(projectDir);
+    }
   });
 
   it('searchable usage', async () => {
diff --git a/scripts/artifact-storage-path-allow-list.ts b/scripts/artifact-storage-path-allow-list.ts
new file mode 100644
index 00000000000..325b0521ccc
--- /dev/null
+++ b/scripts/artifact-storage-path-allow-list.ts
@@ -0,0 +1,47 @@
+/**
+ * Circle CI allows you to store test results & artifacts after each job,
+ * but we need to scan those results/artifacts before we upload those files.
+ * 
+ * You must register all paths where artifacts will be stored, using ~ as the root folder.
+ * 
+ * For example:
+ * In config.base.yaml, we have a job 'amplify_e2e_tests_pkg' with the following steps:
+ *  - run_e2e_tests:
+ *    os: << parameters.os >>
+ *  - scan_e2e_test_artifacts:
+ *      os: << parameters.os >>
+ *  - store_test_results:
+ *      path: ~/repo/packages/amplify-e2e-tests/
+ *  - store_artifacts:
+ *      path: ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
+ * 
+ * From the above job, 'path' includes the following:
+ *  ~/repo/packages/amplify-e2e-tests/
+ *  ~/repo/packages/amplify-e2e-tests/amplify-e2e-reports
+ * 
+ * Those paths must be included in this list.
+ * 
+ * This ensures that we will scan all of these directories before uploading any files.
+ * 
+ * If you try to upload artifacts from a directory that is not listed below, your build 
+ * will not execute, and you'll be prompted to update this list.
+ * 
+ * NOTE: Make sure to use '~' as the first segment in your paths, 
+ * this allows for path resolution in both linux & windows machines.
+ * You do not need to include pathing for Windows, as the scanning script
+ * will automatically normalize these paths for Windows if it detects it.
+ */
+export const ARTIFACT_STORAGE_PATH_ALLOW_LIST = [
+    '~/repo/packages/amplify-util-mock/',
+    '~/repo/packages/graphql-transformers-e2e-tests/',
+    '~/repo/packages/amplify-e2e-tests/',
+    '~/repo/packages/amplify-e2e-tests/amplify-e2e-reports',
+    '~/repo/packages/amplify-migration-tests/',
+    '~/repo/packages/amplify-migration-tests/amplify-migration-reports',
+    '~/repo/packages/amplify-console-integration-tests/',
+    '~/repo/packages/amplify-console-integration-tests/console-integration-reports',
+    '~/aws-amplify-cypress-auth/cypress/videos',
+    '~/aws-amplify-cypress-auth/cypress/screenshots',
+    '~/aws-amplify-cypress-api/cypress/videos',
+    '~/aws-amplify-cypress-api/cypress/screenshots'
+]
\ No newline at end of file
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
index 954e68dc8f8..8602340f850 100644
--- a/scripts/split-e2e-tests.ts
+++ b/scripts/split-e2e-tests.ts
@@ -3,6 +3,7 @@ import * as glob from 'glob';
 import { join } from 'path';
 import * as fs from 'fs-extra';
 import * as execa from 'execa';
+import { ARTIFACT_STORAGE_PATH_ALLOW_LIST } from './artifact-storage-path-allow-list';
 
 const CONCURRENCY = 35;
 // Some our e2e tests are known to fail when run on windows hosts
@@ -378,8 +379,62 @@ function verifyConfig() {
   }
 }
 
+function validateArtifactStoragePaths(config: CircleCIConfig) {
+  // make sure that only valid paths are used to store artifacts/results
+  const storagePathsUsedInConfig = new Set();
+  const unregisteredPaths = new Set();
+  const invalidPaths = new Set();
+  for(let key of Object.keys(config.jobs)) {
+    const job = config.jobs[key];
+    const steps = job.steps;
+    
+    for(let i = 0; i < steps.length; i ++){
+      const resultsPath = steps[i].store_test_results;
+      const artifactsPath = steps[i].store_artifacts;
+      if(resultsPath){
+        storagePathsUsedInConfig.add(resultsPath.path);
+        if(ARTIFACT_STORAGE_PATH_ALLOW_LIST.indexOf(resultsPath.path) === -1){
+          unregisteredPaths.add(resultsPath.path);
+        }
+        if (!resultsPath.path.startsWith("~/")){
+          invalidPaths.add(resultsPath.path);
+        }
+      }
+      if(artifactsPath){
+        storagePathsUsedInConfig.add(artifactsPath.path);
+        if(ARTIFACT_STORAGE_PATH_ALLOW_LIST.indexOf(artifactsPath.path) === -1){
+          unregisteredPaths.add(artifactsPath.path);
+        }
+        if (!artifactsPath.path.startsWith("~/")){
+          invalidPaths.add(artifactsPath.path);
+        }
+      }
+    }
+  }
+  if(unregisteredPaths.size > 0 || invalidPaths.size > 0){
+    console.log("There are errors in your configuration.\n");
+
+    if(invalidPaths.size > 0){
+      const errors = Array.from(invalidPaths);
+      console.log("Fix these paths. They must start with ~/",errors, "\n");
+    }
+    if(unregisteredPaths.size > 0){
+      const newList = Array.from(storagePathsUsedInConfig);
+      const unregisteredList = Array.from(unregisteredPaths);
+      console.log("You are storing artifacts in an unregistered location.");
+      console.log("Please update artifact-storage-path-allow-list.ts to include the new storage paths.");
+      console.log("Update the list to match this:", newList);
+      console.log("Doing so will register these unregistered paths:", unregisteredList);
+    }
+    process.exit(1);
+  }
+}
+
 function main(): void {
   const config = loadConfig();
+  
+  validateArtifactStoragePaths(config);
+
   const splitPkgTests = splitTests(
     config,
     'amplify_e2e_tests_pkg',

From 7e3e3998caf0fd3cfa9e995b1ddd7dd2410a33e8 Mon Sep 17 00:00:00 2001
From: Phani Srikar Edupuganti <55896475+phani-srikar@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:07:24 -0800
Subject: [PATCH 29/30] fix: searchable mock packaging (#11472)

* fix: rename the src folder of searchable lambda resource

* fix: move early return logic to caller method

* test: add unit test for resource dir change
---
 .../{src => source-files}/index.py            |  0
 .../{src => source-files}/setup.py            |  0
 .../CFNParser/appsync-resource-processor.ts   | 11 ++--
 .../src/__tests__/api/api.test.ts             | 51 +++++++++++++++++++
 packages/amplify-util-mock/src/api/api.ts     | 19 ++++++-
 5 files changed, 74 insertions(+), 7 deletions(-)
 rename packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/{src => source-files}/index.py (100%)
 rename packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/{src => source-files}/setup.py (100%)
 create mode 100644 packages/amplify-util-mock/src/__tests__/api/api.test.ts

diff --git a/packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/src/index.py b/packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/source-files/index.py
similarity index 100%
rename from packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/src/index.py
rename to packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/source-files/index.py
diff --git a/packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/src/setup.py b/packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/source-files/setup.py
similarity index 100%
rename from packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/src/setup.py
rename to packages/amplify-util-mock/resources/mock-searchable-lambda-trigger/source-files/setup.py
diff --git a/packages/amplify-util-mock/src/CFNParser/appsync-resource-processor.ts b/packages/amplify-util-mock/src/CFNParser/appsync-resource-processor.ts
index 99905ec7b89..f037e7126c0 100644
--- a/packages/amplify-util-mock/src/CFNParser/appsync-resource-processor.ts
+++ b/packages/amplify-util-mock/src/CFNParser/appsync-resource-processor.ts
@@ -111,7 +111,10 @@ export function processCloudFormationResults(resources, transformResult) {
       content: content as string,
     });
   });
-  configureSearchEnabledTables(transformResult, processedResources);
+
+  if (searchableModelExists(transformResult)) {
+    return configureSearchEnabledTables(transformResult, processedResources);
+  }
 
   return processedResources;
 }
@@ -154,10 +157,7 @@ export function processTransformerStacks(transformResult, params = {}): AmplifyA
   return processCloudFormationResults(processedStacks.resources, transformResult);
 }
 
-export function configureSearchEnabledTables(transformResult: $TSAny, processedResources: AmplifyAppSyncSimulatorConfig): void {
-  if (!searchableModelExists(transformResult)) {
-    return;
-  }
+export function configureSearchEnabledTables(transformResult: $TSAny, processedResources: AmplifyAppSyncSimulatorConfig): AmplifyAppSyncSimulatorConfig {
   const searchableStackResources = Object.keys(transformResult?.stacks?.SearchableStack?.Resources);
   processedResources.tables = processedResources?.tables?.map( (table: $TSAny) => {
     const tableName = table?.Properties?.TableName;
@@ -167,6 +167,7 @@ export function configureSearchEnabledTables(transformResult: $TSAny, processedR
       isSearchable: searchableStackResources?.findIndex(resource => resource?.startsWith(eventSourceMappingPrefix)) !== -1
     }
   });
+  return processedResources;
 }
 
 export function searchableModelExists(transformResult: $TSAny): boolean {
diff --git a/packages/amplify-util-mock/src/__tests__/api/api.test.ts b/packages/amplify-util-mock/src/__tests__/api/api.test.ts
new file mode 100644
index 00000000000..168bf490458
--- /dev/null
+++ b/packages/amplify-util-mock/src/__tests__/api/api.test.ts
@@ -0,0 +1,51 @@
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import { $TSContext, pathManager } from 'amplify-cli-core';
+import { APITest } from '../../api/api';
+import * as lambdaInvoke from '../../api/lambda-invoke';
+import { getMockSearchableTriggerDirectory } from '../../utils';
+
+jest.mock('amplify-cli-core');
+jest.mock('amplify-dynamodb-simulator', () => jest.fn());
+jest.mock('fs-extra');
+
+const mockProjectRoot = 'mock-app';
+const mockContext = {
+  amplify: {
+    getEnvInfo: jest.fn().mockReturnValue({ projectPath: mockProjectRoot }),
+    loadRuntimePlugin: jest.fn().mockReturnValue({})
+  }
+} as unknown as $TSContext;
+
+describe('Test Mock API methods', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    pathManager.getAmplifyPackageLibDirPath = jest.fn().mockReturnValue('backend');
+  });
+
+  it('attempts to copy searchable lambda trigger artifacts correctly', async () => {
+    const searchableLambdaResourceDir = path.resolve(__dirname, '..', '..', '..', 'resources', 'mock-searchable-lambda-trigger');
+    const mockSearchableTriggerDirectory = getMockSearchableTriggerDirectory(mockContext);
+
+    const testApi = new APITest();
+    const testApiProto = Object.getPrototypeOf(testApi);
+    jest.spyOn(lambdaInvoke, 'buildLambdaTrigger').mockResolvedValueOnce();
+    await testApiProto.createMockSearchableArtifacts(mockContext);
+
+    expect(fs.copySync).toBeCalledTimes(2);
+
+    // copies the pipfile artifact from correct location
+    expect(fs.copySync).toBeCalledWith(
+      path.join(searchableLambdaResourceDir, 'Pipfile'),
+      path.join(mockSearchableTriggerDirectory, 'Pipfile'),
+      { overwrite: true }
+    );
+
+    // copies the source files artifacts from correct location
+    expect(fs.copySync).toBeCalledWith(
+      path.join(searchableLambdaResourceDir, 'source-files'),
+      path.join(mockSearchableTriggerDirectory, 'src'),
+      { overwrite: true }
+    );
+  });
+});
\ No newline at end of file
diff --git a/packages/amplify-util-mock/src/api/api.ts b/packages/amplify-util-mock/src/api/api.ts
index f51e6511ebe..05f7843e531 100644
--- a/packages/amplify-util-mock/src/api/api.ts
+++ b/packages/amplify-util-mock/src/api/api.ts
@@ -446,12 +446,27 @@ export class APITest {
   }
 
   private async createMockSearchableArtifacts(context: $TSContext) {
-    const opensearchLocalDirectory = opensearchEmulator.getOpensearchLocalDirectory();
+    const opensearchLocalDirectory = opensearchEmulator?.getOpensearchLocalDirectory();
     fs.ensureDirSync(opensearchLocalDirectory);
     const mockSearchableTriggerDirectory = getMockSearchableTriggerDirectory(context);
     fs.ensureDirSync(mockSearchableTriggerDirectory);
+    fs.ensureDirSync(path.join(mockSearchableTriggerDirectory, 'src'));
     const searchableLambdaResourceDir = path.resolve(__dirname, '..', '..', 'resources', 'mock-searchable-lambda-trigger');
-    fs.copySync(searchableLambdaResourceDir, mockSearchableTriggerDirectory, { overwrite: true });
+
+    // copy the Pipfile first
+    const pipFileName = 'Pipfile';
+    fs.copySync(
+      path.join(searchableLambdaResourceDir, pipFileName), 
+      path.join(mockSearchableTriggerDirectory, pipFileName),
+      { overwrite: true }
+    );
+
+    // copy the source files
+    fs.copySync(
+      path.join(searchableLambdaResourceDir, 'source-files'), 
+      path.join(mockSearchableTriggerDirectory, 'src'),
+      { overwrite: true }
+    );
 
     // build the searchable lambda trigger
     const triggerConfig = getSearchableLambdaTriggerConfig(context, null);

From 6eec17e763db23aee8c2f61a6929dbf19a00c8df Mon Sep 17 00:00:00 2001
From: awsluja <110861985+awsluja@users.noreply.github.com>
Date: Fri, 25 Nov 2022 13:48:15 -0800
Subject: [PATCH 30/30] chore: increase test splitting & improve concurrency
 (#11468)

* chore: fix e2e scanning to ignore node modules

* chore: skip teardown in favor of cleanup script for opensearch tests

* chore: update ignore list

* chore: add escape chars

* chore: exclude out dir

* chore: add yarn and other 3rd party paths to exclude list

* chore: enforce artifact scanning rules

* chore: fix relative pathing

* chore: fix comment

* chore: fix pathing on windows

* chore: split schema-auth-7

* chore: split auth-3 test

* chore: split auth-4 tests

* chore: split function_2 test

* chore: lint fixes

* chore: increase fan out time

* chore: split schema-auth-1 tests

* chore: disable retries to identify bottlenecks

* chore: split schema-auth-2 test

* chore: split api_9 test

* chore: fix hanging caused by jest bug

* chore: split auth 8 test

* chore: split geo-import-1 test

* chore: re-enable retries

* chore: split function_9 test

* chore: split auth 1, 2 tests

* chore: cleanup, documentation

* chore: fix typo

* chore: fix typo

* chore: fix snapshot
---
 .circleci/config.base.yml                     |   6 +-
 .circleci/local_publish_helpers.sh            |   9 +-
 ....test.ts.snap => function_9a.test.ts.snap} |   0
 .../{api_9.test.ts => api_9a.test.ts}         |  70 -------
 .../src/__tests__/api_9b.test.ts              | 105 ++++++++++
 .../src/__tests__/auth_3a.test.ts             |  45 +++++
 .../src/__tests__/auth_3b.test.ts             |  52 +++++
 .../{auth_3.test.ts => auth_3c.test.ts}       |  42 +---
 .../{auth_4.test.ts => auth_4a.test.ts}       |  44 ----
 .../src/__tests__/auth_4b.test.ts             |  72 +++++++
 .../src/__tests__/auth_4c.test.ts             |  55 +++++
 .../src/__tests__/auth_8a.test.ts             |  35 ++++
 .../{auth_8.test.ts => auth_8b.test.ts}       |  18 --
 .../src/__tests__/auth_8c.test.ts             |  34 ++++
 .../src/__tests__/function_2a.test.ts         | 107 ++++++++++
 ...function_2.test.ts => function_2b.test.ts} | 111 ----------
 .../src/__tests__/function_2c.test.ts         |  57 ++++++
 .../src/__tests__/function_9a.test.ts         | 134 ++++++++++++
 ...function_9.test.ts => function_9b.test.ts} | 190 ------------------
 .../src/__tests__/function_9c.test.ts         | 121 +++++++++++
 .../src/__tests__/geo-import-1a.test.ts       |  59 ++++++
 ...import-1.test.ts => geo-import-1b.test.ts} |  11 -
 ..._auth_1.test.ts => import_auth_1a.test.ts} |  60 +-----
 .../src/__tests__/import_auth_1b.test.ts      | 158 +++++++++++++++
 ..._auth_2.test.ts => import_auth_2a.test.ts} |  62 ------
 .../src/__tests__/import_auth_2b.test.ts      | 163 +++++++++++++++
 ...-auth-1.test.ts => schema-auth-1a.test.ts} |   5 -
 .../src/__tests__/schema-auth-1b.test.ts      |  23 +++
 ...-auth-2.test.ts => schema-auth-2a.test.ts} |   4 -
 .../src/__tests__/schema-auth-2b.test.ts      |  23 +++
 ...-auth-7.test.ts => schema-auth-7a.test.ts} |  10 -
 .../src/__tests__/schema-auth-7b.test.ts      |  23 +++
 .../src/__tests__/schema-auth-7c.test.ts      |  23 +++
 scripts/split-e2e-tests.ts                    |  16 +-
 34 files changed, 1309 insertions(+), 638 deletions(-)
 rename packages/amplify-e2e-tests/src/__tests__/__snapshots__/{function_9.test.ts.snap => function_9a.test.ts.snap} (100%)
 rename packages/amplify-e2e-tests/src/__tests__/{api_9.test.ts => api_9a.test.ts} (59%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/api_9b.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_3a.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_3b.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{auth_3.test.ts => auth_3c.test.ts} (56%)
 rename packages/amplify-e2e-tests/src/__tests__/{auth_4.test.ts => auth_4a.test.ts} (56%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_4b.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_4c.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_8a.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{auth_8.test.ts => auth_8b.test.ts} (57%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/auth_8c.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/function_2a.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{function_2.test.ts => function_2b.test.ts} (57%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/function_2c.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/function_9a.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{function_9.test.ts => function_9b.test.ts} (53%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/function_9c.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/geo-import-1a.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{geo-import-1.test.ts => geo-import-1b.test.ts} (78%)
 rename packages/amplify-e2e-tests/src/__tests__/{import_auth_1.test.ts => import_auth_1a.test.ts} (73%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/import_auth_1b.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{import_auth_2.test.ts => import_auth_2a.test.ts} (74%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/import_auth_2b.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{schema-auth-1.test.ts => schema-auth-1a.test.ts} (81%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/schema-auth-1b.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{schema-auth-2.test.ts => schema-auth-2a.test.ts} (81%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/schema-auth-2b.test.ts
 rename packages/amplify-e2e-tests/src/__tests__/{schema-auth-7.test.ts => schema-auth-7a.test.ts} (66%)
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/schema-auth-7b.test.ts
 create mode 100644 packages/amplify-e2e-tests/src/__tests__/schema-auth-7c.test.ts

diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
index 1c3fff78a4a..7fb32946008 100644
--- a/.circleci/config.base.yml
+++ b/.circleci/config.base.yml
@@ -1228,8 +1228,8 @@ commands:
                 command: |
                   source .circleci/local_publish_helpers.sh
                   cd packages/amplify-e2e-tests
-                  retry yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE
-                no_output_timeout: 60m
+                  retry yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+                no_output_timeout: 45m
       - when:
           condition:
             or:
@@ -1243,7 +1243,7 @@ commands:
                   source $BASH_ENV
                   amplify version
                   retry runE2eTest
-                no_output_timeout: 60m
+                no_output_timeout: 45m
   scan_e2e_test_artifacts:
     description: 'Scan And Cleanup E2E Test Artifacts'
     parameters:
diff --git a/.circleci/local_publish_helpers.sh b/.circleci/local_publish_helpers.sh
index 6f313f06c1a..a190de343c2 100644
--- a/.circleci/local_publish_helpers.sh
+++ b/.circleci/local_publish_helpers.sh
@@ -244,8 +244,8 @@ function setAwsAccountCredentials {
     export AWS_ACCESS_KEY_ID_ORIG=$AWS_ACCESS_KEY_ID
     export AWS_SECRET_ACCESS_KEY_ORIG=$AWS_SECRET_ACCESS_KEY
     export AWS_SESSION_TOKEN_ORIG=$AWS_SESSION_TOKEN
-    # introduce a delay of up to 3 minutes to allow for more even spread aws list-accounts calls due to throttling
-    sleep $[ ( $RANDOM % 180 )  + 1 ]s
+    # introduce a delay of up to 5 minutes to allow for more even spread aws list-accounts calls due to throttling
+    sleep $[ ( $RANDOM % 300 )  + 1 ]s
     if [[ "$OSTYPE" == "msys" ]]; then
         # windows provided by circleci has this OSTYPE
         useChildAccountCredentials
@@ -271,8 +271,9 @@ function runE2eTest {
     if [ -f  $FAILED_TEST_REGEX_FILE ]; then
         # read the content of failed tests
         failedTests=$(<$FAILED_TEST_REGEX_FILE)
-        yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE -t "$failedTests"
+        # adding --force-exit per https://github.com/facebook/jest/issues/9473
+        yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE -t "$failedTests"
     else
-        yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+        yarn run e2e --force-exit --detectOpenHandles --maxWorkers=3 $TEST_SUITE
     fi
 }
diff --git a/packages/amplify-e2e-tests/src/__tests__/__snapshots__/function_9.test.ts.snap b/packages/amplify-e2e-tests/src/__tests__/__snapshots__/function_9a.test.ts.snap
similarity index 100%
rename from packages/amplify-e2e-tests/src/__tests__/__snapshots__/function_9.test.ts.snap
rename to packages/amplify-e2e-tests/src/__tests__/__snapshots__/function_9a.test.ts.snap
diff --git a/packages/amplify-e2e-tests/src/__tests__/api_9.test.ts b/packages/amplify-e2e-tests/src/__tests__/api_9a.test.ts
similarity index 59%
rename from packages/amplify-e2e-tests/src/__tests__/api_9.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/api_9a.test.ts
index 36eb443ed94..c5f88173659 100644
--- a/packages/amplify-e2e-tests/src/__tests__/api_9.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/api_9a.test.ts
@@ -10,11 +10,6 @@ import {
   getAppSyncApi,
   getProjectMeta,
   getTransformConfig,
-  getDDBTable,
-  addFunction,
-  getBackendAmplifyMeta,
-  amplifyPushUpdateForDependentModel,
-  amplifyPushForce,
   createRandomName,
   generateRandomShortId,
 } from '@aws-amplify/amplify-e2e-core';
@@ -106,69 +101,4 @@ describe('amplify add api (GraphQL)', () => {
     expect(transformConfig.Version).toBeDefined();
     expect(transformConfig.Version).toEqual(TRANSFORM_CURRENT_VERSION);
   });
-
-  it('init a project with a simple model , add a function and removes the dependent @model', async () => {
-    const projectName = `simplemodel${generateRandomShortId()}`;
-    const nextSchema = 'initial_key_blog.graphql';
-    const initialSchema = 'two-model-schema.graphql';
-    const fnName = `integtestfn${generateRandomShortId()}`;
-    await initJSProjectWithProfile(projRoot, { name: projectName });
-    await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
-    await updateApiSchema(projRoot, projectName, initialSchema);
-    await addFunction(
-      projRoot,
-      {
-        name: fnName,
-        functionTemplate: 'Hello World',
-        additionalPermissions: {
-          permissions: ['storage'],
-          choices: ['api', 'storage'],
-          resources: ['Comment:@model(appsync)'],
-          resourceChoices: ['Post:@model(appsync)', 'Comment:@model(appsync)'],
-          operations: ['read'],
-        },
-      },
-      'nodejs',
-    );
-    await amplifyPush(projRoot);
-    updateApiSchema(projRoot, projectName, nextSchema);
-    await amplifyPushUpdateForDependentModel(projRoot, undefined, true);
-    const meta = getProjectMeta(projRoot);
-    const region = meta.providers.awscloudformation.Region;
-    const { output } = meta.api[projectName];
-    const { GraphQLAPIIdOutput, GraphQLAPIEndpointOutput, GraphQLAPIKeyOutput } = output;
-
-    expect(GraphQLAPIIdOutput).toBeDefined();
-    expect(GraphQLAPIEndpointOutput).toBeDefined();
-    expect(GraphQLAPIKeyOutput).toBeDefined();
-
-    const { graphqlApi } = await getAppSyncApi(GraphQLAPIIdOutput, region);
-
-    expect(graphqlApi).toBeDefined();
-    expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
-    const tableName = `Comment-${GraphQLAPIIdOutput}-integtest`;
-    const error = { message: null };
-    try {
-      const table = await getDDBTable(tableName, region);
-      expect(table).toBeUndefined();
-    } catch (ex) {
-      Object.assign(error, ex);
-    }
-    expect(error).toBeDefined();
-    expect(error.message).toContain(`${tableName} not found`);
-  });
-
-  it('api force push with no changes', async () => {
-    const projectName = `apinochange${generateRandomShortId()}`;
-    await initJSProjectWithProfile(projRoot, { name: projectName });
-    await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
-    await updateApiSchema(projRoot, projectName, 'two-model-schema.graphql');
-    await amplifyPush(projRoot);
-    let meta = getBackendAmplifyMeta(projRoot);
-    const { lastPushDirHash: beforeDirHash } = meta.api[projectName];
-    await amplifyPushForce(projRoot);
-    meta = getBackendAmplifyMeta(projRoot);
-    const { lastPushDirHash: afterDirHash } = meta.api[projectName];
-    expect(beforeDirHash).toBe(afterDirHash);
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/api_9b.test.ts b/packages/amplify-e2e-tests/src/__tests__/api_9b.test.ts
new file mode 100644
index 00000000000..8502eca4142
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/api_9b.test.ts
@@ -0,0 +1,105 @@
+import {
+  amplifyPush,
+  deleteProject,
+  initJSProjectWithProfile,
+  addApiWithoutSchema,
+  updateApiSchema,
+  updateApiWithMultiAuth,
+  createNewProjectDir,
+  deleteProjectDir,
+  getAppSyncApi,
+  getProjectMeta,
+  getTransformConfig,
+  getDDBTable,
+  addFunction,
+  getBackendAmplifyMeta,
+  amplifyPushUpdateForDependentModel,
+  amplifyPushForce,
+  createRandomName,
+  generateRandomShortId,
+} from '@aws-amplify/amplify-e2e-core';
+import path from 'path';
+import { existsSync } from 'fs';
+import { TRANSFORM_CURRENT_VERSION } from 'graphql-transformer-core';
+
+describe('amplify add api (GraphQL)', () => {
+  let projRoot: string;
+  let projFolderName: string;
+  beforeEach(async () => {
+    projFolderName = `graphqlApi${generateRandomShortId()}`;
+    projRoot = await createNewProjectDir(projFolderName);
+  });
+
+  afterEach(async () => {
+    const metaFilePath = path.join(projRoot, 'amplify', '#current-cloud-backend', 'amplify-meta.json');
+    if (existsSync(metaFilePath)) {
+      await deleteProject(projRoot);
+    }
+    deleteProjectDir(projRoot);
+  });
+
+  it('init a project with a simple model , add a function and removes the dependent @model', async () => {
+    const projectName = `simplemodel${generateRandomShortId()}`;
+    const nextSchema = 'initial_key_blog.graphql';
+    const initialSchema = 'two-model-schema.graphql';
+    const fnName = `integtestfn${generateRandomShortId()}`;
+    await initJSProjectWithProfile(projRoot, { name: projectName });
+    await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
+    await updateApiSchema(projRoot, projectName, initialSchema);
+    await addFunction(
+      projRoot,
+      {
+        name: fnName,
+        functionTemplate: 'Hello World',
+        additionalPermissions: {
+          permissions: ['storage'],
+          choices: ['api', 'storage'],
+          resources: ['Comment:@model(appsync)'],
+          resourceChoices: ['Post:@model(appsync)', 'Comment:@model(appsync)'],
+          operations: ['read'],
+        },
+      },
+      'nodejs',
+    );
+    await amplifyPush(projRoot);
+    updateApiSchema(projRoot, projectName, nextSchema);
+    await amplifyPushUpdateForDependentModel(projRoot, undefined, true);
+    const meta = getProjectMeta(projRoot);
+    const region = meta.providers.awscloudformation.Region;
+    const { output } = meta.api[projectName];
+    const { GraphQLAPIIdOutput, GraphQLAPIEndpointOutput, GraphQLAPIKeyOutput } = output;
+
+    expect(GraphQLAPIIdOutput).toBeDefined();
+    expect(GraphQLAPIEndpointOutput).toBeDefined();
+    expect(GraphQLAPIKeyOutput).toBeDefined();
+
+    const { graphqlApi } = await getAppSyncApi(GraphQLAPIIdOutput, region);
+
+    expect(graphqlApi).toBeDefined();
+    expect(graphqlApi.apiId).toEqual(GraphQLAPIIdOutput);
+    const tableName = `Comment-${GraphQLAPIIdOutput}-integtest`;
+    const error = { message: null };
+    try {
+      const table = await getDDBTable(tableName, region);
+      expect(table).toBeUndefined();
+    } catch (ex) {
+      Object.assign(error, ex);
+    }
+    expect(error).toBeDefined();
+    expect(error.message).toContain(`${tableName} not found`);
+  });
+
+  it('api force push with no changes', async () => {
+    const projectName = `apinochange${generateRandomShortId()}`;
+    await initJSProjectWithProfile(projRoot, { name: projectName });
+    await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
+    await updateApiSchema(projRoot, projectName, 'two-model-schema.graphql');
+    await amplifyPush(projRoot);
+    let meta = getBackendAmplifyMeta(projRoot);
+    const { lastPushDirHash: beforeDirHash } = meta.api[projectName];
+    await amplifyPushForce(projRoot);
+    meta = getBackendAmplifyMeta(projRoot);
+    const { lastPushDirHash: afterDirHash } = meta.api[projectName];
+    expect(beforeDirHash).toBe(afterDirHash);
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_3a.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_3a.test.ts
new file mode 100644
index 00000000000..19ef3d94364
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_3a.test.ts
@@ -0,0 +1,45 @@
+import {
+  initJSProjectWithProfile, deleteProject, amplifyPushAuth,
+  addAuthWithDefault,
+  removeAuthWithDefault,
+  getBackendAmplifyMeta,
+  createNewProjectDir,
+  deleteProjectDir,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify add auth...a', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init a project and add auth with defaults and push, then remove auth and push should clean up trust relationship conditions', async () => {
+    await initJSProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithDefault(projRoot, {});
+    await amplifyPushAuth(projRoot);
+
+    const amplifyMeta = getBackendAmplifyMeta(projRoot);
+    const { AuthRoleName, UnauthRoleName } = amplifyMeta.providers.awscloudformation;
+    const cognitoResource = Object.values(amplifyMeta.auth).find((res: any) => res.service === 'Cognito') as any;
+    const idpId = cognitoResource.output.IdentityPoolId;
+
+    expect(AuthRoleName).toHaveValidPolicyConditionMatchingIdpId(idpId);
+    expect(UnauthRoleName).toHaveValidPolicyConditionMatchingIdpId(idpId);
+
+    await removeAuthWithDefault(projRoot);
+    await amplifyPushAuth(projRoot);
+
+    expect(AuthRoleName).not.toHaveValidPolicyConditionMatchingIdpId(idpId);
+    expect(UnauthRoleName).not.toHaveValidPolicyConditionMatchingIdpId(idpId);
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_3b.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_3b.test.ts
new file mode 100644
index 00000000000..de9a0110f22
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_3b.test.ts
@@ -0,0 +1,52 @@
+import {
+  initJSProjectWithProfile, deleteProject, amplifyPushAuth,
+  addAuthWithDefault,
+  removeAuthWithDefault,
+  addAuthWithMaxOptions,
+  addAuthUserPoolOnly,
+  getBackendAmplifyMeta,
+  createNewProjectDir,
+  deleteProjectDir,
+  getProjectMeta,
+  getUserPool,
+  getUserPoolClients,
+  getLambdaFunction,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify add auth...b', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init a project with only user pool and no identity pool', async () => {
+    await initJSProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthUserPoolOnly(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    const meta = getProjectMeta(projRoot);
+    const id = Object.keys(meta.auth).map(key => meta.auth[key])[1].output.UserPoolId;
+    const userPool = await getUserPool(id, meta.providers.awscloudformation.Region);
+
+    expect(userPool.UserPool).toBeDefined();
+    const { userPoolGroups } = meta.auth;
+    expect(userPoolGroups.service).toEqual('Cognito-UserPool-Groups');
+    expect(userPoolGroups.providerPlugin).toEqual('awscloudformation');
+    expect(userPoolGroups.dependsOn.length).toBe(1);
+    expect(userPoolGroups.dependsOn[0].category).toBe('auth');
+    expect(userPoolGroups.dependsOn[0].attributes.length).toBe(3);
+    expect(userPoolGroups.dependsOn[0].attributes).toContain('UserPoolId');
+    expect(userPoolGroups.dependsOn[0].attributes).toContain('AppClientIDWeb');
+    expect(userPoolGroups.dependsOn[0].attributes).toContain('AppClientID');
+  });
+
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_3.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_3c.test.ts
similarity index 56%
rename from packages/amplify-e2e-tests/src/__tests__/auth_3.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/auth_3c.test.ts
index a667f39b87a..1ab9e74693f 100644
--- a/packages/amplify-e2e-tests/src/__tests__/auth_3.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_3c.test.ts
@@ -18,7 +18,7 @@ const defaultsSettings = {
   name: 'authTest',
 };
 
-describe('amplify add auth...', () => {
+describe('amplify add auth...c', () => {
   let projRoot: string;
   beforeEach(async () => {
     projRoot = await createNewProjectDir('auth');
@@ -29,46 +29,6 @@ describe('amplify add auth...', () => {
     deleteProjectDir(projRoot);
   });
 
-  it('...should init a project and add auth with defaults and push, then remove auth and push should clean up trust relationship conditions', async () => {
-    await initJSProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthWithDefault(projRoot, {});
-    await amplifyPushAuth(projRoot);
-
-    const amplifyMeta = getBackendAmplifyMeta(projRoot);
-    const { AuthRoleName, UnauthRoleName } = amplifyMeta.providers.awscloudformation;
-    const cognitoResource = Object.values(amplifyMeta.auth).find((res: any) => res.service === 'Cognito') as any;
-    const idpId = cognitoResource.output.IdentityPoolId;
-
-    expect(AuthRoleName).toHaveValidPolicyConditionMatchingIdpId(idpId);
-    expect(UnauthRoleName).toHaveValidPolicyConditionMatchingIdpId(idpId);
-
-    await removeAuthWithDefault(projRoot);
-    await amplifyPushAuth(projRoot);
-
-    expect(AuthRoleName).not.toHaveValidPolicyConditionMatchingIdpId(idpId);
-    expect(UnauthRoleName).not.toHaveValidPolicyConditionMatchingIdpId(idpId);
-  });
-
-  it('...should init a project with only user pool and no identity pool', async () => {
-    await initJSProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthUserPoolOnly(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    const meta = getProjectMeta(projRoot);
-    const id = Object.keys(meta.auth).map(key => meta.auth[key])[1].output.UserPoolId;
-    const userPool = await getUserPool(id, meta.providers.awscloudformation.Region);
-
-    expect(userPool.UserPool).toBeDefined();
-    const { userPoolGroups } = meta.auth;
-    expect(userPoolGroups.service).toEqual('Cognito-UserPool-Groups');
-    expect(userPoolGroups.providerPlugin).toEqual('awscloudformation');
-    expect(userPoolGroups.dependsOn.length).toBe(1);
-    expect(userPoolGroups.dependsOn[0].category).toBe('auth');
-    expect(userPoolGroups.dependsOn[0].attributes.length).toBe(3);
-    expect(userPoolGroups.dependsOn[0].attributes).toContain('UserPoolId');
-    expect(userPoolGroups.dependsOn[0].attributes).toContain('AppClientIDWeb');
-    expect(userPoolGroups.dependsOn[0].attributes).toContain('AppClientID');
-  });
-
   it('...should init a project where all possible options are selected', async () => {
     await initJSProjectWithProfile(projRoot, defaultsSettings);
     await addAuthWithMaxOptions(projRoot, {});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_4.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_4a.test.ts
similarity index 56%
rename from packages/amplify-e2e-tests/src/__tests__/auth_4.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/auth_4a.test.ts
index a984216d9c8..356de3fb197 100644
--- a/packages/amplify-e2e-tests/src/__tests__/auth_4.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_4a.test.ts
@@ -82,48 +82,4 @@ describe('amplify updating auth...', () => {
     expect(updatedFunction.Configuration.Environment.Variables.MODULES).toEqual('email-filter-denylist');
     expect(lambdaFunction.Configuration.Environment.Variables.DOMAINDENYLIST).toEqual('amazon.com');
   });
-
-  it('...should init a project and add auth with a custom trigger using legacy language', async () => {
-    await initJSProjectWithProfile(projRoot, defaultsSettings);
-    addFeatureFlag(projRoot, 'auth', 'useinclusiveterminology', false);
-    await addAuthWithCustomTrigger(projRoot, { useInclusiveTerminology: false });
-    await amplifyPushAuth(projRoot);
-    const meta = getProjectMeta(projRoot);
-    const authName = Object.keys(meta.auth)[0];
-    const functionName = `${authName}PreSignup-integtest`;
-    const lambdaFunction = await getFunction(functionName, meta.providers.awscloudformation.Region);
-    const dirContents = fs.readdirSync(`${projRoot}/amplify/backend/function/${authName}PreSignup/src`);
-    expect(lambdaFunction).toBeDefined();
-    expect(lambdaFunction.Configuration.Environment.Variables.MODULES).toEqual('email-filter-denylist-legacy,custom');
-    expect(lambdaFunction.Configuration.Environment.Variables.DOMAINBLACKLIST).toEqual('amazon.com');
-    expect(dirContents.includes('email-filter-denylist-legacy.js')).toBeTruthy();
-  });
-
-  it('...should init an android project and add customAuth flag, and remove flag when custom auth triggers are removed upon update', async () => {
-    await initAndroidProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthWithRecaptchaTrigger(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    let meta = getAwsAndroidConfig(projRoot);
-    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
-    expect(meta.Auth.Default.authenticationFlowType).toEqual('CUSTOM_AUTH');
-    await updateAuthRemoveRecaptchaTrigger(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    meta = getAwsAndroidConfig(projRoot);
-    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
-    expect(meta.Auth.Default.authenticationFlowType).toEqual('USER_SRP_AUTH');
-  });
-
-  it('...should init an ios project and add customAuth flag, and remove the flag when custom auth triggers are removed upon update', async () => {
-    await initIosProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthWithRecaptchaTrigger(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    let meta = getAwsIOSConfig(projRoot);
-    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
-    expect(meta.Auth.Default.authenticationFlowType).toEqual('CUSTOM_AUTH');
-    await updateAuthRemoveRecaptchaTrigger(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    meta = getAwsIOSConfig(projRoot);
-    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
-    expect(meta.Auth.Default.authenticationFlowType).toEqual('USER_SRP_AUTH');
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_4b.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_4b.test.ts
new file mode 100644
index 00000000000..6e2fc552c91
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_4b.test.ts
@@ -0,0 +1,72 @@
+import * as fs from 'fs-extra';
+import {
+  initJSProjectWithProfile,
+  initAndroidProjectWithProfile,
+  initIosProjectWithProfile,
+  deleteProject,
+  amplifyPushAuth,
+  addFeatureFlag,
+  addAuthWithRecaptchaTrigger,
+  addAuthWithCustomTrigger,
+  addAuthWithSignInSignOutUrl,
+  updateAuthWithoutCustomTrigger,
+  updateAuthRemoveRecaptchaTrigger,
+  updateAuthSignInSignOutUrl,
+  createNewProjectDir,
+  deleteProjectDir,
+  getProjectMeta,
+  getAwsAndroidConfig,
+  getAwsIOSConfig,
+  getUserPool,
+  getUserPoolClients,
+  getLambdaFunction,
+  getFunction,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify updating auth...', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth-update');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+
+  it('...should init a project and add auth with a custom trigger using legacy language', async () => {
+    await initJSProjectWithProfile(projRoot, defaultsSettings);
+    addFeatureFlag(projRoot, 'auth', 'useinclusiveterminology', false);
+    await addAuthWithCustomTrigger(projRoot, { useInclusiveTerminology: false });
+    await amplifyPushAuth(projRoot);
+    const meta = getProjectMeta(projRoot);
+    const authName = Object.keys(meta.auth)[0];
+    const functionName = `${authName}PreSignup-integtest`;
+    const lambdaFunction = await getFunction(functionName, meta.providers.awscloudformation.Region);
+    const dirContents = fs.readdirSync(`${projRoot}/amplify/backend/function/${authName}PreSignup/src`);
+    expect(lambdaFunction).toBeDefined();
+    expect(lambdaFunction.Configuration.Environment.Variables.MODULES).toEqual('email-filter-denylist-legacy,custom');
+    expect(lambdaFunction.Configuration.Environment.Variables.DOMAINBLACKLIST).toEqual('amazon.com');
+    expect(dirContents.includes('email-filter-denylist-legacy.js')).toBeTruthy();
+  });
+
+  it('...should init an android project and add customAuth flag, and remove flag when custom auth triggers are removed upon update', async () => {
+    await initAndroidProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithRecaptchaTrigger(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    let meta = getAwsAndroidConfig(projRoot);
+    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
+    expect(meta.Auth.Default.authenticationFlowType).toEqual('CUSTOM_AUTH');
+    await updateAuthRemoveRecaptchaTrigger(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    meta = getAwsAndroidConfig(projRoot);
+    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
+    expect(meta.Auth.Default.authenticationFlowType).toEqual('USER_SRP_AUTH');
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_4c.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_4c.test.ts
new file mode 100644
index 00000000000..ff6df277a80
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_4c.test.ts
@@ -0,0 +1,55 @@
+import * as fs from 'fs-extra';
+import {
+  initJSProjectWithProfile,
+  initAndroidProjectWithProfile,
+  initIosProjectWithProfile,
+  deleteProject,
+  amplifyPushAuth,
+  addFeatureFlag,
+  addAuthWithRecaptchaTrigger,
+  addAuthWithCustomTrigger,
+  addAuthWithSignInSignOutUrl,
+  updateAuthWithoutCustomTrigger,
+  updateAuthRemoveRecaptchaTrigger,
+  updateAuthSignInSignOutUrl,
+  createNewProjectDir,
+  deleteProjectDir,
+  getProjectMeta,
+  getAwsAndroidConfig,
+  getAwsIOSConfig,
+  getUserPool,
+  getUserPoolClients,
+  getLambdaFunction,
+  getFunction,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify updating auth...', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth-update');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init an ios project and add customAuth flag, and remove the flag when custom auth triggers are removed upon update', async () => {
+    await initIosProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithRecaptchaTrigger(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    let meta = getAwsIOSConfig(projRoot);
+    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
+    expect(meta.Auth.Default.authenticationFlowType).toEqual('CUSTOM_AUTH');
+    await updateAuthRemoveRecaptchaTrigger(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    meta = getAwsIOSConfig(projRoot);
+    expect(meta.Auth.Default.authenticationFlowType).toBeDefined();
+    expect(meta.Auth.Default.authenticationFlowType).toEqual('USER_SRP_AUTH');
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_8a.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_8a.test.ts
new file mode 100644
index 00000000000..ba1f671e463
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_8a.test.ts
@@ -0,0 +1,35 @@
+import {
+  addAuthWithDefault,
+  amplifyPushAuth,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  initJSProjectWithProfile,
+  removeAuthWithDefault
+} from '@aws-amplify/amplify-e2e-core';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify add auth...', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init a project and add auth with defaults and then remove auth and add another auth and push', async () => {
+    await initJSProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithDefault(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    await removeAuthWithDefault(projRoot);
+    await addAuthWithDefault(projRoot, {});
+    await amplifyPushAuth(projRoot);
+  });
+
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_8.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_8b.test.ts
similarity index 57%
rename from packages/amplify-e2e-tests/src/__tests__/auth_8.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/auth_8b.test.ts
index 6fd010854f2..5f840db1e4f 100644
--- a/packages/amplify-e2e-tests/src/__tests__/auth_8.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_8b.test.ts
@@ -9,8 +9,6 @@ import {
   getProjectMeta,
   getUserPool,
   initFlutterProjectWithProfile,
-  initJSProjectWithProfile,
-  removeAuthWithDefault
 } from '@aws-amplify/amplify-e2e-core';
 
 const defaultsSettings = {
@@ -28,14 +26,6 @@ describe('amplify add auth...', () => {
     deleteProjectDir(projRoot);
   });
 
-  it('...should init a project and add auth with defaults and then remove auth and add another auth and push', async () => {
-    await initJSProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthWithDefault(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    await removeAuthWithDefault(projRoot);
-    await addAuthWithDefault(projRoot, {});
-    await amplifyPushAuth(projRoot);
-  });
 
   it('...should init a Flutter project and add auth with defaults', async () => {
     await initFlutterProjectWithProfile(projRoot, defaultsSettings);
@@ -48,12 +38,4 @@ describe('amplify add auth...', () => {
     expect(fs.existsSync(path.join(projRoot, 'lib', 'amplifyconfiguration.dart'))).toBe(true);
   });
 
-  it('...should init a project and add auth with defaults and then remove auth and add another auth and push', async () => {
-    await initFlutterProjectWithProfile(projRoot, defaultsSettings);
-    await addAuthWithDefault(projRoot, {});
-    await amplifyPushAuth(projRoot);
-    await removeAuthWithDefault(projRoot);
-    await addAuthWithDefault(projRoot, {});
-    await amplifyPushAuth(projRoot);
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_8c.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_8c.test.ts
new file mode 100644
index 00000000000..b10bb7d4203
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/auth_8c.test.ts
@@ -0,0 +1,34 @@
+import {
+  addAuthWithDefault,
+  amplifyPushAuth,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  initFlutterProjectWithProfile,
+  removeAuthWithDefault
+} from '@aws-amplify/amplify-e2e-core';
+
+const defaultsSettings = {
+  name: 'authTest',
+};
+
+describe('amplify add auth...', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('auth');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init a project and add auth with defaults and then remove auth and add another auth and push', async () => {
+    await initFlutterProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithDefault(projRoot, {});
+    await amplifyPushAuth(projRoot);
+    await removeAuthWithDefault(projRoot);
+    await addAuthWithDefault(projRoot, {});
+    await amplifyPushAuth(projRoot);
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_2a.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_2a.test.ts
new file mode 100644
index 00000000000..4b66c1fb61d
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/function_2a.test.ts
@@ -0,0 +1,107 @@
+import {
+  addAuthWithDefault,
+  addFunction,
+  addS3StorageWithSettings,
+  AddStorageSettings,
+  amplifyPushAuth,
+  amplifyPushForce,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getProjectMeta,
+  initJSProjectWithProfile,
+  invokeFunction,
+  overrideFunctionSrcNode,
+  addAuthWithGroupsAndAdminAPI,
+  getFunction,
+  loadFunctionTestFile,
+  generateRandomShortId,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+describe('nodejs', () => {
+  describe('amplify add function with additional permissions', () => {
+    let projRoot: string;
+    beforeEach(async () => {
+      projRoot = await createNewProjectDir('fn-with-perm');
+    });
+
+    afterEach(async () => {
+      await deleteProject(projRoot);
+      deleteProjectDir(projRoot);
+    });
+
+    it('add lambda with AdminQueries API permissions', async () => {
+      await initJSProjectWithProfile(projRoot, {});
+      const fnName = `integtestfn${generateRandomShortId()}`;
+      await addAuthWithGroupsAndAdminAPI(projRoot, {});
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['api'],
+            resources: ['AdminQueries'],
+            choices: ['auth', 'function', 'api'],
+            operations: ['create', 'update', 'read', 'delete'],
+          },
+        },
+        'nodejs',
+      );
+      await amplifyPushAuth(projRoot);
+      const meta = getProjectMeta(projRoot);
+      const { Arn: functionArn, Name: functionName, Region: region } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
+      expect(functionArn).toBeDefined();
+      expect(functionName).toBeDefined();
+      expect(region).toBeDefined();
+      const cloudFunction = await getFunction(functionName, region);
+      expect(cloudFunction.Configuration.FunctionArn).toEqual(functionArn);
+    });
+
+    it('lambda with s3 permissions should be able to call listObjects', async () => {
+      await initJSProjectWithProfile(projRoot, {});
+      const random = generateRandomShortId();
+      const fnName = `integtestfn${random}`;
+      const s3Name = `integtestfn${random}`;
+      const options: AddStorageSettings = {
+        resourceName: s3Name,
+        bucketName: s3Name,
+      };
+      await addAuthWithDefault(projRoot);
+      await addS3StorageWithSettings(projRoot, options);
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['storage'],
+            resources: [s3Name],
+            choices: ['auth', 'storage', 'function', 'api'],
+            operations: ['create', 'update', 'read', 'delete'],
+          },
+        },
+        'nodejs',
+      );
+
+      const functionCode = loadFunctionTestFile('s3-list-objects.js');
+
+      // Update the env var name in function code
+      functionCode.replace('{{bucketEnvVar}}', `STORAGE_INTEGTESTFN${random}_BUCKETNAME`);
+
+      overrideFunctionSrcNode(projRoot, fnName, functionCode);
+
+      await amplifyPushForce(projRoot);
+      const meta = getProjectMeta(projRoot);
+      const { BucketName: bucketName, Region: region } = Object.keys(meta.storage).map(key => meta.storage[key])[0].output;
+      expect(bucketName).toBeDefined();
+      expect(region).toBeDefined();
+      const { Name: functionName } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
+      expect(functionName).toBeDefined();
+      const result1 = await invokeFunction(functionName, null, region);
+      expect(result1.StatusCode).toBe(200);
+      expect(result1.Payload).toBeDefined();
+    });
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_2.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_2b.test.ts
similarity index 57%
rename from packages/amplify-e2e-tests/src/__tests__/function_2.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/function_2b.test.ts
index 7f2f4b5b369..afa4a00dca8 100644
--- a/packages/amplify-e2e-tests/src/__tests__/function_2.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/function_2b.test.ts
@@ -1,25 +1,18 @@
 import {
   addApiWithoutSchema,
   updateApiSchema,
-  addAuthWithDefault,
   addFunction,
-  addS3StorageWithSettings,
   addSimpleDDB,
-  AddStorageSettings,
   amplifyPush,
   amplifyPushAuth,
-  amplifyPushForce,
   createNewProjectDir,
   deleteProject,
   deleteProjectDir,
-  getFunctionSrcNode,
   getProjectMeta,
   initJSProjectWithProfile,
   invokeFunction,
   overrideFunctionSrcNode,
   updateFunction,
-  addAuthWithGroupsAndAdminAPI,
-  getFunction,
   loadFunctionTestFile,
   createRandomName,
   generateRandomShortId,
@@ -38,79 +31,6 @@ describe('nodejs', () => {
       deleteProjectDir(projRoot);
     });
 
-    it('add lambda with AdminQueries API permissions', async () => {
-      await initJSProjectWithProfile(projRoot, {});
-      const fnName = `integtestfn${generateRandomShortId()}`;
-      await addAuthWithGroupsAndAdminAPI(projRoot, {});
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['api'],
-            resources: ['AdminQueries'],
-            choices: ['auth', 'function', 'api'],
-            operations: ['create', 'update', 'read', 'delete'],
-          },
-        },
-        'nodejs',
-      );
-      await amplifyPushAuth(projRoot);
-      const meta = getProjectMeta(projRoot);
-      const { Arn: functionArn, Name: functionName, Region: region } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
-      expect(functionArn).toBeDefined();
-      expect(functionName).toBeDefined();
-      expect(region).toBeDefined();
-      const cloudFunction = await getFunction(functionName, region);
-      expect(cloudFunction.Configuration.FunctionArn).toEqual(functionArn);
-    });
-
-    it('lambda with s3 permissions should be able to call listObjects', async () => {
-      await initJSProjectWithProfile(projRoot, {});
-      const random = generateRandomShortId();
-      const fnName = `integtestfn${random}`;
-      const s3Name = `integtestfn${random}`;
-      const options: AddStorageSettings = {
-        resourceName: s3Name,
-        bucketName: s3Name,
-      };
-      await addAuthWithDefault(projRoot);
-      await addS3StorageWithSettings(projRoot, options);
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['storage'],
-            resources: [s3Name],
-            choices: ['auth', 'storage', 'function', 'api'],
-            operations: ['create', 'update', 'read', 'delete'],
-          },
-        },
-        'nodejs',
-      );
-
-      const functionCode = loadFunctionTestFile('s3-list-objects.js');
-
-      // Update the env var name in function code
-      functionCode.replace('{{bucketEnvVar}}', `STORAGE_INTEGTESTFN${random}_BUCKETNAME`);
-
-      overrideFunctionSrcNode(projRoot, fnName, functionCode);
-
-      await amplifyPushForce(projRoot);
-      const meta = getProjectMeta(projRoot);
-      const { BucketName: bucketName, Region: region } = Object.keys(meta.storage).map(key => meta.storage[key])[0].output;
-      expect(bucketName).toBeDefined();
-      expect(region).toBeDefined();
-      const { Name: functionName } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
-      expect(functionName).toBeDefined();
-      const result1 = await invokeFunction(functionName, null, region);
-      expect(result1.StatusCode).toBe(200);
-      expect(result1.Payload).toBeDefined();
-    });
-
     it('lambda with dynamoDB permissions should be able to scan ddb', async () => {
       await initJSProjectWithProfile(projRoot, {
         name: 'dynamodbscan',
@@ -237,36 +157,5 @@ describe('nodejs', () => {
       expect(payload.Count).toBeDefined();
       expect(payload.ScannedCount).toBeDefined();
     });
-
-    it('@model-backed lambda function should generate envvars TODOTABLE_NAME, TODOTABLE_ARN, GRAPHQLAPIIDOUTPUT', async () => {
-      await initJSProjectWithProfile(projRoot, {
-        name: 'modelbackedlambda',
-      });
-      await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
-      await updateApiSchema(projRoot, 'modelbackedlambda', 'simple_model.graphql');
-
-      const fnName = `integtestfn${generateRandomShortId()}`;
-
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['storage'],
-            choices: ['api', 'storage'],
-            resources: ['Todo:@model(appsync)'],
-            resourceChoices: ['Todo:@model(appsync)'],
-            operations: ['read'],
-          },
-        },
-        'nodejs',
-      );
-
-      const lambdaSource = getFunctionSrcNode(projRoot, fnName);
-      expect(lambdaSource.includes('TODOTABLE_NAME')).toBeTruthy();
-      expect(lambdaSource.includes('TODOTABLE_ARN')).toBeTruthy();
-      expect(lambdaSource.includes('GRAPHQLAPIIDOUTPUT')).toBeTruthy();
-    });
   });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_2c.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_2c.test.ts
new file mode 100644
index 00000000000..3899c120bae
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/function_2c.test.ts
@@ -0,0 +1,57 @@
+import {
+  addApiWithoutSchema,
+  updateApiSchema,
+  addFunction,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getFunctionSrcNode,
+  initJSProjectWithProfile,
+  generateRandomShortId,
+} from '@aws-amplify/amplify-e2e-core';
+import _ from 'lodash';
+
+describe('nodejs', () => {
+  describe('amplify add function with additional permissions', () => {
+    let projRoot: string;
+    beforeEach(async () => {
+      projRoot = await createNewProjectDir('fn-with-perm');
+    });
+
+    afterEach(async () => {
+      await deleteProject(projRoot);
+      deleteProjectDir(projRoot);
+    });
+
+    it('@model-backed lambda function should generate envvars TODOTABLE_NAME, TODOTABLE_ARN, GRAPHQLAPIIDOUTPUT', async () => {
+      await initJSProjectWithProfile(projRoot, {
+        name: 'modelbackedlambda',
+      });
+      await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
+      await updateApiSchema(projRoot, 'modelbackedlambda', 'simple_model.graphql');
+
+      const fnName = `integtestfn${generateRandomShortId()}`;
+
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['storage'],
+            choices: ['api', 'storage'],
+            resources: ['Todo:@model(appsync)'],
+            resourceChoices: ['Todo:@model(appsync)'],
+            operations: ['read'],
+          },
+        },
+        'nodejs',
+      );
+
+      const lambdaSource = getFunctionSrcNode(projRoot, fnName);
+      expect(lambdaSource.includes('TODOTABLE_NAME')).toBeTruthy();
+      expect(lambdaSource.includes('TODOTABLE_ARN')).toBeTruthy();
+      expect(lambdaSource.includes('GRAPHQLAPIIDOUTPUT')).toBeTruthy();
+    });
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_9a.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_9a.test.ts
new file mode 100644
index 00000000000..1a8046a93a8
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/function_9a.test.ts
@@ -0,0 +1,134 @@
+import {
+  addApiWithoutSchema,
+  addDDBWithTrigger,
+  addFunction,
+  addSimpleDDB,
+  amplifyPushAuth,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getBackendAmplifyMeta,
+  initJSProjectWithProfile,
+  readJsonFile,
+  updateFunction,
+  updateApiSchema,
+  createRandomName,
+  generateRandomShortId,
+} from '@aws-amplify/amplify-e2e-core';
+import fs from 'fs-extra';
+import path from 'path';
+import _ from 'lodash';
+
+describe('nodejs', () => {
+  describe('amplify add function with additional permissions', () => {
+    let projRoot: string;
+    beforeEach(async () => {
+      projRoot = await createNewProjectDir('fn-with-perm');
+    });
+
+    afterEach(async () => {
+      await deleteProject(projRoot);
+      deleteProjectDir(projRoot);
+    });
+
+    it('environment vars comment should update on permission update', async () => {
+      await initJSProjectWithProfile(projRoot, {});
+      const funcName = `nodetestfn${generateRandomShortId()}`;
+      const ddbName = 'nodetestddb';
+
+      await addFunction(
+        projRoot,
+        {
+          name: funcName,
+          functionTemplate: 'Hello World',
+        },
+        'nodejs',
+      );
+      await addSimpleDDB(projRoot, { name: ddbName });
+      await updateFunction(
+        projRoot,
+        {
+          additionalPermissions: {
+            permissions: ['storage'],
+            choices: ['function', 'storage'],
+            operations: ['read'],
+            resources: [ddbName],
+          },
+        },
+        'nodejs',
+      );
+      const lambdaHandlerContents = fs.readFileSync(
+        path.join(projRoot, 'amplify', 'backend', 'function', funcName, 'src', 'index.js'),
+        'utf8',
+      );
+      expect(lambdaHandlerContents).toMatchSnapshot();
+    });
+
+    it('adding api and storage permissions should not add duplicates to CFN', async () => {
+      const appName = createRandomName();
+      await initJSProjectWithProfile(projRoot, {
+        name: appName,
+      });
+      await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
+      await updateApiSchema(projRoot, appName, 'two-model-schema.graphql');
+
+      const random = generateRandomShortId();
+      const fnName = `integtestfn${random}`;
+      const ddbName = `ddbTable${random}`;
+
+      await addSimpleDDB(projRoot, { name: ddbName });
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['storage'],
+            choices: ['api', 'storage'],
+            resources: [ddbName, 'Post:@model(appsync)', 'Comment:@model(appsync)'],
+            resourceChoices: [ddbName, 'Post:@model(appsync)', 'Comment:@model(appsync)'],
+            operations: ['read'],
+          },
+        },
+        'nodejs',
+      );
+
+      const lambdaCFN = readJsonFile(
+        path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`),
+      );
+      expect(lambdaCFN.Resources.AmplifyResourcesPolicy.Properties.PolicyDocument.Statement.length).toBe(3);
+    });
+
+    it('update DDB trigger function to add permissions should not changed its dependsOn attributes of the trigger source', async () => {
+      await initJSProjectWithProfile(projRoot, {});
+      const ddbResourceName = 'testddbresource';
+      await addDDBWithTrigger(projRoot, { ddbResourceName });
+
+      const originalAmplifyMeta = getBackendAmplifyMeta(projRoot);
+      const functionResourceName = Object.keys(originalAmplifyMeta.function)[0];
+      const originalAttributes = originalAmplifyMeta.function[functionResourceName].dependsOn[0].attributes.sort();
+
+      await updateFunction(
+        projRoot,
+        {
+          additionalPermissions: {
+            resources: [ddbResourceName],
+            permissions: ['storage'],
+            choices: ['function', 'storage'],
+            operations: ['read', 'update'],
+          },
+        },
+        'nodejs',
+      );
+
+      const updateAmplifyMeta = getBackendAmplifyMeta(projRoot);
+      const updateAttributes = updateAmplifyMeta.function[functionResourceName].dependsOn[0].attributes.sort();
+      expect(originalAttributes).toEqual(updateAttributes);
+
+      await amplifyPushAuth(projRoot);
+      const amplifyMeta = getBackendAmplifyMeta(projRoot);
+      expect(amplifyMeta.function[functionResourceName].output).toBeDefined();
+      expect(amplifyMeta.function[functionResourceName].output.Arn).toBeDefined();
+    });
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_9.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_9b.test.ts
similarity index 53%
rename from packages/amplify-e2e-tests/src/__tests__/function_9.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/function_9b.test.ts
index 7e3a7fcb6c2..abcf05ea036 100644
--- a/packages/amplify-e2e-tests/src/__tests__/function_9.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/function_9b.test.ts
@@ -1,15 +1,12 @@
 import {
   addApiWithoutSchema,
   addApi,
-  addDDBWithTrigger,
   addFunction,
   addSimpleDDB,
   amplifyPush,
-  amplifyPushAuth,
   createNewProjectDir,
   deleteProject,
   deleteProjectDir,
-  getBackendAmplifyMeta,
   getProjectMeta,
   initJSProjectWithProfile,
   invokeFunction,
@@ -18,12 +15,10 @@ import {
   updateFunction,
   overrideFunctionCodeNode,
   getBackendConfig,
-  addFeatureFlag,
   updateApiSchema,
   createRandomName,
   generateRandomShortId,
 } from '@aws-amplify/amplify-e2e-core';
-import fs from 'fs-extra';
 import path from 'path';
 import _ from 'lodash';
 
@@ -41,106 +36,6 @@ describe('nodejs', () => {
       deleteProjectDir(projRoot);
     });
 
-    it('environment vars comment should update on permission update', async () => {
-      await initJSProjectWithProfile(projRoot, {});
-      const funcName = `nodetestfn${generateRandomShortId()}`;
-      const ddbName = 'nodetestddb';
-
-      await addFunction(
-        projRoot,
-        {
-          name: funcName,
-          functionTemplate: 'Hello World',
-        },
-        'nodejs',
-      );
-      await addSimpleDDB(projRoot, { name: ddbName });
-      await updateFunction(
-        projRoot,
-        {
-          additionalPermissions: {
-            permissions: ['storage'],
-            choices: ['function', 'storage'],
-            operations: ['read'],
-            resources: [ddbName],
-          },
-        },
-        'nodejs',
-      );
-      const lambdaHandlerContents = fs.readFileSync(
-        path.join(projRoot, 'amplify', 'backend', 'function', funcName, 'src', 'index.js'),
-        'utf8',
-      );
-      expect(lambdaHandlerContents).toMatchSnapshot();
-    });
-
-    it('adding api and storage permissions should not add duplicates to CFN', async () => {
-      const appName = createRandomName();
-      await initJSProjectWithProfile(projRoot, {
-        name: appName,
-      });
-      await addApiWithoutSchema(projRoot, { transformerVersion: 1 });
-      await updateApiSchema(projRoot, appName, 'two-model-schema.graphql');
-
-      const random = generateRandomShortId();
-      const fnName = `integtestfn${random}`;
-      const ddbName = `ddbTable${random}`;
-
-      await addSimpleDDB(projRoot, { name: ddbName });
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['storage'],
-            choices: ['api', 'storage'],
-            resources: [ddbName, 'Post:@model(appsync)', 'Comment:@model(appsync)'],
-            resourceChoices: [ddbName, 'Post:@model(appsync)', 'Comment:@model(appsync)'],
-            operations: ['read'],
-          },
-        },
-        'nodejs',
-      );
-
-      const lambdaCFN = readJsonFile(
-        path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`),
-      );
-      expect(lambdaCFN.Resources.AmplifyResourcesPolicy.Properties.PolicyDocument.Statement.length).toBe(3);
-    });
-
-    it('update DDB trigger function to add permissions should not changed its dependsOn attributes of the trigger source', async () => {
-      await initJSProjectWithProfile(projRoot, {});
-      const ddbResourceName = 'testddbresource';
-      await addDDBWithTrigger(projRoot, { ddbResourceName });
-
-      const originalAmplifyMeta = getBackendAmplifyMeta(projRoot);
-      const functionResourceName = Object.keys(originalAmplifyMeta.function)[0];
-      const originalAttributes = originalAmplifyMeta.function[functionResourceName].dependsOn[0].attributes.sort();
-
-      await updateFunction(
-        projRoot,
-        {
-          additionalPermissions: {
-            resources: [ddbResourceName],
-            permissions: ['storage'],
-            choices: ['function', 'storage'],
-            operations: ['read', 'update'],
-          },
-        },
-        'nodejs',
-      );
-
-      const updateAmplifyMeta = getBackendAmplifyMeta(projRoot);
-      const updateAttributes = updateAmplifyMeta.function[functionResourceName].dependsOn[0].attributes.sort();
-      expect(originalAttributes).toEqual(updateAttributes);
-
-      await amplifyPushAuth(projRoot);
-      const amplifyMeta = getBackendAmplifyMeta(projRoot);
-      expect(amplifyMeta.function[functionResourceName].output).toBeDefined();
-      expect(amplifyMeta.function[functionResourceName].output.Arn).toBeDefined();
-    });
-
     it('function dependencies should be preserved when not editing permissions during `amplify update function`', async () => {
       const appName = createRandomName();
       await initJSProjectWithProfile(projRoot, {
@@ -309,90 +204,5 @@ describe('nodejs', () => {
       expect(gqlResponse.data.createTodo.name).toEqual('todo');
       expect(gqlResponse.data.createTodo.description).toEqual('sampleDesc');
     });
-
-    it('should be able to make console calls with feature flag turned off', async () => {
-      const fnName = `apienvvar${generateRandomShortId()}`;
-      await initJSProjectWithProfile(projRoot, {});
-      await addApi(projRoot, {
-        IAM: {},
-        transformerVersion: 1,
-      });
-      const beforeMeta = getBackendConfig(projRoot);
-      const apiName = Object.keys(beforeMeta.api)[0];
-      addFeatureFlag(projRoot, 'appsync', 'generategraphqlpermissions', false);
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['api'],
-            choices: ['api'],
-            resources: [apiName],
-            operations: ['read'],
-          },
-        },
-        'nodejs',
-      );
-      overrideFunctionCodeNode(projRoot, fnName, 'get-api-appsync.js');
-      await amplifyPush(projRoot);
-      const meta = getProjectMeta(projRoot);
-      const { Region: region, Name: functionName } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
-      const lambdaCFN = readJsonFile(
-        path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`),
-      );
-      const idKey = Object.keys(lambdaCFN.Resources.LambdaFunction.Properties.Environment.Variables).filter(value => value.endsWith('GRAPHQLAPIIDOUTPUT'))[0];
-      const fnResponse = await invokeFunction(functionName, JSON.stringify({ idKey }), region);
-
-      expect(fnResponse.StatusCode).toBe(200);
-      expect(fnResponse.Payload).toBeDefined();
-      const apiResponse = JSON.parse(fnResponse.Payload as string);
-      expect(apiResponse.graphqlApi).toBeDefined();
-      expect(apiResponse.graphqlApi.name).toContain(apiName);
-    });
-
-    it('allows granting of API access then revoking it', async () => {
-      const appName = createRandomName();
-
-      await initJSProjectWithProfile(projRoot, { name: appName });
-      await addApiWithoutSchema(projRoot);
-      await updateApiSchema(projRoot, appName, 'simple_model.graphql');
-
-      const fnName = `integtestfn${generateRandomShortId()}`;
-
-      await addFunction(
-        projRoot,
-        {
-          name: fnName,
-          functionTemplate: 'Hello World',
-          additionalPermissions: {
-            permissions: ['api'],
-            choices: ['api'],
-            resources: [appName],
-            operations: ['Mutation'],
-          },
-        },
-        'nodejs',
-      );
-
-      let lambdaCFN = readJsonFile(path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`));
-
-      expect(lambdaCFN.Resources.AmplifyResourcesPolicy.Properties.PolicyDocument.Statement.length).toBe(1);
-
-      await updateFunction(
-        projRoot,
-        {
-          additionalPermissions: {
-            permissions: ['api'], // unselects 'api'
-            choices: ['api'],
-          },
-        },
-        'nodejs',
-      );
-
-      lambdaCFN = readJsonFile(path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`));
-
-      expect(lambdaCFN?.Resources?.AmplifyResourcesPolicy?.Properties?.PolicyDocument?.Statement?.length).toBeUndefined();
-    });
   });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/function_9c.test.ts b/packages/amplify-e2e-tests/src/__tests__/function_9c.test.ts
new file mode 100644
index 00000000000..bd01006203b
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/function_9c.test.ts
@@ -0,0 +1,121 @@
+import {
+  addApiWithoutSchema,
+  addApi,
+  addFunction,
+  amplifyPush,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getProjectMeta,
+  initJSProjectWithProfile,
+  invokeFunction,
+  readJsonFile,
+  updateFunction,
+  overrideFunctionCodeNode,
+  getBackendConfig,
+  addFeatureFlag,
+  updateApiSchema,
+  createRandomName,
+  generateRandomShortId,
+} from '@aws-amplify/amplify-e2e-core';
+import path from 'path';
+import _ from 'lodash';
+
+describe('nodejs', () => {
+  describe('amplify add function with additional permissions', () => {
+    let projRoot: string;
+    beforeEach(async () => {
+      projRoot = await createNewProjectDir('fn-with-perm');
+    });
+
+    afterEach(async () => {
+      await deleteProject(projRoot);
+      deleteProjectDir(projRoot);
+    });
+
+    it('should be able to make console calls with feature flag turned off', async () => {
+      const fnName = `apienvvar${generateRandomShortId()}`;
+      await initJSProjectWithProfile(projRoot, {});
+      await addApi(projRoot, {
+        IAM: {},
+        transformerVersion: 1,
+      });
+      const beforeMeta = getBackendConfig(projRoot);
+      const apiName = Object.keys(beforeMeta.api)[0];
+      addFeatureFlag(projRoot, 'appsync', 'generategraphqlpermissions', false);
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['api'],
+            choices: ['api'],
+            resources: [apiName],
+            operations: ['read'],
+          },
+        },
+        'nodejs',
+      );
+      overrideFunctionCodeNode(projRoot, fnName, 'get-api-appsync.js');
+      await amplifyPush(projRoot);
+      const meta = getProjectMeta(projRoot);
+      const { Region: region, Name: functionName } = Object.keys(meta.function).map(key => meta.function[key])[0].output;
+      const lambdaCFN = readJsonFile(
+        path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`),
+      );
+      const idKey = Object.keys(lambdaCFN.Resources.LambdaFunction.Properties.Environment.Variables).filter(value => value.endsWith('GRAPHQLAPIIDOUTPUT'))[0];
+      const fnResponse = await invokeFunction(functionName, JSON.stringify({ idKey }), region);
+
+      expect(fnResponse.StatusCode).toBe(200);
+      expect(fnResponse.Payload).toBeDefined();
+      const apiResponse = JSON.parse(fnResponse.Payload as string);
+      expect(apiResponse.graphqlApi).toBeDefined();
+      expect(apiResponse.graphqlApi.name).toContain(apiName);
+    });
+
+    it('allows granting of API access then revoking it', async () => {
+      const appName = createRandomName();
+
+      await initJSProjectWithProfile(projRoot, { name: appName });
+      await addApiWithoutSchema(projRoot);
+      await updateApiSchema(projRoot, appName, 'simple_model.graphql');
+
+      const fnName = `integtestfn${generateRandomShortId()}`;
+
+      await addFunction(
+        projRoot,
+        {
+          name: fnName,
+          functionTemplate: 'Hello World',
+          additionalPermissions: {
+            permissions: ['api'],
+            choices: ['api'],
+            resources: [appName],
+            operations: ['Mutation'],
+          },
+        },
+        'nodejs',
+      );
+
+      let lambdaCFN = readJsonFile(path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`));
+
+      expect(lambdaCFN.Resources.AmplifyResourcesPolicy.Properties.PolicyDocument.Statement.length).toBe(1);
+
+      await updateFunction(
+        projRoot,
+        {
+          additionalPermissions: {
+            permissions: ['api'], // unselects 'api'
+            choices: ['api'],
+          },
+        },
+        'nodejs',
+      );
+
+      lambdaCFN = readJsonFile(path.join(projRoot, 'amplify', 'backend', 'function', fnName, `${fnName}-cloudformation-template.json`));
+
+      expect(lambdaCFN?.Resources?.AmplifyResourcesPolicy?.Properties?.PolicyDocument?.Statement?.length).toBeUndefined();
+    });
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/geo-import-1a.test.ts b/packages/amplify-e2e-tests/src/__tests__/geo-import-1a.test.ts
new file mode 100644
index 00000000000..452474dd628
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/geo-import-1a.test.ts
@@ -0,0 +1,59 @@
+import {
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  initJSProjectWithProfile,
+  addAuthWithDefault,
+  updateAuthAddUserGroups,
+  amplifyPushWithoutCodegen,
+  addGeofenceCollectionWithDefault,
+  importGeofencesWithDefault,
+  getProjectMeta,
+  getGeofenceCollection,
+  getGeofence,
+  getGeoJSONObj,
+} from '@aws-amplify/amplify-e2e-core';
+import { existsSync } from 'fs';
+import path from 'path';
+import _ from 'lodash';
+
+describe('amplify geo import', () => {
+  let projRoot: string;
+  let collectionName: string;
+  let region: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('geo-import-test');
+    await initJSProjectWithProfile(projRoot, {});
+    await addAuthWithDefault(projRoot);
+    const cognitoGroups = ['admin', 'admin1'];
+    await updateAuthAddUserGroups(projRoot, cognitoGroups);
+    await addGeofenceCollectionWithDefault(projRoot, cognitoGroups);
+    await amplifyPushWithoutCodegen(projRoot);
+    const meta = getProjectMeta(projRoot);
+    expect(meta.geo).toBeDefined();
+    const collectionId = _.findKey(meta.geo, ['service', 'GeofenceCollection']);
+    collectionName = meta.geo[collectionId].output.Name;
+    region = meta.geo[collectionId].output.Region;
+    const collection = await getGeofenceCollection(collectionName, region);
+    expect(collection.CollectionName).toBeDefined();
+  });
+
+  afterEach(async () => {
+    const metaFilePath = path.join(projRoot, 'amplify', '#current-cloud-backend', 'amplify-meta.json');
+    if (existsSync(metaFilePath)) {
+      await deleteProject(projRoot);
+    }
+    deleteProjectDir(projRoot);
+  });
+
+  it('should upload a valid GeoJSON file with auto-generated root level ID to provisioned geofence collection', async () => {
+    const geoJSONFileName = 'valid-root-level-id.json';
+    await expect(importGeofencesWithDefault(projRoot, { geoJSONFileName })).resolves.not.toThrow();
+    // check if geofence is provisioned in collection
+    const { features } = getGeoJSONObj(geoJSONFileName);
+    const geofenceID = features.map(feature => feature.id)[0];
+    expect(geofenceID).toBeDefined();
+    const geofence = await getGeofence(collectionName, geofenceID, region);
+    expect(geofence.GeofenceId).toEqual(geofenceID);
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/geo-import-1.test.ts b/packages/amplify-e2e-tests/src/__tests__/geo-import-1b.test.ts
similarity index 78%
rename from packages/amplify-e2e-tests/src/__tests__/geo-import-1.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/geo-import-1b.test.ts
index e01dc7247e3..4e08fbe92c5 100644
--- a/packages/amplify-e2e-tests/src/__tests__/geo-import-1.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/geo-import-1b.test.ts
@@ -45,17 +45,6 @@ describe('amplify geo import', () => {
     }
     deleteProjectDir(projRoot);
   });
-
-  it('should upload a valid GeoJSON file with auto-generated root level ID to provisioned geofence collection', async () => {
-    const geoJSONFileName = 'valid-root-level-id.json';
-    await expect(importGeofencesWithDefault(projRoot, { geoJSONFileName })).resolves.not.toThrow();
-    // check if geofence is provisioned in collection
-    const { features } = getGeoJSONObj(geoJSONFileName);
-    const geofenceID = features.map(feature => feature.id)[0];
-    expect(geofenceID).toBeDefined();
-    const geofence = await getGeofence(collectionName, geofenceID, region);
-    expect(geofence.GeofenceId).toEqual(geofenceID);
-  });
   it('should upload a valid GeoJSON file with custom property to provisioned geofence collection', async () => {
     const geoJSONFileName = 'valid-custom-property.json';
     const config = { geoJSONFileName, isRootLevelID: false, customProperty: 'name' };
diff --git a/packages/amplify-e2e-tests/src/__tests__/import_auth_1.test.ts b/packages/amplify-e2e-tests/src/__tests__/import_auth_1a.test.ts
similarity index 73%
rename from packages/amplify-e2e-tests/src/__tests__/import_auth_1.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/import_auth_1a.test.ts
index f11a24a7bb5..34db7854f46 100644
--- a/packages/amplify-e2e-tests/src/__tests__/import_auth_1.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/import_auth_1a.test.ts
@@ -1,6 +1,5 @@
-import { $TSObject, JSONUtilities, stateManager } from 'amplify-cli-core';
+import { $TSObject, JSONUtilities } from 'amplify-cli-core';
 import {
-  addApi,
   addApiWithCognitoUserPoolAuthTypeWhenAuthExists,
   addAuthUserPoolOnlyWithOAuth,
   AddAuthUserPoolOnlyWithOAuthSettings,
@@ -11,18 +10,14 @@ import {
   createNewProjectDir,
   deleteProject,
   deleteProjectDir,
-  getRootStackTemplate,
   initJSProjectWithProfile,
-  updateApiSchema,
 } from '@aws-amplify/amplify-e2e-core';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import {
-  addS3WithAuthConfigurationMismatchErrorExit,
   AuthProjectDetails,
   createUserPoolOnlyWithOAuthSettings,
   expectApiHasCorrectAuthConfig,
-  expectAuthParametersMatch,
   expectAuthProjectDetailsMatch,
   expectLocalAndCloudMetaFilesMatching,
   expectLocalTeamInfoHasNoCategories,
@@ -211,57 +206,4 @@ describe('auth import userpool only', () => {
       projectDetails.meta.UserPoolId,
     );
   });
-
-  it('imported userpool only auth, s3 storage add should fail with error', async () => {
-    await initJSProjectWithProfile(projectRoot, projectSettings);
-    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
-
-    // Imported auth resources cannot be used together with \'storage\' category\'s authenticated and unauthenticated access.
-    await expect(addS3WithAuthConfigurationMismatchErrorExit(projectRoot, {})).rejects.toThrowError(
-      'Process exited with non zero exit code 1',
-    );
-  });
-
-  it('imported user pool only should allow iam auth in graphql api', async () => {
-    await initJSProjectWithProfile(projectRoot, projectSettings);
-    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
-    await addApi(projectRoot, {
-      'Amazon Cognito User Pool': {},
-      IAM: {},
-      transformerVersion: 2,
-    }, false);
-    await updateApiSchema(projectRoot, projectPrefix, 'model_with_owner_and_iam_auth.graphql');
-    await amplifyPush(projectRoot);
-
-    const rootStackTemplate = getRootStackTemplate(projectRoot);
-    const apiStackParams = rootStackTemplate?.Resources?.[`api${projectPrefix}`]?.Properties?.Parameters;
-    expect(apiStackParams).toBeDefined();
-    expect(apiStackParams.authRoleName).toEqual({
-      Ref: 'AuthRoleName',
-    });
-    expect(apiStackParams.unauthRoleName).toEqual({
-      Ref: 'UnauthRoleName',
-    });
-  });
-
-  it('should update parameters.json with auth configuration', async () => {
-    await initJSProjectWithProfile(projectRoot, projectSettings);
-    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
-
-    const ogProjectAuthParameters = stateManager.getResourceParametersJson(ogProjectRoot, 'auth', ogProjectDetails.authResourceName);
-
-    let projectDetails = getAuthProjectDetails(projectRoot);
-    let projectAuthParameters = stateManager.getResourceParametersJson(projectRoot, 'auth', projectDetails.authResourceName);
-    expectAuthParametersMatch(projectAuthParameters, ogProjectAuthParameters);
-
-    await amplifyStatus(projectRoot, 'Import');
-    await amplifyPushAuth(projectRoot);
-    await amplifyStatus(projectRoot, 'No Change');
-
-    expectLocalAndCloudMetaFilesMatching(projectRoot);
-
-    projectDetails = getAuthProjectDetails(projectRoot);
-    projectAuthParameters = stateManager.getResourceParametersJson(projectRoot, 'auth', projectDetails.authResourceName);
-    expectAuthParametersMatch(projectAuthParameters, ogProjectAuthParameters);
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/import_auth_1b.test.ts b/packages/amplify-e2e-tests/src/__tests__/import_auth_1b.test.ts
new file mode 100644
index 00000000000..f2ad5184c21
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/import_auth_1b.test.ts
@@ -0,0 +1,158 @@
+import { stateManager } from 'amplify-cli-core';
+import {
+  addApi,
+  addAuthUserPoolOnlyWithOAuth,
+  AddAuthUserPoolOnlyWithOAuthSettings,
+  amplifyPush,
+  amplifyPushAuth,
+  amplifyStatus,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getRootStackTemplate,
+  initJSProjectWithProfile,
+  updateApiSchema,
+} from '@aws-amplify/amplify-e2e-core';
+import {
+  addS3WithAuthConfigurationMismatchErrorExit,
+  AuthProjectDetails,
+  createUserPoolOnlyWithOAuthSettings,
+  expectAuthParametersMatch,
+  expectLocalAndCloudMetaFilesMatching,
+  getAuthProjectDetails,
+  getOGAuthProjectDetails,
+  getShortId,
+  importUserPoolOnly,
+} from '../import-helpers';
+
+describe('auth import userpool only', () => {
+  // eslint-disable-next-line spellcheck/spell-checker
+  const projectPrefix = 'auimpup';
+  // eslint-disable-next-line spellcheck/spell-checker
+  const ogProjectPrefix = 'ogauimpup';
+
+  const projectSettings = {
+    name: projectPrefix,
+  };
+
+  const ogProjectSettings = {
+    name: ogProjectPrefix,
+  };
+
+  const dummyOGProjectSettings = {
+    // eslint-disable-next-line spellcheck/spell-checker
+    name: 'dummyog1',
+  };
+
+  // OG is the CLI project that creates the user pool to import by other test projects
+  let ogProjectRoot: string;
+  let ogShortId: string;
+  let ogSettings: AddAuthUserPoolOnlyWithOAuthSettings;
+  let ogProjectDetails: AuthProjectDetails;
+
+  // We need an extra OG project to make sure that autocomplete prompt hits in
+  let dummyOGProjectRoot: string;
+  let dummyOGSettings: AddAuthUserPoolOnlyWithOAuthSettings;
+
+  let projectRoot: string;
+  let ignoreProjectDeleteErrors = false;
+
+  beforeAll(async () => {
+    ogProjectRoot = await createNewProjectDir(ogProjectSettings.name);
+    ogShortId = getShortId();
+    ogSettings = createUserPoolOnlyWithOAuthSettings(ogProjectSettings.name, ogShortId);
+
+    await initJSProjectWithProfile(ogProjectRoot, ogProjectSettings);
+    await addAuthUserPoolOnlyWithOAuth(ogProjectRoot, ogSettings);
+    await amplifyPushAuth(ogProjectRoot);
+
+    ogProjectDetails = getOGAuthProjectDetails(ogProjectRoot);
+
+    dummyOGProjectRoot = await createNewProjectDir(dummyOGProjectSettings.name);
+    dummyOGSettings = createUserPoolOnlyWithOAuthSettings(dummyOGProjectSettings.name, ogShortId);
+
+    await initJSProjectWithProfile(dummyOGProjectRoot, dummyOGProjectSettings);
+    await addAuthUserPoolOnlyWithOAuth(dummyOGProjectRoot, dummyOGSettings);
+    await amplifyPushAuth(dummyOGProjectRoot);
+  });
+
+  afterAll(async () => {
+    await deleteProject(ogProjectRoot);
+    deleteProjectDir(ogProjectRoot);
+
+    await deleteProject(dummyOGProjectRoot);
+    deleteProjectDir(dummyOGProjectRoot);
+  });
+
+  beforeEach(async () => {
+    projectRoot = await createNewProjectDir(projectPrefix);
+    ignoreProjectDeleteErrors = false;
+  });
+
+  afterEach(async () => {
+    try {
+      await deleteProject(projectRoot);
+    } catch (error) {
+      // In some tests where project initialization fails it can lead to errors on cleanup which we
+      // can ignore if set by the test
+      if (!ignoreProjectDeleteErrors) {
+        throw error;
+      }
+    }
+
+    deleteProjectDir(projectRoot);
+  });
+
+  it('imported userpool only auth, s3 storage add should fail with error', async () => {
+    await initJSProjectWithProfile(projectRoot, projectSettings);
+    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
+
+    // Imported auth resources cannot be used together with \'storage\' category\'s authenticated and unauthenticated access.
+    await expect(addS3WithAuthConfigurationMismatchErrorExit(projectRoot, {})).rejects.toThrowError(
+      'Process exited with non zero exit code 1',
+    );
+  });
+
+  it('imported user pool only should allow iam auth in graphql api', async () => {
+    await initJSProjectWithProfile(projectRoot, projectSettings);
+    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
+    await addApi(projectRoot, {
+      'Amazon Cognito User Pool': {},
+      IAM: {},
+      transformerVersion: 2,
+    }, false);
+    await updateApiSchema(projectRoot, projectPrefix, 'model_with_owner_and_iam_auth.graphql');
+    await amplifyPush(projectRoot);
+
+    const rootStackTemplate = getRootStackTemplate(projectRoot);
+    const apiStackParams = rootStackTemplate?.Resources?.[`api${projectPrefix}`]?.Properties?.Parameters;
+    expect(apiStackParams).toBeDefined();
+    expect(apiStackParams.authRoleName).toEqual({
+      Ref: 'AuthRoleName',
+    });
+    expect(apiStackParams.unauthRoleName).toEqual({
+      Ref: 'UnauthRoleName',
+    });
+  });
+
+  it('should update parameters.json with auth configuration', async () => {
+    await initJSProjectWithProfile(projectRoot, projectSettings);
+    await importUserPoolOnly(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
+
+    const ogProjectAuthParameters = stateManager.getResourceParametersJson(ogProjectRoot, 'auth', ogProjectDetails.authResourceName);
+
+    let projectDetails = getAuthProjectDetails(projectRoot);
+    let projectAuthParameters = stateManager.getResourceParametersJson(projectRoot, 'auth', projectDetails.authResourceName);
+    expectAuthParametersMatch(projectAuthParameters, ogProjectAuthParameters);
+
+    await amplifyStatus(projectRoot, 'Import');
+    await amplifyPushAuth(projectRoot);
+    await amplifyStatus(projectRoot, 'No Change');
+
+    expectLocalAndCloudMetaFilesMatching(projectRoot);
+
+    projectDetails = getAuthProjectDetails(projectRoot);
+    projectAuthParameters = stateManager.getResourceParametersJson(projectRoot, 'auth', projectDetails.authResourceName);
+    expectAuthParametersMatch(projectAuthParameters, ogProjectAuthParameters);
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/import_auth_2.test.ts b/packages/amplify-e2e-tests/src/__tests__/import_auth_2a.test.ts
similarity index 74%
rename from packages/amplify-e2e-tests/src/__tests__/import_auth_2.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/import_auth_2a.test.ts
index 3860fb15e25..e06e52d6377 100644
--- a/packages/amplify-e2e-tests/src/__tests__/import_auth_2.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/import_auth_2a.test.ts
@@ -1,7 +1,6 @@
 import {
   AddAuthIdentityPoolAndUserPoolWithOAuthSettings,
   addAuthIdentityPoolAndUserPoolWithOAuth,
-  addS3Storage,
   amplifyPull,
   amplifyPushAuth,
   amplifyStatus,
@@ -10,7 +9,6 @@ import {
   deleteProjectDir,
   getAppId,
   initJSProjectWithProfile,
-  addS3StorageWithSettings,
 } from '@aws-amplify/amplify-e2e-core';
 import {
   AuthProjectDetails,
@@ -22,7 +20,6 @@ import {
   getAuthProjectDetails,
   getOGAuthProjectDetails,
   getShortId,
-  headlessPull,
   headlessPullExpectError,
   importIdentityPoolAndUserPool,
 } from '../import-helpers';
@@ -188,63 +185,4 @@ describe('auth import identity pool and userpool', () => {
       deleteProjectDir(projectRootPull);
     }
   });
-
-  it('auth headless pull successful', async () => {
-    await initJSProjectWithProfile(projectRoot, {
-      ...projectSettings,
-      disableAmplifyAppCreation: false,
-    });
-
-    await importIdentityPoolAndUserPool(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
-
-    await amplifyPushAuth(projectRoot);
-
-    let projectDetails = getAuthProjectDetails(projectRoot);
-
-    const appId = getAppId(projectRoot);
-    expect(appId).toBeDefined();
-
-    let projectRootPull;
-
-    try {
-      projectRootPull = await createNewProjectDir('authidp-pull');
-
-      const envName = 'integtest';
-      const providersParam = {
-        awscloudformation: {
-          configLevel: 'project',
-          useProfile: true,
-          profileName,
-        },
-      };
-
-      const categoryConfig = {
-        auth: {
-          userPoolId: projectDetails.team.userPoolId,
-          webClientId: projectDetails.team.webClientId,
-          nativeClientId: projectDetails.team.nativeClientId,
-          identityPoolId: projectDetails.team.identityPoolId,
-        },
-      };
-
-      await headlessPull(projectRootPull, { envName, appId }, providersParam, categoryConfig);
-
-      await amplifyStatus(projectRoot, 'No Change');
-
-      expectLocalAndCloudMetaFilesMatching(projectRoot);
-      expectLocalAndPulledBackendConfigMatching(projectRoot, projectRootPull);
-      expectAuthLocalAndOGMetaFilesOutputMatching(projectRoot, projectRootPull);
-    } finally {
-      deleteProjectDir(projectRootPull);
-    }
-  });
-
-  it('auth import, storage auth/guest access, push successful', async () => {
-    await initJSProjectWithProfile(projectRoot, projectSettings);
-    await importIdentityPoolAndUserPool(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
-    await addS3StorageWithSettings(projectRoot, {});
-    await amplifyPushAuth(projectRoot);
-
-    await amplifyStatus(projectRoot, 'No Change');
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/import_auth_2b.test.ts b/packages/amplify-e2e-tests/src/__tests__/import_auth_2b.test.ts
new file mode 100644
index 00000000000..beed84c1862
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/import_auth_2b.test.ts
@@ -0,0 +1,163 @@
+import {
+  AddAuthIdentityPoolAndUserPoolWithOAuthSettings,
+  addAuthIdentityPoolAndUserPoolWithOAuth,
+  amplifyPushAuth,
+  amplifyStatus,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  getAppId,
+  initJSProjectWithProfile,
+  addS3StorageWithSettings,
+} from '@aws-amplify/amplify-e2e-core';
+import {
+  AuthProjectDetails,
+  createIDPAndUserPoolWithOAuthSettings,
+  expectAuthLocalAndOGMetaFilesOutputMatching,
+  expectLocalAndCloudMetaFilesMatching,
+  expectLocalAndPulledBackendConfigMatching,
+  getAuthProjectDetails,
+  getOGAuthProjectDetails,
+  getShortId,
+  headlessPull,
+  importIdentityPoolAndUserPool,
+} from '../import-helpers';
+
+const profileName = 'amplify-integ-test-user';
+
+describe('auth import identity pool and userpool', () => {
+  const projectPrefix = 'auimpidup';
+  const ogProjectPrefix = 'ogauimpidup';
+
+  const projectSettings = {
+    name: projectPrefix,
+  };
+
+  const ogProjectSettings = {
+    name: ogProjectPrefix,
+  };
+
+  const dummyOGProjectSettings = {
+    name: 'dummyog2',
+  };
+
+  // OG is the CLI project that creates the user pool to import by other test projects
+  let ogProjectRoot: string;
+  let ogShortId: string;
+  let ogSettings: AddAuthIdentityPoolAndUserPoolWithOAuthSettings;
+  let ogProjectDetails: AuthProjectDetails;
+
+  // We need an extra OG project to make sure that autocomplete prompt hits in
+  let dummyOGProjectRoot: string;
+  let dummyOGShortId: string;
+  let dummyOGSettings: AddAuthIdentityPoolAndUserPoolWithOAuthSettings;
+
+  let projectRoot: string;
+  let ignoreProjectDeleteErrors: boolean = false;
+
+  beforeAll(async () => {
+    ogProjectRoot = await createNewProjectDir(ogProjectSettings.name);
+    ogShortId = getShortId();
+    ogSettings = createIDPAndUserPoolWithOAuthSettings(ogProjectSettings.name, ogShortId);
+
+    await initJSProjectWithProfile(ogProjectRoot, ogProjectSettings);
+    await addAuthIdentityPoolAndUserPoolWithOAuth(ogProjectRoot, ogSettings);
+    await amplifyPushAuth(ogProjectRoot);
+
+    ogProjectDetails = getOGAuthProjectDetails(ogProjectRoot);
+
+    dummyOGProjectRoot = await createNewProjectDir(dummyOGProjectSettings.name);
+    dummyOGShortId = getShortId();
+    dummyOGSettings = createIDPAndUserPoolWithOAuthSettings(dummyOGProjectSettings.name, ogShortId);
+
+    await initJSProjectWithProfile(dummyOGProjectRoot, dummyOGProjectSettings);
+    await addAuthIdentityPoolAndUserPoolWithOAuth(dummyOGProjectRoot, dummyOGSettings);
+    await amplifyPushAuth(dummyOGProjectRoot);
+  });
+
+  afterAll(async () => {
+    await deleteProject(ogProjectRoot);
+    deleteProjectDir(ogProjectRoot);
+
+    await deleteProject(dummyOGProjectRoot);
+    deleteProjectDir(dummyOGProjectRoot);
+  });
+
+  beforeEach(async () => {
+    projectRoot = await createNewProjectDir(projectPrefix);
+    ignoreProjectDeleteErrors = false;
+  });
+
+  afterEach(async () => {
+    try {
+      await deleteProject(projectRoot);
+    } catch (error) {
+      // In some tests where project initialization fails it can lead to errors on cleanup which we
+      // can ignore if set by the test
+      if (!ignoreProjectDeleteErrors) {
+        throw error;
+      }
+    }
+
+    deleteProjectDir(projectRoot);
+  });
+
+  it('auth headless pull successful', async () => {
+    await initJSProjectWithProfile(projectRoot, {
+      ...projectSettings,
+      disableAmplifyAppCreation: false,
+    });
+
+    await importIdentityPoolAndUserPool(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
+
+    await amplifyPushAuth(projectRoot);
+
+    let projectDetails = getAuthProjectDetails(projectRoot);
+
+    const appId = getAppId(projectRoot);
+    expect(appId).toBeDefined();
+
+    let projectRootPull;
+
+    try {
+      projectRootPull = await createNewProjectDir('authidp-pull');
+
+      const envName = 'integtest';
+      const providersParam = {
+        awscloudformation: {
+          configLevel: 'project',
+          useProfile: true,
+          profileName,
+        },
+      };
+
+      const categoryConfig = {
+        auth: {
+          userPoolId: projectDetails.team.userPoolId,
+          webClientId: projectDetails.team.webClientId,
+          nativeClientId: projectDetails.team.nativeClientId,
+          identityPoolId: projectDetails.team.identityPoolId,
+        },
+      };
+
+      await headlessPull(projectRootPull, { envName, appId }, providersParam, categoryConfig);
+
+      await amplifyStatus(projectRoot, 'No Change');
+
+      expectLocalAndCloudMetaFilesMatching(projectRoot);
+      expectLocalAndPulledBackendConfigMatching(projectRoot, projectRootPull);
+      expectAuthLocalAndOGMetaFilesOutputMatching(projectRoot, projectRootPull);
+    } finally {
+      deleteProjectDir(projectRootPull);
+    }
+  });
+
+  it('auth import, storage auth/guest access, push successful', async () => {
+    await initJSProjectWithProfile(projectRoot, projectSettings);
+    await importIdentityPoolAndUserPool(projectRoot, ogSettings.userPoolName, { native: '_app_client ', web: '_app_clientWeb' });
+    await addS3StorageWithSettings(projectRoot, {});
+    await amplifyPushAuth(projectRoot);
+
+    await amplifyStatus(projectRoot, 'No Change');
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-1.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-1a.test.ts
similarity index 81%
rename from packages/amplify-e2e-tests/src/__tests__/schema-auth-1.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/schema-auth-1a.test.ts
index 9353f87a3f7..8571faae979 100644
--- a/packages/amplify-e2e-tests/src/__tests__/schema-auth-1.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-1a.test.ts
@@ -20,9 +20,4 @@ describe('api directives @auth batch 1', () => {
     const testresult = await testSchema(projectDir, 'auth', 'owner1');
     expect(testresult).toBeTruthy();
   });
-
-  it('auth owner2', async () => {
-    const testresult = await testSchema(projectDir, 'auth', 'owner2');
-    expect(testresult).toBeTruthy();
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-1b.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-1b.test.ts
new file mode 100644
index 00000000000..3e9a3a5da87
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-1b.test.ts
@@ -0,0 +1,23 @@
+import {
+  initJSProjectWithProfile, deleteProject, createNewProjectDir, deleteProjectDir,
+} from '@aws-amplify/amplify-e2e-core';
+import { testSchema } from '../schema-api-directives';
+
+describe('api directives @auth batch 1', () => {
+  let projectDir: string;
+
+  beforeEach(async () => {
+    projectDir = await createNewProjectDir('auth1');
+    await initJSProjectWithProfile(projectDir, {});
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectDir);
+    deleteProjectDir(projectDir);
+  });
+
+  it('auth owner2', async () => {
+    const testresult = await testSchema(projectDir, 'auth', 'owner2');
+    expect(testresult).toBeTruthy();
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-2.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-2a.test.ts
similarity index 81%
rename from packages/amplify-e2e-tests/src/__tests__/schema-auth-2.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/schema-auth-2a.test.ts
index 7f51e78bea5..a00c3582eb0 100644
--- a/packages/amplify-e2e-tests/src/__tests__/schema-auth-2.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-2a.test.ts
@@ -20,8 +20,4 @@ describe('api directives @auth batch 2', () => {
     const testresult = await testSchema(projectDir, 'auth', 'owner5');
     expect(testresult).toBeTruthy();
   });
-  it('auth owner6', async () => {
-    const testresult = await testSchema(projectDir, 'auth', 'owner6');
-    expect(testresult).toBeTruthy();
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-2b.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-2b.test.ts
new file mode 100644
index 00000000000..a0a17f2337a
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-2b.test.ts
@@ -0,0 +1,23 @@
+import {
+  initJSProjectWithProfile, deleteProject, createNewProjectDir, deleteProjectDir,
+} from '@aws-amplify/amplify-e2e-core';
+import { testSchema } from '../schema-api-directives';
+
+describe('api directives @auth batch 2', () => {
+  let projectDir: string;
+
+  beforeEach(async () => {
+    projectDir = await createNewProjectDir('auth2');
+    await initJSProjectWithProfile(projectDir, {});
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectDir);
+    deleteProjectDir(projectDir);
+  });
+
+  it('auth owner6', async () => {
+    const testresult = await testSchema(projectDir, 'auth', 'owner6');
+    expect(testresult).toBeTruthy();
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-7.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7a.test.ts
similarity index 66%
rename from packages/amplify-e2e-tests/src/__tests__/schema-auth-7.test.ts
rename to packages/amplify-e2e-tests/src/__tests__/schema-auth-7a.test.ts
index 09f5ff737e1..bb816b48faf 100644
--- a/packages/amplify-e2e-tests/src/__tests__/schema-auth-7.test.ts
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7a.test.ts
@@ -20,14 +20,4 @@ describe('api directives @auth batch 7', () => {
     const testresult = await testSchema(projectDir, 'auth', 'fieldLevelAuth1');
     expect(testresult).toBeTruthy();
   });
-
-  it('auth fieldLevelAuth2', async () => {
-    const testresult = await testSchema(projectDir, 'auth', 'fieldLevelAuth2');
-    expect(testresult).toBeTruthy();
-  });
-
-  it('auth fieldLevelAuth3', async () => {
-    const testresult = await testSchema(projectDir, 'auth', 'fieldLevelAuth3');
-    expect(testresult).toBeTruthy();
-  });
 });
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-7b.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7b.test.ts
new file mode 100644
index 00000000000..bb816b48faf
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7b.test.ts
@@ -0,0 +1,23 @@
+import {
+  initJSProjectWithProfile, deleteProject, createNewProjectDir, deleteProjectDir,
+} from '@aws-amplify/amplify-e2e-core';
+import { testSchema } from '../schema-api-directives';
+
+describe('api directives @auth batch 7', () => {
+  let projectDir: string;
+
+  beforeEach(async () => {
+    projectDir = await createNewProjectDir('auth7');
+    await initJSProjectWithProfile(projectDir, {});
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectDir);
+    deleteProjectDir(projectDir);
+  });
+
+  it('auth fieldLevelAuth1', async () => {
+    const testresult = await testSchema(projectDir, 'auth', 'fieldLevelAuth1');
+    expect(testresult).toBeTruthy();
+  });
+});
diff --git a/packages/amplify-e2e-tests/src/__tests__/schema-auth-7c.test.ts b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7c.test.ts
new file mode 100644
index 00000000000..8a8adf78716
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/schema-auth-7c.test.ts
@@ -0,0 +1,23 @@
+import {
+  initJSProjectWithProfile, deleteProject, createNewProjectDir, deleteProjectDir,
+} from '@aws-amplify/amplify-e2e-core';
+import { testSchema } from '../schema-api-directives';
+
+describe('api directives @auth batch 7', () => {
+  let projectDir: string;
+
+  beforeEach(async () => {
+    projectDir = await createNewProjectDir('auth7');
+    await initJSProjectWithProfile(projectDir, {});
+  });
+
+  afterEach(async () => {
+    await deleteProject(projectDir);
+    deleteProjectDir(projectDir);
+  });
+
+  it('auth fieldLevelAuth3', async () => {
+    const testresult = await testSchema(projectDir, 'auth', 'fieldLevelAuth3');
+    expect(testresult).toBeTruthy();
+  });
+});
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
index 8602340f850..31bb80148d1 100644
--- a/scripts/split-e2e-tests.ts
+++ b/scripts/split-e2e-tests.ts
@@ -30,7 +30,9 @@ const WINDOWS_TEST_ALLOWLIST: string[] = [
   'notifications_pkg',
   'interactions_pkg',
   'analytics_pkg',
-  'schema-auth-7_pkg',
+  'schema-auth-7a_pkg',
+  'schema-auth-7b_pkg',
+  'schema-auth-7c_pkg',
   'schema-auth-11-a_pkg',
   'schema-auth-11-b_pkg',
   'schema-auth-11-c_pkg',
@@ -52,7 +54,9 @@ const WINDOWS_TEST_ALLOWLIST: string[] = [
   'schema-auth-10_pkg',
   'schema-searchable_pkg',
   'schema-auth-6_pkg',
-  'auth_8_pkg',
+  'auth_8a_pkg',
+  'auth_8b_pkg',
+  'auth_8c_pkg',
   's3-sse_pkg',
   'storage-2_pkg',
   'schema-auth-4a_pkg',
@@ -68,8 +72,10 @@ const WINDOWS_TEST_ALLOWLIST: string[] = [
   'auth_1a_pkg',
   'auth_1b_pkg',
   'auth_1c_pkg',
-  'schema-auth-1_pkg',
-  'schema-auth-2_pkg',
+  'schema-auth-1a_pkg',
+  'schema-auth-1b_pkg',
+  'schema-auth-2a_pkg',
+  'schema-auth-2b_pkg',
   'container-hosting_pkg',
   'schema-auth-13_pkg',
   'init_a_pkg',
@@ -92,8 +98,6 @@ const JOBS_RUNNING_ON_LINUX_LARGE_VM: string[] = [
   'auth_migration_update_v6',
   'function-migration_pkg',
   'geo-add-f_pkg',
-  'geo-import-1_pkg',
-  'import_auth_2_pkg',
   'import_s3_2a_pkg',
   'model-migration_pkg',
   'notifications-migration-2_v5',