From a22772d54c65ff59dffd5721e17ec4501c16d759 Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Thu, 19 Sep 2024 14:36:29 -0700 Subject: [PATCH 1/7] feat: add error for unsupported categories --- .../src/backend/synthesizer.ts | 19 ++++++++++-- packages/amplify-gen2-codegen/src/index.ts | 9 ++++++ packages/amplify-migration/src/index.ts | 31 ++++++++++++++++++- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts index 4484f02d3e4..ac32479a4f0 100644 --- a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts +++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts @@ -30,6 +30,9 @@ export interface BackendRenderParameters { importFrom: string; functionNamesAndCategories: Map; }; + unsupportedCategories?: { + categories?: string[]; + }; } export class BackendSynthesizer { @@ -105,6 +108,7 @@ export class BackendSynthesizer { const backendFunctionIdentifier = factory.createIdentifier('defineBackend'); const imports = []; + const errors = []; const defineBackendProperties = []; const nodes = []; @@ -136,12 +140,21 @@ export class BackendSynthesizer { defineBackendProperties.push(functionProperty); imports.push(this.createImportStatement([factory.createIdentifier(functionName)], `./${category}/${functionName}/resource`)); } - - // imports.push(this.createImportStatement(functionIdentifiers, renderArgs.function.importFrom)); } imports.push(this.createImportStatement([backendFunctionIdentifier], '@aws-amplify/backend')); + if (renderArgs.unsupportedCategories && renderArgs.unsupportedCategories.categories) { + const categories = renderArgs.unsupportedCategories.categories; + console.log('unsupported categories -- ', categories); + errors.push( + factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [ + // eslint-disable-next-line spellcheck/spell-checker + factory.createStringLiteral(`Categories ${categories.join(', ')} are unsupported`), + ]), + ); + } + const callBackendFn = this.defineBackendCall(backendFunctionIdentifier, defineBackendProperties); const backendVariable = factory.createVariableDeclaration('backend', undefined, undefined, callBackendFn); const backendStatement = factory.createVariableStatement( @@ -200,6 +213,6 @@ export class BackendSynthesizer { ), ); } - return factory.createNodeArray([...imports, backendStatement, ...nodes], true); + return factory.createNodeArray([...imports, ...errors, backendStatement, ...nodes], true); } } diff --git a/packages/amplify-gen2-codegen/src/index.ts b/packages/amplify-gen2-codegen/src/index.ts index a757c5f9f7b..9108577e84a 100644 --- a/packages/amplify-gen2-codegen/src/index.ts +++ b/packages/amplify-gen2-codegen/src/index.ts @@ -52,6 +52,7 @@ export interface Gen2RenderingOptions { storage?: StorageRenderParameters; data?: DataDefinition; functions?: FunctionDefinition[]; + unsupportedCategories?: string[]; fileWriter?: (content: string, path: string) => Promise; } const createFileWriter = (path: string) => async (content: string) => fs.writeFile(path, content); @@ -64,6 +65,7 @@ export const createGen2Renderer = ({ storage, data, functions, + unsupportedCategories, fileWriter = (content, path) => createFileWriter(path)(content), }: Readonly): Renderer => { const ensureOutputDir = new EnsureDirectory(outputDir); @@ -81,6 +83,13 @@ export const createGen2Renderer = ({ const renderers: Renderer[] = [ensureOutputDir, ensureAmplifyDirectory, amplifyPackageJson, jsonRenderer]; + if (unsupportedCategories && unsupportedCategories?.length >= 1) { + console.log('inside unsupported ctageories: -- ', unsupportedCategories); + backendRenderOptions.unsupportedCategories = { + categories: unsupportedCategories, + }; + } + if (functions) { const functionNamesAndCategory = new Map(); for (const func of functions) { diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts index d00944f97be..3bf03327b3b 100644 --- a/packages/amplify-migration/src/index.ts +++ b/packages/amplify-migration/src/index.ts @@ -58,6 +58,7 @@ const generateGen2Code = async ({ storage: await storageDefinitionFetcher.getDefinition(), data: await dataDefinitionFetcher.getDefinition(), functions: await functionsDefinitionFetcher.getDefinition(), + unsupportedCategories: unsupportedCategories(), }; const pipeline = createGen2Renderer(gen2RenderOptions); @@ -88,13 +89,21 @@ const getAuthTriggersConnections = async (): Promise JSON.parse(connection)); + } const connections = triggerConnections.reduce((prev, curr) => { prev[curr.triggerType] = getFunctionPath(curr.lambdaFunctionName); return prev; }, {} as Partial>); return connections; } catch (e) { + console.log('error -- ', e); throw new Error('Error parsing auth trigger connections'); } } @@ -106,6 +115,25 @@ const resolveAppId = (): string => { return meta?.providers?.awscloudformation?.AmplifyAppId; }; +const unsupportedCategories = (): string[] => { + const unsupportedCategories: string[] = ['geo', 'analytics', 'predictions', 'notifications', 'interactions', 'custom']; + + const meta = stateManager.getMeta(); + const categories = Object.keys(meta); + const unsupportedCategoriesList = categories.filter((category) => unsupportedCategories.includes(category)); + + const apiList = meta?.api; + if (apiList) { + Object.keys(apiList).forEach((api) => { + const apiObj = apiList[api]; + if (apiObj.service == 'API Gateway') { + unsupportedCategoriesList.push('api'); + } + }); + } + return unsupportedCategoriesList; +}; + export async function execute() { const amplifyClient = new AmplifyClient(); const s3Client = new S3Client(); @@ -120,6 +148,7 @@ export async function execute() { const amplifyStackParser = new AmplifyStackParser(cloudFormationClient); const backendEnvironmentResolver = new BackendEnvironmentResolver(appId, amplifyClient); const backendEnvironment = await backendEnvironmentResolver.selectBackendEnvironment(); + await generateGen2Code({ outputDirectory: './output', storageDefinitionFetcher: new AppStorageDefinitionFetcher(backendEnvironmentResolver, new BackendDownloader(s3Client), s3Client), From 1e8d17585157a460ae8cf1f53546b270893e2b99 Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Mon, 23 Sep 2024 15:18:13 -0700 Subject: [PATCH 2/7] feat: unsupported categories codegen --- packages/amplify-cli/package.json | 2 +- .../src/backend/synthesizer.ts | 27 ++++++++---- packages/amplify-gen2-codegen/src/index.ts | 5 +-- packages/amplify-migration/src/index.ts | 42 +++++++++++++------ 4 files changed, 51 insertions(+), 25 deletions(-) diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 453d7f043b6..3fea795e9a3 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -36,7 +36,7 @@ "dependencies": { "@aws-amplify/amplify-app": "5.0.36", "@aws-amplify/amplify-category-analytics": "5.0.36", - "@aws-amplify/amplify-category-api": "^5.12.5", + "@aws-amplify/amplify-category-api": "../../../../AmplifyCategoryApi/amplify-category-api", "@aws-amplify/amplify-category-auth": "3.7.15", "@aws-amplify/amplify-category-custom": "3.1.24", "@aws-amplify/amplify-category-function": "5.7.10", diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts index ac32479a4f0..e65c6ae987e 100644 --- a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts +++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts @@ -31,7 +31,7 @@ export interface BackendRenderParameters { functionNamesAndCategories: Map; }; unsupportedCategories?: { - categories?: string[]; + categories?: Map; }; } @@ -108,7 +108,7 @@ export class BackendSynthesizer { const backendFunctionIdentifier = factory.createIdentifier('defineBackend'); const imports = []; - const errors = []; + const errors: ts.CallExpression[] = []; const defineBackendProperties = []; const nodes = []; @@ -146,13 +146,22 @@ export class BackendSynthesizer { if (renderArgs.unsupportedCategories && renderArgs.unsupportedCategories.categories) { const categories = renderArgs.unsupportedCategories.categories; - console.log('unsupported categories -- ', categories); - errors.push( - factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [ - // eslint-disable-next-line spellcheck/spell-checker - factory.createStringLiteral(`Categories ${categories.join(', ')} are unsupported`), - ]), - ); + + for (const [key, value] of categories) { + if (key == 'custom') { + errors.push( + factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [ + factory.createStringLiteral(`Category ${key} has changed, learn more ${value}`), + ]), + ); + } else { + errors.push( + factory.createCallExpression(factory.createIdentifier('throw new Error'), undefined, [ + factory.createStringLiteral(`Category ${key} is unsupported, please follow ${value}`), + ]), + ); + } + } } const callBackendFn = this.defineBackendCall(backendFunctionIdentifier, defineBackendProperties); diff --git a/packages/amplify-gen2-codegen/src/index.ts b/packages/amplify-gen2-codegen/src/index.ts index 9108577e84a..410d0168f34 100644 --- a/packages/amplify-gen2-codegen/src/index.ts +++ b/packages/amplify-gen2-codegen/src/index.ts @@ -52,7 +52,7 @@ export interface Gen2RenderingOptions { storage?: StorageRenderParameters; data?: DataDefinition; functions?: FunctionDefinition[]; - unsupportedCategories?: string[]; + unsupportedCategories?: Map; fileWriter?: (content: string, path: string) => Promise; } const createFileWriter = (path: string) => async (content: string) => fs.writeFile(path, content); @@ -83,8 +83,7 @@ export const createGen2Renderer = ({ const renderers: Renderer[] = [ensureOutputDir, ensureAmplifyDirectory, amplifyPackageJson, jsonRenderer]; - if (unsupportedCategories && unsupportedCategories?.length >= 1) { - console.log('inside unsupported ctageories: -- ', unsupportedCategories); + if (unsupportedCategories && unsupportedCategories?.size >= 1) { backendRenderOptions.unsupportedCategories = { categories: unsupportedCategories, }; diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts index 3bf03327b3b..e35fd49d8ac 100644 --- a/packages/amplify-migration/src/index.ts +++ b/packages/amplify-migration/src/index.ts @@ -115,22 +115,40 @@ const resolveAppId = (): string => { return meta?.providers?.awscloudformation?.AmplifyAppId; }; -const unsupportedCategories = (): string[] => { - const unsupportedCategories: string[] = ['geo', 'analytics', 'predictions', 'notifications', 'interactions', 'custom']; +const unsupportedCategories = (): Map => { + const unsupportedCategories = new Map(); + + unsupportedCategories.set('geo', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/'); + unsupportedCategories.set('analytics', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/analytics/'); + unsupportedCategories.set('predictions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/'); + unsupportedCategories.set('notifications', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/in-app-messaging/'); + unsupportedCategories.set('interactions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/interactions/'); + unsupportedCategories.set('custom', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/custom-resources/'); + unsupportedCategories.set('api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'); const meta = stateManager.getMeta(); const categories = Object.keys(meta); - const unsupportedCategoriesList = categories.filter((category) => unsupportedCategories.includes(category)); - - const apiList = meta?.api; - if (apiList) { - Object.keys(apiList).forEach((api) => { - const apiObj = apiList[api]; - if (apiObj.service == 'API Gateway') { - unsupportedCategoriesList.push('api'); + + const unsupportedCategoriesList = new Map(); + + categories.forEach((category) => { + if (category == 'api') { + const apiList = meta?.api; + if (apiList) { + Object.keys(apiList).forEach((api) => { + const apiObj = apiList[api]; + if (apiObj.service == 'API Gateway') { + unsupportedCategoriesList.set(category, unsupportedCategories.get(category)!); + } + }); } - }); - } + } else { + if (unsupportedCategories.has(category)) { + unsupportedCategoriesList.set(category, unsupportedCategories.get(category)!); + } + } + }); + return unsupportedCategoriesList; }; From 94552fdeaca3ffdede0182adbef9a37885bff621 Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Mon, 23 Sep 2024 15:22:22 -0700 Subject: [PATCH 3/7] feat: unsupported categories codegen --- packages/amplify-cli/package.json | 2 +- packages/amplify-migration/src/index.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json index 3fea795e9a3..453d7f043b6 100644 --- a/packages/amplify-cli/package.json +++ b/packages/amplify-cli/package.json @@ -36,7 +36,7 @@ "dependencies": { "@aws-amplify/amplify-app": "5.0.36", "@aws-amplify/amplify-category-analytics": "5.0.36", - "@aws-amplify/amplify-category-api": "../../../../AmplifyCategoryApi/amplify-category-api", + "@aws-amplify/amplify-category-api": "^5.12.5", "@aws-amplify/amplify-category-auth": "3.7.15", "@aws-amplify/amplify-category-custom": "3.1.24", "@aws-amplify/amplify-category-function": "5.7.10", diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts index e35fd49d8ac..829c0f52e79 100644 --- a/packages/amplify-migration/src/index.ts +++ b/packages/amplify-migration/src/index.ts @@ -103,7 +103,6 @@ const getAuthTriggersConnections = async (): Promise>); return connections; } catch (e) { - console.log('error -- ', e); throw new Error('Error parsing auth trigger connections'); } } From 4471f616beb85aa54ba7ccd4ef45baf3ec1873cb Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Tue, 24 Sep 2024 11:44:08 -0700 Subject: [PATCH 4/7] chore: added tests --- .../src/backend/synthesizer.test.ts | 30 +++++++++++++++++++ packages/amplify-migration/src/index.ts | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts index 135ddf676d6..21d14e21d5b 100644 --- a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts +++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts @@ -136,6 +136,36 @@ describe('BackendRenderer', () => { assert(!output.includes('cfnUserPoolClient')); }); }); + describe('errors for unsupported categories', () => { + it('Renders error statement if unsupported categories are present', () => { + const renderer = new BackendSynthesizer(); + const rendered = renderer.render({ + unsupportedCategories: { + categories: new Map([ + ['rest api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'], + ['geo', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/'], + ['predictions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/'], + ]), + }, + }); + const output = printNodeArray(rendered); + assert( + output.includes( + 'throw new Error("Category rest api is unsupported, please follow https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/")', + ), + ); + assert( + output.includes( + 'throw new Error("Category geo is unsupported, please follow https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/")', + ), + ); + assert( + output.includes( + 'throw new Error("Category predictions is unsupported, please follow https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/")', + ), + ); + }); + }); describe('imports', () => { for (const resource of ['storage', 'data', 'auth']) { describe(resource, () => { diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts index 7538ece652c..69b484c1ee7 100644 --- a/packages/amplify-migration/src/index.ts +++ b/packages/amplify-migration/src/index.ts @@ -128,7 +128,7 @@ const unsupportedCategories = (): Map => { unsupportedCategories.set('notifications', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/in-app-messaging/'); unsupportedCategories.set('interactions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/interactions/'); unsupportedCategories.set('custom', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/custom-resources/'); - unsupportedCategories.set('api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'); + unsupportedCategories.set('rest api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'); const meta = stateManager.getMeta(); const categories = Object.keys(meta); @@ -142,7 +142,7 @@ const unsupportedCategories = (): Map => { Object.keys(apiList).forEach((api) => { const apiObj = apiList[api]; if (apiObj.service == 'API Gateway') { - unsupportedCategoriesList.set(category, unsupportedCategories.get(category)!); + unsupportedCategoriesList.set('rest api', unsupportedCategories.get('rest api')!); } }); } From 9fa78018ce21eabdc36c0676f4434f6d8df6de2b Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Tue, 24 Sep 2024 12:16:48 -0700 Subject: [PATCH 5/7] chore: add API.md file --- packages/amplify-gen2-codegen/API.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/amplify-gen2-codegen/API.md b/packages/amplify-gen2-codegen/API.md index c6da4e52715..e5e702c982c 100644 --- a/packages/amplify-gen2-codegen/API.md +++ b/packages/amplify-gen2-codegen/API.md @@ -56,7 +56,7 @@ export type AuthLambdaTriggers = Record; export type AuthTriggerEvents = 'createAuthChallenge' | 'customMessage' | 'defineAuthChallenge' | 'postAuthentication' | 'postConfirmation' | 'preAuthentication' | 'preSignUp' | 'preTokenGeneration' | 'userMigration' | 'verifyAuthChallengeResponse'; // @public (undocumented) -export const createGen2Renderer: ({ outputDir, appId, backendEnvironmentName, auth, storage, data, functions, fileWriter, }: Readonly) => Renderer; +export const createGen2Renderer: ({ outputDir, appId, backendEnvironmentName, auth, storage, data, functions, unsupportedCategories, fileWriter, }: Readonly) => Renderer; // @public (undocumented) export type CustomAttribute = { @@ -118,6 +118,8 @@ export interface Gen2RenderingOptions { outputDir: string; // (undocumented) storage?: StorageRenderParameters; + // (undocumented) + unsupportedCategories?: Map; } // @public (undocumented) From 62cf8cf592e6dbd15bc167ae50d645948cc7e87e Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Wed, 25 Sep 2024 10:56:34 -0700 Subject: [PATCH 6/7] chore: minor refactor --- .../src/backend/synthesizer.test.ts | 12 +++++------- .../src/backend/synthesizer.ts | 8 +++----- packages/amplify-gen2-codegen/src/index.ts | 6 ++---- packages/amplify-migration/package.json | 1 + packages/amplify-migration/src/index.ts | 17 +++++++++-------- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts index 21d14e21d5b..45fb886bc4d 100644 --- a/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts +++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.test.ts @@ -140,13 +140,11 @@ describe('BackendRenderer', () => { it('Renders error statement if unsupported categories are present', () => { const renderer = new BackendSynthesizer(); const rendered = renderer.render({ - unsupportedCategories: { - categories: new Map([ - ['rest api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'], - ['geo', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/'], - ['predictions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/'], - ]), - }, + unsupportedCategories: new Map([ + ['rest api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'], + ['geo', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/'], + ['predictions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/'], + ]), }); const output = printNodeArray(rendered); assert( diff --git a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts index 711956ae771..cc13ed7f7e1 100644 --- a/packages/amplify-gen2-codegen/src/backend/synthesizer.ts +++ b/packages/amplify-gen2-codegen/src/backend/synthesizer.ts @@ -37,9 +37,7 @@ export interface BackendRenderParameters { importFrom: string; functionNamesAndCategories: Map; }; - unsupportedCategories?: { - categories?: Map; - }; + unsupportedCategories?: Map; } export class BackendSynthesizer { @@ -174,8 +172,8 @@ export class BackendSynthesizer { imports.push(this.createImportStatement([backendFunctionIdentifier], '@aws-amplify/backend')); - if (renderArgs.unsupportedCategories && renderArgs.unsupportedCategories.categories) { - const categories = renderArgs.unsupportedCategories.categories; + if (renderArgs.unsupportedCategories) { + const categories = renderArgs.unsupportedCategories; for (const [key, value] of categories) { if (key == 'custom') { diff --git a/packages/amplify-gen2-codegen/src/index.ts b/packages/amplify-gen2-codegen/src/index.ts index 2f84fccdb6c..c8766851c83 100644 --- a/packages/amplify-gen2-codegen/src/index.ts +++ b/packages/amplify-gen2-codegen/src/index.ts @@ -102,10 +102,8 @@ export const createGen2Renderer = ({ const renderers: Renderer[] = [ensureOutputDir, ensureAmplifyDirectory, amplifyPackageJson, amplifyTsConfigJson, jsonRenderer]; - if (unsupportedCategories && unsupportedCategories?.size >= 1) { - backendRenderOptions.unsupportedCategories = { - categories: unsupportedCategories, - }; + if (unsupportedCategories && unsupportedCategories.size >= 1) { + backendRenderOptions.unsupportedCategories = unsupportedCategories; } if (functions && functions.length) { diff --git a/packages/amplify-migration/package.json b/packages/amplify-migration/package.json index a39f852123f..9d2b0233c01 100644 --- a/packages/amplify-migration/package.json +++ b/packages/amplify-migration/package.json @@ -50,6 +50,7 @@ "@aws-amplify/amplify-gen1-codegen-function-adapter": "0.1.0-gen2-migrations-test.0", "@aws-amplify/amplify-gen1-codegen-storage-adapter": "0.1.0-gen2-migrations-test.0", "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0", + "@aws-amplify/cli-internal": "12.13.0-gen2-migration-test.0", "@aws-sdk/client-amplify": "^3.592.0", "@aws-sdk/client-amplifybackend": "^3.592.0", "@aws-sdk/client-cloudformation": "^3.592.0", diff --git a/packages/amplify-migration/src/index.ts b/packages/amplify-migration/src/index.ts index 69b484c1ee7..c5b9bdc8dc2 100644 --- a/packages/amplify-migration/src/index.ts +++ b/packages/amplify-migration/src/index.ts @@ -121,14 +121,15 @@ const resolveAppId = (): string => { const unsupportedCategories = (): Map => { const unsupportedCategories = new Map(); - - unsupportedCategories.set('geo', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/geo/'); - unsupportedCategories.set('analytics', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/analytics/'); - unsupportedCategories.set('predictions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/predictions/'); - unsupportedCategories.set('notifications', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/in-app-messaging/'); - unsupportedCategories.set('interactions', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/interactions/'); - unsupportedCategories.set('custom', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/custom-resources/'); - unsupportedCategories.set('rest api', 'https://docs.amplify.aws/react/build-a-backend/add-aws-services/rest-api/'); + const urlPrefix = 'https://docs.amplify.aws/react/build-a-backend/add-aws-services'; + + unsupportedCategories.set('geo', `${urlPrefix}/geo/`); + unsupportedCategories.set('analytics', `${urlPrefix}/analytics/`); + unsupportedCategories.set('predictions', `${urlPrefix}/predictions/`); + unsupportedCategories.set('notifications', `${urlPrefix}/in-app-messaging/`); + unsupportedCategories.set('interactions', `${urlPrefix}/interactions/`); + unsupportedCategories.set('custom', `${urlPrefix}/custom-resources/`); + unsupportedCategories.set('rest api', `${urlPrefix}/rest-api/`); const meta = stateManager.getMeta(); const categories = Object.keys(meta); From 375ba69188923147f926a95e2e634d49b82f00c7 Mon Sep 17 00:00:00 2001 From: Surbhi Bansal Date: Wed, 25 Sep 2024 11:01:29 -0700 Subject: [PATCH 7/7] chore: remove unnecessary dependency --- packages/amplify-migration/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/amplify-migration/package.json b/packages/amplify-migration/package.json index 9d2b0233c01..a39f852123f 100644 --- a/packages/amplify-migration/package.json +++ b/packages/amplify-migration/package.json @@ -50,7 +50,6 @@ "@aws-amplify/amplify-gen1-codegen-function-adapter": "0.1.0-gen2-migrations-test.0", "@aws-amplify/amplify-gen1-codegen-storage-adapter": "0.1.0-gen2-migrations-test.0", "@aws-amplify/amplify-gen2-codegen": "0.1.0-gen2-migrations-test.0", - "@aws-amplify/cli-internal": "12.13.0-gen2-migration-test.0", "@aws-sdk/client-amplify": "^3.592.0", "@aws-sdk/client-amplifybackend": "^3.592.0", "@aws-sdk/client-cloudformation": "^3.592.0",