Skip to content

Commit 7eaeeaa

Browse files
aws-eddyhein-jHein JeongsobolkAmplifiyer
authored
chore: complete cli core migration (#12408)
* chore: complete prefixing cli-core migration * chore: generate api extract and sort package.json * feat(amplify-util-uibuilder): support StorageField (#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 (#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 (#12399) * feat: create new NodeJS functions with nodejs18.x runtime (#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 (#12337) * fix: catch undefined LogicalName when Lambda Layer versions are deleted from the console (#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]>
1 parent 2e4cfb9 commit 7eaeeaa

File tree

396 files changed

+565
-586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+565
-586
lines changed

‎packages/amplify-category-auth/src/__tests__/commands/import.headless.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jest.mock('@aws-amplify/amplify-prompts', () => ({
1313
},
1414
}));
1515

16-
jest.mock('amplify-cli-core', () => ({
17-
...(jest.requireActual('amplify-cli-core') as {}),
16+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
17+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
1818
FeatureFlags: {
1919
getBoolean: () => false,
2020
},

‎packages/amplify-category-auth/src/__tests__/commands/override.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jest.mock('@aws-amplify/amplify-prompts', () => ({
1919
},
2020
}));
2121

22-
jest.mock('amplify-cli-core', () => ({
23-
...(jest.requireActual('amplify-cli-core') as {}),
22+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
23+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
2424
stateManager: {
2525
getMeta: jest
2626
.fn()

‎packages/amplify-category-auth/src/__tests__/commands/remove.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jest.mock('../../provider-utils/awscloudformation/auth-inputs-manager/auth-input
2121
})),
2222
}));
2323

24-
jest.mock('amplify-cli-core');
24+
jest.mock('@aws-amplify/amplify-cli-core');
2525

2626
const stateManagerMock = stateManager as jest.Mocked<typeof stateManager>;
2727
stateManagerMock.getMeta.mockReturnValue({

‎packages/amplify-category-auth/src/__tests__/commands/update.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jest.mock('fs-extra', () => ({
1212

1313
jest.mock('@aws-amplify/amplify-prompts');
1414

15-
jest.mock('amplify-cli-core', () => ({
16-
...(jest.requireActual('amplify-cli-core') as Record<string, unknown>),
15+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
16+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as Record<string, unknown>),
1717
FeatureFlags: {
1818
getBoolean: jest.fn().mockReturnValue(true),
1919
},

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-inputs-manager/auth-input-state.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { AuthInputState } from '../../../../provider-utils/awscloudformation/aut
33

44
jest.mock('fs-extra');
55

6-
jest.mock('amplify-cli-core', () => ({
7-
...(jest.requireActual('amplify-cli-core') as {}),
6+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
7+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
88
pathManager: {
99
getBackendDirPath: jest.fn().mockReturnValue('mockbackendDirPath'),
1010
findProjectRoot: jest.fn().mockReturnValue('mockProject'),

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/auth-stack-transform.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
22
import process from 'process';
33
import { AmplifyAuthTransform } from '../../../../provider-utils/awscloudformation/auth-stack-builder';
44

5-
jest.mock('amplify-cli-core', () => ({
6-
...(jest.requireActual('amplify-cli-core') as {}),
5+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
6+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
77
stateManager: {
88
getLocalEnvInfo: jest.fn().mockReturnValue('testenv'),
99
getMeta: jest.fn().mockReturnValue({

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/auth-stack-builder/user-pool-group-stack-transform.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { $TSContext } from '@aws-amplify/amplify-cli-core';
22
import { AmplifyUserPoolGroupTransform } from '../../../../provider-utils/awscloudformation/auth-stack-builder';
33

4-
jest.mock('amplify-cli-core', () => ({
5-
...(jest.requireActual('amplify-cli-core') as Record<string, unknown>),
4+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
5+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as Record<string, unknown>),
66
stateManager: {
77
getLocalEnvInfo: jest.fn().mockReturnValue('testEnv'),
88
},

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/handlers/resource-handlers.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jest.mock('../../../../provider-utils/awscloudformation/utils/message-printer');
1818
// eslint-disable-next-line spellcheck/spell-checker
1919
jest.mock('../../../../provider-utils/awscloudformation/utils/amplify-meta-updaters');
2020
jest.mock('../../../../provider-utils/awscloudformation/utils/auth-sms-workflow-helper');
21-
jest.mock('amplify-cli-core');
21+
jest.mock('@aws-amplify/amplify-cli-core');
2222

2323
const getSupportedServicesMock = getSupportedServices as jest.MockedFunction<typeof getSupportedServices>;
2424
getSupportedServicesMock.mockReturnValue({

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/index.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { $TSContext } from '@aws-amplify/amplify-cli-core';
22
import { updateConfigOnEnvInit } from '../../../provider-utils/awscloudformation/index';
33

44
jest.mock('@aws-amplify/amplify-environment-parameters');
5-
jest.mock('amplify-cli-core', () => ({
6-
...(jest.requireActual('amplify-cli-core') as {}),
5+
jest.mock('@aws-amplify/amplify-cli-core', () => ({
6+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
77
JSONUtilities: {
88
writeJson: jest.fn(),
99
readJson: jest.fn(),

‎packages/amplify-category-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-defaults-appliers.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jest.mock('../../../../provider-utils/awscloudformation/service-walkthroughs/aut
1919
structureOAuthMetadata: jest.fn((result) => (result.include = 'this value')),
2020
}));
2121

22-
jest.mock('amplify-cli-core', () => {
22+
jest.mock('@aws-amplify/amplify-cli-core', () => {
2323
return {
24-
...(jest.requireActual('amplify-cli-core') as {}),
24+
...(jest.requireActual('@aws-amplify/amplify-cli-core') as {}),
2525
FeatureFlags: {
2626
getBoolean: jest.fn().mockImplementation((name, defaultValue) => {
2727
if (name === 'auth.enableCaseInsensitivity') {

0 commit comments

Comments
 (0)