chore: complete cli core migration (aws-amplify#12408)

* chore: complete prefixing cli-core migration * chore: generate api extract and sort package.json * feat(amplify-util-uibuilder): support StorageField (aws-amplify#12386) * feat((amplify-util-uibuilder): support StorageField * chore: update all aws-sdk versions to ^2.1350.0 * fix: revert changes to package.json.ejs * chore: add **/aws-sdk to package.json under resolutions * fix: revert white space changes in package.json.ejs * fix: bump codegen-ui to 2.12.1 * chore: bump lint memory --------- Co-authored-by: Hein Jeong <[email protected]> Co-authored-by: Kamil Sobol <[email protected]> * chore: reclassify CFN deployment errors if all the errors are from custom resources (aws-amplify#12398) * chore: reclassify CFN deployment errors if all the errors are from custom resources * fix: run prettier * fix: correctly scope amplify-cli-core * fix: pr review updates * fix: reclassify BucketNotExists error during init-env (aws-amplify#12399) * feat: create new NodeJS functions with nodejs18.x runtime (aws-amplify#12394) * chore: use node 18 in the packaged cli * chore: force prebuild-install to 7.11 * chore: try update * Revert "chore: try update" This reverts commit 6332c61. * chore: disable deprecation flags * chore: try node18 image * chore: more memory * chore: less parallelization * chore: try newer windows * Revert "chore: try newer windows" This reverts commit 59d5e6d. * chore: install node 18 on windows * chore: install node 18 on windows * chore: try this * chore: try this * chore: try this * chore: try this * Revert "Revert "chore: try newer windows"" This reverts commit dcac927. * chore: try this * chore: try this * chore: consolidate steps * chore: parallel in UT * chore: parallel in UT * chore: remove dotnet migration test * chore: fix results script * chore: fix dotnet * chore: install create react app * chore: allow old ssl * Revert "chore: allow old ssl" This reverts commit 08d03f9. * chore: use new react scripts * chore: poke ci * chore: fix init test * chore: use usual ECR repo * chore: use previous windows image * Revert "chore: use previous windows image" This reverts commit f3299f1. * chore: update pkg * chore: remove sequential promise * chore: run this in us west * Revert "chore: remove sequential promise" This reverts commit f053413. * chore: wait for selection * chore: wait for selection * chore: wait for selection * chore: wait for choice first * feat: generate nodejs18 lambdas * chore: dont use modules * chore: undo that * chore: make crud work * chore: fix test * chore: fix that test * chore: refactor imports * chore: fix test * chore: fix test * chore: fix test * chore: fix test * chore: fix test * chore: add nodejs12.x to migrate from * chore: fix test * chore: fix test * chore: test nodejs crud * chore: update tests * chore: pr feedback * fix: block auth w/ triggers push if not migrated to cli-inputs (aws-amplify#12337) * fix: catch undefined LogicalName when Lambda Layer versions are deleted from the console (aws-amplify#12351) * fix: throw a descriptive AmplifyError when an existing lambda layer LogicalName is undefined * chore: migrate missing files * chore: fixing failing tests * chore: sort package.json * chore: complete prefixing cli-core migration * chore: regenerate yarn.lock and address codeQL warnings * chore: lint file --------- Co-authored-by: Hein Jeong <[email protected]> Co-authored-by: Hein Jeong <[email protected]> Co-authored-by: Kamil Sobol <[email protected]> Co-authored-by: Amplifiyer <[email protected]> Co-authored-by: Edward Foyle <[email protected]> Co-authored-by: Spencer Stolworthy <[email protected]>
aws-eddy · Apr 7, 2023 · b830929 · b830929
1 parent cd2b204
commit b830929
Show file tree

Hide file tree

Showing 396 changed files with 565 additions and 586 deletions.
diff --git a/packages/amplify-category-auth/src/__tests__/commands/import.headless.test.ts b/packages/amplify-category-auth/src/__tests__/commands/import.headless.test.ts
@@ -13,8 +13,8 @@ jest.mock('@aws-amplify/amplify-prompts', () => ({
   },
 }));
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   FeatureFlags: {
     getBoolean: () => false,
   },

diff --git a/packages/amplify-category-auth/src/__tests__/commands/override.test.ts b/packages/amplify-category-auth/src/__tests__/commands/override.test.ts
@@ -19,8 +19,8 @@ jest.mock('@aws-amplify/amplify-prompts', () => ({
   },
 }));
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   stateManager: {
     getMeta: jest
       .fn()

diff --git a/packages/amplify-category-auth/src/__tests__/commands/remove.test.ts b/packages/amplify-category-auth/src/__tests__/commands/remove.test.ts
@@ -21,7 +21,7 @@ jest.mock('../../provider-utils/awscloudformation/auth-inputs-manager/auth-input
   })),
 }));
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 const stateManagerMock = stateManager as jest.Mocked<typeof stateManager>;
 stateManagerMock.getMeta.mockReturnValue({

diff --git a/packages/amplify-category-auth/src/__tests__/commands/update.test.ts b/packages/amplify-category-auth/src/__tests__/commands/update.test.ts
@@ -12,8 +12,8 @@ jest.mock('fs-extra', () => ({
 
 jest.mock('@aws-amplify/amplify-prompts');
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as Record<string, unknown>),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as Record<string, unknown>),
   FeatureFlags: {
     getBoolean: jest.fn().mockReturnValue(true),
   },

diff --git a/...c/__tests__/provider-utils/awscloudformation/auth-inputs-manager/auth-input-state.test.ts b/...c/__tests__/provider-utils/awscloudformation/auth-inputs-manager/auth-input-state.test.ts
@@ -3,8 +3,8 @@ import { AuthInputState } from '../../../../provider-utils/awscloudformation/aut
 
 jest.mock('fs-extra');
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   pathManager: {
     getBackendDirPath: jest.fn().mockReturnValue('mockbackendDirPath'),
     findProjectRoot: jest.fn().mockReturnValue('mockProject'),

diff --git a/..._tests__/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.test.ts b/..._tests__/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.test.ts
@@ -2,8 +2,8 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import process from 'process';
 import { AmplifyAuthTransform } from '../../../../provider-utils/awscloudformation/auth-stack-builder';
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   stateManager: {
     getLocalEnvInfo: jest.fn().mockReturnValue('testenv'),
     getMeta: jest.fn().mockReturnValue({

diff --git a/...ovider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.test.ts b/...ovider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.test.ts
@@ -1,8 +1,8 @@
 import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { AmplifyUserPoolGroupTransform } from '../../../../provider-utils/awscloudformation/auth-stack-builder';
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as Record<string, unknown>),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as Record<string, unknown>),
   stateManager: {
     getLocalEnvInfo: jest.fn().mockReturnValue('testEnv'),
   },

diff --git a/...ry-auth/src/__tests__/provider-utils/awscloudformation/handlers/resource-handlers.test.ts b/...ry-auth/src/__tests__/provider-utils/awscloudformation/handlers/resource-handlers.test.ts
@@ -18,7 +18,7 @@ jest.mock('../../../../provider-utils/awscloudformation/utils/message-printer');
 // eslint-disable-next-line spellcheck/spell-checker
 jest.mock('../../../../provider-utils/awscloudformation/utils/amplify-meta-updaters');
 jest.mock('../../../../provider-utils/awscloudformation/utils/auth-sms-workflow-helper');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 const getSupportedServicesMock = getSupportedServices as jest.MockedFunction<typeof getSupportedServices>;
 getSupportedServicesMock.mockReturnValue({

diff --git a/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/index.test.ts b/packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/index.test.ts
@@ -2,8 +2,8 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { updateConfigOnEnvInit } from '../../../provider-utils/awscloudformation/index';
 
 jest.mock('@aws-amplify/amplify-environment-parameters');
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   JSONUtilities: {
     writeJson: jest.fn(),
     readJson: jest.fn(),

diff --git a/...-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-defaults-appliers.test.ts b/...-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-defaults-appliers.test.ts
@@ -19,9 +19,9 @@ jest.mock('../../../../provider-utils/awscloudformation/service-walkthroughs/aut
   structureOAuthMetadata: jest.fn((result) => (result.include = 'this value')),
 }));
 
-jest.mock('amplify-cli-core', () => {
+jest.mock('@aws-amplify/amplify-cli-core', () => {
   return {
-    ...(jest.requireActual('amplify-cli-core') as {}),
+    ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
     FeatureFlags: {
       getBoolean: jest.fn().mockImplementation((name, defaultValue) => {
         if (name === 'auth.enableCaseInsensitivity') {

diff --git a/...uth/src/__tests__/provider-utils/awscloudformation/utils/check-for-auth-migration.test.ts b/...uth/src/__tests__/provider-utils/awscloudformation/utils/check-for-auth-migration.test.ts
@@ -19,8 +19,8 @@ jest.mock('@aws-amplify/amplify-prompts', () => ({
   },
 }));
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   stateManager: {
     getMeta: jest.fn().mockReturnValue({
       auth: {

diff --git a/...ts__/provider-utils/awscloudformation/utils/get-auth-trigger-stack-cfn-parameters.test.ts b/...ts__/provider-utils/awscloudformation/utils/get-auth-trigger-stack-cfn-parameters.test.ts
@@ -3,8 +3,8 @@ import { AuthInputState } from '../../../../provider-utils/awscloudformation/aut
 import { AttributeType } from '../../../../provider-utils/awscloudformation/service-walkthrough-types/awsCognito-user-input-types';
 import { getAuthTriggerStackCfnParameters } from '../../../../provider-utils/awscloudformation/utils/get-auth-trigger-stack-cfn-parameters';
 
-jest.mock('amplify-cli-core', () => ({
-  ...jest.requireActual('amplify-cli-core'),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...jest.requireActual('@aws-amplify/amplify-cli-core'),
   pathManager: {
     getBackendDirPath: jest.fn().mockReturnValue('mockDirPath'),
   },

diff --git a/...ategory-auth/src/__tests__/provider-utils/awscloudformation/utils/message-printer.test.ts b/...ategory-auth/src/__tests__/provider-utils/awscloudformation/utils/message-printer.test.ts
@@ -2,8 +2,8 @@ import { printSMSSandboxWarning } from '../../../../provider-utils/awscloudforma
 import { BannerMessage } from '@aws-amplify/amplify-cli-core';
 import { printer } from '@aws-amplify/amplify-prompts';
 import os from 'os';
-jest.mock('amplify-cli-core');
 
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('@aws-amplify/amplify-prompts');
 
 describe('printSMSSandboxWarning', () => {

diff --git a/...th/src/__tests__/provider-utils/awscloudformation/utils/migrate-override-resource.test.ts b/...th/src/__tests__/provider-utils/awscloudformation/utils/migrate-override-resource.test.ts
@@ -5,8 +5,8 @@ import * as path from 'path';
 jest.mock('@aws-amplify/amplify-prompts');
 jest.mock('fs-extra');
 
-jest.mock('amplify-cli-core', () => ({
-  ...(jest.requireActual('amplify-cli-core') as {}),
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
+  ...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
   pathManager: {
     findProjectRoot: jest.fn().mockReturnValue('somePath'),
     getBackendDirPath: jest.fn().mockReturnValue('mockProjectPath'),

diff --git a/...tegory-auth/src/__tests__/provider-utils/awscloudformation/utils/project-has-auth.test.ts b/...tegory-auth/src/__tests__/provider-utils/awscloudformation/utils/project-has-auth.test.ts
@@ -1,7 +1,7 @@
 import { stateManager } from '@aws-amplify/amplify-cli-core';
 import { projectHasAuth } from '../../../../provider-utils/awscloudformation/utils/project-has-auth';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 describe('auth category dependency check', () => {
   beforeEach(() => {

diff --git a/...ry-auth/src/__tests__/provider-utils/awscloudformation/utils/synthesize-resources.test.ts b/...ry-auth/src/__tests__/provider-utils/awscloudformation/utils/synthesize-resources.test.ts
@@ -4,7 +4,7 @@ import { updateUserPoolGroups } from '../../../../provider-utils/awscloudformati
 import { createAdminAuthFunction } from '../../../../provider-utils/awscloudformation/utils/synthesize-resources';
 import * as path from 'path';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('fs-extra');
 jest.mock('../../../../provider-utils/awscloudformation/utils/generate-user-pool-group-stack-template');
 

diff --git a/...uth/src/__tests__/provider-utils/awscloudformation/utils/trigger-flow-auth-helper.test.js b/...uth/src/__tests__/provider-utils/awscloudformation/utils/trigger-flow-auth-helper.test.js
@@ -1,4 +1,4 @@
-jest.mock('amplify-cli-core', () => {
+jest.mock('@aws-amplify/amplify-cli-core', () => {
   return {
     FeatureFlags: {
       getBoolean: jest.fn().mockImplementation((name, defaultValue) => {

diff --git a/packages/amplify-category-auth/src/index.js b/packages/amplify-category-auth/src/index.js
@@ -8,7 +8,7 @@ const path = require('path');
 const sequential = require('promise-sequential');
 
 const { validateAddAuthRequest, validateUpdateAuthRequest, validateImportAuthRequest } = require('amplify-util-headless-input');
-const { stateManager, AmplifySupportedService, JSONUtilities } = require('amplify-cli-core');
+const { stateManager, AmplifySupportedService, JSONUtilities } = require('@aws-amplify/amplify-cli-core');
 const { printer } = require('@aws-amplify/amplify-prompts');
 const { ensureEnvParamManager } = require('@aws-amplify/amplify-environment-parameters');
 const defaults = require('./provider-utils/awscloudformation/assets/cognito-defaults');

diff --git a/packages/amplify-category-function/src/__tests__/index.test.ts b/packages/amplify-category-function/src/__tests__/index.test.ts
@@ -6,7 +6,7 @@ import { getLocalFunctionSecretNames } from '../provider-utils/awscloudformation
 import { getAppId, secretsPathAmplifyAppIdKey } from '../provider-utils/awscloudformation/secrets/secretName';
 
 jest.mock('promise-sequential');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 jest.mock('../provider-utils/awscloudformation/secrets/functionSecretsStateManager');
 jest.mock('../provider-utils/awscloudformation/secrets/secretName');

diff --git a/...es/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts b/...es/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts
@@ -5,7 +5,7 @@ import { buildFunction } from '../../../provider-utils/awscloudformation/utils/b
 import { getBuilder } from '../../..';
 import { BuildType } from '@aws-amplify/amplify-function-plugin-interface';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 const stateManager_mock = stateManager as jest.Mocked<typeof stateManager>;
 stateManager_mock.getMeta.mockReturnValue({
   providers: {

diff --git a/...rc/__tests__/provider-utils/awscloudformation/secrets/functionSecretsStateManager.test.ts b/...rc/__tests__/provider-utils/awscloudformation/secrets/functionSecretsStateManager.test.ts
@@ -7,7 +7,7 @@ import * as stateManagerModule from '../../../../provider-utils/awscloudformatio
 import { getAppId, getFunctionSecretPrefix } from '../../../../provider-utils/awscloudformation/secrets/secretName';
 import { SSMClientWrapper } from '../../../../provider-utils/awscloudformation/secrets/ssmClientWrapper';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../../provider-utils/awscloudformation/secrets/ssmClientWrapper');
 jest.mock('../../../../provider-utils/awscloudformation/secrets/secretsCfnModifier');
 jest.mock('../../../../provider-utils/awscloudformation/secrets/secretName');

diff --git a/...ovider-utils/awscloudformation/service-walkthroughs/addLayerToFunctionWalkthrough.test.ts b/...ovider-utils/awscloudformation/service-walkthroughs/addLayerToFunctionWalkthrough.test.ts
@@ -11,7 +11,7 @@ import { LayerVersionMetadata } from '../../../../provider-utils/awscloudformati
 
 jest.mock('../../../../provider-utils/awscloudformation/utils/addLayerToFunctionUtils');
 jest.mock('../../../../provider-utils/awscloudformation/utils/layerCloudState');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 const stateManager_mock = stateManager as jest.Mocked<typeof stateManager>;
 stateManager_mock.getMeta.mockReturnValue({

diff --git a/.../provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.test.ts b/.../provider-utils/awscloudformation/service-walkthroughs/execPermissionsWalkthrough.test.ts
@@ -15,7 +15,7 @@ const backendDirPathStub = 'backendDirPath';
 
 jest.mock('../../../../provider-utils/awscloudformation/utils/cloudformationHelpers');
 
-jest.mock('amplify-cli-core', () => ({
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
   stateManager: {
     getMeta: jest.fn(),
   },
@@ -93,7 +93,7 @@ test('check CFN resources', async () => {
 
 test('env resources for CFN for DDB table and api', async () => {
   const contextStub = {
-    ...jest.requireActual('amplify-cli-core'),
+    ...jest.requireActual('@aws-amplify/amplify-cli-core'),
     print: {
       info: () => jest.fn,
     },
@@ -110,7 +110,7 @@ test('env resources for CFN for DDB table and api', async () => {
 
 test('env resources for CFN for auth and storage for api', async () => {
   const contextStub = {
-    ...jest.requireActual('amplify-cli-core'),
+    ...jest.requireActual('@aws-amplify/amplify-cli-core'),
     print: {
       info: () => jest.fn,
     },

diff --git a/...__tests__/provider-utils/awscloudformation/service-walkthroughs/removeWalkthrough.test.ts b/...__tests__/provider-utils/awscloudformation/service-walkthroughs/removeWalkthrough.test.ts
@@ -23,8 +23,8 @@ describe('remove walkthough test', () => {
       },
     };
 
-    jest.mock('amplify-cli-core', () => ({
-      ...jest.requireActual('amplify-cli-core'),
+    jest.mock('@aws-amplify/amplify-cli-core', () => ({
+      ...jest.requireActual('@aws-amplify/amplify-cli-core'),
       promptConfirmationRemove: jest.fn().mockReturnValue(true),
       stateManager: {
         getLocalEnvInfo: jest.fn().mockReturnValue({ envName }),

diff --git a/...egory-function/src/__tests__/provider-utils/awscloudformation/utils/buildFunction.test.ts b/...egory-function/src/__tests__/provider-utils/awscloudformation/utils/buildFunction.test.ts
@@ -2,7 +2,7 @@ import { $TSContext, pathManager } from '@aws-amplify/amplify-cli-core';
 import { BuildType, FunctionRuntimeLifecycleManager } from '@aws-amplify/amplify-function-plugin-interface';
 import { buildFunction } from '../../../../provider-utils/awscloudformation/utils/buildFunction';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 
 const pathManager_mock = pathManager as jest.Mocked<typeof pathManager>;
 pathManager_mock.getBackendDirPath.mockReturnValue('mockpath');

diff --git a/...category-function/src/__tests__/provider-utils/awscloudformation/utils/buildLayer.test.ts b/...category-function/src/__tests__/provider-utils/awscloudformation/utils/buildLayer.test.ts
@@ -3,7 +3,7 @@ import { FunctionRuntimeLifecycleManager } from '@aws-amplify/amplify-function-p
 import { buildLayer } from '../../../../provider-utils/awscloudformation/utils/buildLayer';
 import { loadLayerConfigurationFile } from '../../../../provider-utils/awscloudformation/utils/layerConfiguration';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../../provider-utils/awscloudformation/utils/layerConfiguration');
 
 const pathManager_mock = pathManager as jest.Mocked<typeof pathManager>;

diff --git a/...on/src/__tests__/provider-utils/awscloudformation/utils/ensure-lambda-arn-outputs.test.ts b/...on/src/__tests__/provider-utils/awscloudformation/utils/ensure-lambda-arn-outputs.test.ts
@@ -1,7 +1,7 @@
 import { pathManager, stateManager, readCFNTemplate, writeCFNTemplate, CFNTemplateFormat } from '@aws-amplify/amplify-cli-core';
 import { ensureLambdaExecutionRoleOutputs } from '../../../../provider-utils/awscloudformation/utils/ensure-lambda-arn-outputs';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 const pathManagerMock = pathManager as jest.Mocked<typeof pathManager>;
 const stateManagerMock = stateManager as jest.Mocked<typeof stateManager>;
 const readCFNTemplateMock = readCFNTemplate as jest.MockedFunction<typeof readCFNTemplate>;

diff --git a/...n/src/__tests__/provider-utils/awscloudformation/utils/environmentVariablesHelper.test.ts b/...n/src/__tests__/provider-utils/awscloudformation/utils/environmentVariablesHelper.test.ts
@@ -3,7 +3,7 @@ import { prompter } from '@aws-amplify/amplify-prompts';
 import * as envVarHelper from '../../../../provider-utils/awscloudformation/utils/environmentVariablesHelper';
 import * as uuid from 'uuid';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('@aws-amplify/amplify-prompts');
 jest.mock('uuid');
 

diff --git a/...unction/src/__tests__/provider-utils/awscloudformation/utils/getDependentFunction.test.ts b/...unction/src/__tests__/provider-utils/awscloudformation/utils/getDependentFunction.test.ts
@@ -5,7 +5,7 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
 jest.mock('fs-extra');
 jest.mock('../../../../provider-utils/awscloudformation/utils/loadFunctionParameters');
 jest.mock('path');
-jest.mock('amplify-cli-core', () => ({
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
   JSONUtilities: {
     readJson: jest.fn(),
     writeJson: jest.fn(),

diff --git a/...ts__/provider-utils/awscloudformation/utils/lambda-layer-cloud-formation-template.test.ts b/...ts__/provider-utils/awscloudformation/utils/lambda-layer-cloud-formation-template.test.ts
@@ -9,7 +9,7 @@ import {
   PermissionEnum,
 } from '../../../../provider-utils/awscloudformation/utils/layerParams';
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 const pathManager_mock = pathManager as jest.Mocked<typeof pathManager>;
 const stateManager_mock = stateManager as jest.Mocked<typeof stateManager>;
 pathManager_mock.getResourceDirectoryPath.mockReturnValue('fakeProject/amplify/backend/myLayer/');
@@ -65,7 +65,7 @@ function validateOutput(layerCfn) {
 
 describe('test layer CFN generation functions', () => {
   beforeAll(() => {
-    jest.mock('amplify-cli-core', () => ({
+    jest.mock('@aws-amplify/amplify-cli-core', () => ({
       stateManager: {
         getLocalEnvInfo: jest.fn().mockReturnValue('testenv'),
       },

diff --git a/...ction/src/__tests__/provider-utils/awscloudformation/utils/loadFunctionParameters.test.ts b/...ction/src/__tests__/provider-utils/awscloudformation/utils/loadFunctionParameters.test.ts
@@ -1,7 +1,7 @@
 import { JSONUtilities } from '@aws-amplify/amplify-cli-core';
 import { loadFunctionParameters } from '../../../../provider-utils/awscloudformation/utils/loadFunctionParameters';
 
-jest.mock('amplify-cli-core', () => ({
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
   JSONUtilities: {
     readJson: jest.fn(),
     writeJson: jest.fn(),

diff --git a/...ory-function/src/__tests__/provider-utils/awscloudformation/utils/packageFunction.test.ts b/...ory-function/src/__tests__/provider-utils/awscloudformation/utils/packageFunction.test.ts
@@ -5,7 +5,7 @@ import { PackageRequestMeta } from '../../../../provider-utils/awscloudformation
 import { zipPackage } from '../../../../provider-utils/awscloudformation/utils/zipResource';
 
 jest.mock('fs-extra');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../../provider-utils/awscloudformation/utils/functionPluginLoader');
 jest.mock('../../../../provider-utils/awscloudformation/utils/zipResource');
 

diff --git a/...tegory-function/src/__tests__/provider-utils/awscloudformation/utils/packageLayer.test.ts b/...tegory-function/src/__tests__/provider-utils/awscloudformation/utils/packageLayer.test.ts
@@ -6,7 +6,7 @@ import { LayerCloudState } from '../../../../provider-utils/awscloudformation/ut
 import { loadLayerConfigurationFile } from '../../../../provider-utils/awscloudformation/utils/layerConfiguration';
 
 jest.mock('fs-extra');
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../../provider-utils/awscloudformation/utils/functionPluginLoader');
 jest.mock('../../../../provider-utils/awscloudformation/utils/layerConfiguration');
 jest.mock('../../../../provider-utils/awscloudformation/utils/layerCloudState');

diff --git a/...gory-function/src/__tests__/provider-utils/awscloudformation/utils/storeResources.test.ts b/...gory-function/src/__tests__/provider-utils/awscloudformation/utils/storeResources.test.ts
@@ -2,7 +2,7 @@ import { $TSContext, JSONUtilities, pathManager } from '@aws-amplify/amplify-cli
 import { LambdaLayer } from '@aws-amplify/amplify-function-plugin-interface';
 import { saveMutableState } from '../../../../provider-utils/awscloudformation/utils/storeResources';
 
-jest.mock('amplify-cli-core', () => ({
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
   JSONUtilities: {
     readJson: jest.fn(),
     writeJson: jest.fn(),

diff --git a/...n/src/__tests__/provider-utils/awscloudformation/utils/updateDependentFunctionCfn.test.ts b/...n/src/__tests__/provider-utils/awscloudformation/utils/updateDependentFunctionCfn.test.ts
@@ -14,7 +14,7 @@ jest.mock('../../../../provider-utils/awscloudformation/utils/loadFunctionParame
 jest.mock('path');
 jest.mock('../../../../provider-utils/awscloudformation/service-walkthroughs/lambda-walkthrough');
 
-jest.mock('amplify-cli-core', () => ({
+jest.mock('@aws-amplify/amplify-cli-core', () => ({
   JSONUtilities: {
     readJson: jest.fn(),
     writeJson: jest.fn(),

diff --git a/packages/amplify-category-function/src/__tests__/utils/layerCloudState.test.ts b/packages/amplify-category-function/src/__tests__/utils/layerCloudState.test.ts
@@ -1,4 +1,4 @@
-import { $TSContext } from 'amplify-cli-core';
+import { $TSContext } from '@aws-amplify/amplify-cli-core';
 import { LayerCloudState } from '../../provider-utils/awscloudformation/utils/layerCloudState';
 
 /**

diff --git a/packages/amplify-category-geo/src/__tests__/commands/geo/add.test.ts b/packages/amplify-category-geo/src/__tests__/commands/geo/add.test.ts
@@ -6,7 +6,7 @@ import { run } from '../../../commands/geo/add';
 const mockAddResource = addResource as jest.MockedFunction<typeof addResource>;
 mockAddResource.mockImplementation(async (_, service: string) => service);
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../provider-controllers/index');
 
 describe('add command tests', () => {

diff --git a/packages/amplify-category-geo/src/__tests__/commands/geo/remove.test.ts b/packages/amplify-category-geo/src/__tests__/commands/geo/remove.test.ts
@@ -11,7 +11,7 @@ mockRemoveResource.mockImplementation((context: $TSContext, service: string): Pr
   });
 });
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../provider-controllers');
 
 describe('remove command tests', () => {

diff --git a/packages/amplify-category-geo/src/__tests__/commands/geo/update.test.ts b/packages/amplify-category-geo/src/__tests__/commands/geo/update.test.ts
@@ -6,7 +6,7 @@ import { run } from '../../../commands/geo/update';
 const mockUpdateResource = updateResource as jest.MockedFunction<typeof updateResource>;
 mockUpdateResource.mockImplementation(async (_, service: string) => service);
 
-jest.mock('amplify-cli-core');
+jest.mock('@aws-amplify/amplify-cli-core');
 jest.mock('../../../provider-controllers/index');
 
 describe('update command tests', () => {