From 816b9832b07435d0fc92ab4eef8eec670ef87be5 Mon Sep 17 00:00:00 2001 From: dgandhi62 Date: Wed, 26 Nov 2025 10:27:47 -0500 Subject: [PATCH 1/3] feat: add storage codegen naming --- .../src/generators/storage/index.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts index d03f62f733..f0d84cdb7a 100644 --- a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts +++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts @@ -55,7 +55,23 @@ export const renderStorage = (storageParams: StorageRenderParameters = {}) => { const postImportStatements = []; - // Remove name parameter - let Gen 2 auto-generate storage names + const amplifyGen1EnvStatement = createVariableStatement( + factory.createVariableDeclaration( + gen2BranchNameVariableName, + undefined, + undefined, + factory.createIdentifier('process.env.AWS_BRANCH ?? "sandbox"'), + ), + ); + postImportStatements.push(amplifyGen1EnvStatement); + + if (storageParams.storageIdentifier) { + const splitStorageIdentifier = storageParams.storageIdentifier.split('-'); + const storageNameWithoutBackendEnvName = splitStorageIdentifier.slice(0, -1).join('-'); + + const storageNameAssignment = createTemplateLiteral(`${storageNameWithoutBackendEnvName}-`, gen2BranchNameVariableName, ''); + propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier('name'), storageNameAssignment)); + } if (storageParams.accessPatterns) { propertyAssignments.push(getAccessPatterns(storageParams.accessPatterns)); } From 10e1d285970bd7e4ae6d5cb26f3f12f2dd739b96 Mon Sep 17 00:00:00 2001 From: dgandhi62 Date: Wed, 26 Nov 2025 11:55:44 -0500 Subject: [PATCH 2/3] feat: add gen1 bucket name as a comment to use after refactor --- .../src/generators/storage/index.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts index f0d84cdb7a..368c7672f1 100644 --- a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts +++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/storage/index.ts @@ -70,7 +70,18 @@ export const renderStorage = (storageParams: StorageRenderParameters = {}) => { const storageNameWithoutBackendEnvName = splitStorageIdentifier.slice(0, -1).join('-'); const storageNameAssignment = createTemplateLiteral(`${storageNameWithoutBackendEnvName}-`, gen2BranchNameVariableName, ''); - propertyAssignments.push(factory.createPropertyAssignment(factory.createIdentifier('name'), storageNameAssignment)); + const nameProperty = factory.createPropertyAssignment(factory.createIdentifier('name'), storageNameAssignment); + + // Add comments as leading trivia + ts.addSyntheticLeadingComment(nameProperty, ts.SyntaxKind.SingleLineCommentTrivia, ` Use this bucket name post refactor`, true); + ts.addSyntheticLeadingComment( + nameProperty, + ts.SyntaxKind.SingleLineCommentTrivia, + ` name: '${storageParams.storageIdentifier}',`, + true, + ); + + propertyAssignments.push(nameProperty); } if (storageParams.accessPatterns) { propertyAssignments.push(getAccessPatterns(storageParams.accessPatterns)); From 7181e1a8cea0aa240415c18d26e650fa5bcb7483 Mon Sep 17 00:00:00 2001 From: dgandhi62 Date: Fri, 28 Nov 2025 12:32:31 -0500 Subject: [PATCH 3/3] fix: template generator tests --- .../gen2-migration/refactor/generators/setup-jest.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/generators/setup-jest.ts b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/generators/setup-jest.ts index cf60214329..b98aa700ad 100644 --- a/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/generators/setup-jest.ts +++ b/packages/amplify-cli/src/__tests__/commands/gen2-migration/refactor/generators/setup-jest.ts @@ -1,7 +1,15 @@ -import { expect } from '@jest/globals'; import { toBeACloudFormationCommand } from './custom-test-matchers'; import { DescribeStackResourcesCommand } from '@aws-sdk/client-cloudformation'; +// Mock AWS SDK config loading +jest.mock('@smithy/shared-ini-file-loader', () => ({ + loadSharedConfigFiles: jest.fn().mockResolvedValue({ + configFile: { default: {} }, + credentialsFile: { default: {} }, + }), + getProfileName: jest.fn().mockReturnValue('default'), +})); + expect.extend({ toBeACloudFormationCommand, });