fix(cli-internal): add lambda authorizer import and use dynamic region in data resource

amplify-migration-apps/backend-only/_snapshot.post.generate/amplify/function/quotegeneratorbe/resource.ts

@@ -8,10 +8,14 @@ export const quotegeneratorbe = defineFunction({
   name: `quotegeneratorbe-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
 export function applyEscapeHatches(backend: Backend) {
   backend.quotegeneratorbe.resources.cfnResources.cfnFunction.functionName = `quotegeneratorbe-${branchName}`;
+  backend.quotegeneratorbe.addEnvironment(
+    'REGION',
+    backend.quotegeneratorbe.stack.region
+  );
 }

amplify-migration-apps/discussions/_snapshot.post.generate/amplify/function/activityTrigger/resource.ts

@@ -11,7 +11,7 @@ export const activityTrigger = defineFunction({
   name: `activityTrigger-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -29,6 +29,10 @@ export function applyEscapeHatches(backend: Backend, activity: Table) {
     'STORAGE_ACTIVITY_NAME',
     activity.tableName
   );
+  backend.activityTrigger.addEnvironment(
+    'REGION',
+    backend.activityTrigger.stack.region
+  );
   activity.grant(
     backend.activityTrigger.resources.lambda,
     'dynamodb:Put*',

amplify-migration-apps/discussions/_snapshot.post.generate/amplify/function/fetchuseractivity/resource.ts

@@ -9,7 +9,7 @@ export const fetchuseractivity = defineFunction({
   name: `fetchuseractivity-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -27,6 +27,10 @@ export function applyEscapeHatches(backend: Backend, activity: Table) {
     'STORAGE_ACTIVITY_NAME',
     activity.tableName
   );
+  backend.fetchuseractivity.addEnvironment(
+    'REGION',
+    backend.fetchuseractivity.stack.region
+  );
   activity.grant(
     backend.fetchuseractivity.resources.lambda,
     'dynamodb:Get*',

amplify-migration-apps/discussions/_snapshot.post.generate/amplify/function/recorduseractivity/resource.ts

@@ -11,7 +11,7 @@ export const recorduseractivity = defineFunction({
   name: `recorduseractivity-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -29,6 +29,10 @@ export function applyEscapeHatches(backend: Backend, activity: Table) {
     'STORAGE_ACTIVITY_NAME',
     activity.tableName
   );
+  backend.recorduseractivity.addEnvironment(
+    'REGION',
+    backend.recorduseractivity.stack.region
+  );
   activity.grant(
     backend.recorduseractivity.resources.lambda,
     'dynamodb:Put*',

amplify-migration-apps/finance-tracker/_snapshot.post.generate/amplify/function/financetracker/resource.ts

@@ -10,7 +10,6 @@ export const financetracker = defineFunction({
   memoryMB: 128,
   environment: {
     ENV: `${branchName}`,
-    REGION: 'us-east-1',
     BUDGET_ALERT_TOPIC_ARN:
       'arn:aws:sns:us-east-1:123456789012:amplify-financetracker-x-x-customcustomfinance-x-BudgetAlertTopicF20DF526-DFMxF2RX1UKQ',
     MONTHLY_REPORT_TOPIC_ARN:
@@ -33,6 +32,10 @@ export function applyEscapeHatches(backend: Backend) {
     'API_FINANCETRACKER_TRANSACTIONTABLE_NAME',
     backend.data.resources.tables['Transaction'].tableName
   );
+  backend.financetracker.addEnvironment(
+    'REGION',
+    backend.financetracker.stack.region
+  );
   backend.data.resources.tables['Transaction'].grant(
     backend.financetracker.resources.lambda,
     'dynamodb:Put*',

amplify-migration-apps/fitness-tracker/_snapshot.post.generate/amplify/function/admin/resource.ts

@@ -9,7 +9,7 @@ export const admin = defineFunction({
   name: `admin-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -19,6 +19,7 @@ export function applyEscapeHatches(backend: Backend) {
     'AUTH_FITNESSTRACKER33F5545533F55455_USERPOOLID',
     backend.auth.resources.userPool.userPoolId
   );
+  backend.admin.addEnvironment('REGION', backend.admin.stack.region);
   new aws_iam.Policy(
     backend.admin.resources.lambda,
     'UnmappedCognitoActionsPolicy',

amplify-migration-apps/fitness-tracker/_snapshot.post.generate/amplify/function/fitnesstracker33f5545533f55455PreSignup/resource.ts

@@ -11,7 +11,6 @@ export const fitnesstracker33f5545533f55455PreSignup = defineFunction({
   environment: {
     ENV: `${branchName}`,
     MODULES: 'email-filter-allowlist',
-    REGION: 'us-east-1',
     DOMAINALLOWLIST: 'amazon.com',
     DOMAINBLACKLIST: '',
   },
@@ -20,4 +19,8 @@ export const fitnesstracker33f5545533f55455PreSignup = defineFunction({
 
 export function applyEscapeHatches(backend: Backend) {
   backend.fitnesstracker33f5545533f55455PreSignup.resources.cfnResources.cfnFunction.functionName = `fitnesstracker33f5545533f55455PreSignup-${branchName}`;
+  backend.fitnesstracker33f5545533f55455PreSignup.addEnvironment(
+    'REGION',
+    backend.fitnesstracker33f5545533f55455PreSignup.stack.region
+  );
 }

amplify-migration-apps/fitness-tracker/_snapshot.post.generate/amplify/function/lognutrition/resource.ts

@@ -8,7 +8,7 @@ export const lognutrition = defineFunction({
   name: `lognutrition-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -26,6 +26,10 @@ export function applyEscapeHatches(backend: Backend) {
     'API_FITNESSTRACKER_MEALTABLE_NAME',
     backend.data.resources.tables['Meal'].tableName
   );
+  backend.lognutrition.addEnvironment(
+    'REGION',
+    backend.lognutrition.stack.region
+  );
   backend.data.resources.tables['Meal'].grant(
     backend.lognutrition.resources.lambda,
     'dynamodb:Put*',

amplify-migration-apps/imported-resources/_snapshot.post.generate/amplify/function/importedresourcequotegenerator/resource.ts

@@ -8,10 +8,14 @@ export const importedresourcequotegenerator = defineFunction({
   name: `importedresourcequotegenerator-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
 export function applyEscapeHatches(backend: Backend) {
   backend.importedresourcequotegenerator.resources.cfnResources.cfnFunction.functionName = `importedresourcequotegenerator-${branchName}`;
+  backend.importedresourcequotegenerator.addEnvironment(
+    'REGION',
+    backend.importedresourcequotegenerator.stack.region
+  );
 }

amplify-migration-apps/media-vault/_snapshot.post.generate/amplify/function/addusertogroup/resource.ts

@@ -9,7 +9,7 @@ export const addusertogroup = defineFunction({
   name: `addusertogroup-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -19,6 +19,10 @@ export function applyEscapeHatches(backend: Backend) {
     'AUTH_MEDIAVAULT1F08412D_USERPOOLID',
     backend.auth.resources.userPool.userPoolId
   );
+  backend.addusertogroup.addEnvironment(
+    'REGION',
+    backend.addusertogroup.stack.region
+  );
   new aws_iam.Policy(
     backend.addusertogroup.resources.lambda,
     'UnmappedCognitoActionsPolicy',

amplify-migration-apps/media-vault/_snapshot.post.generate/amplify/function/removeuserfromgroup/resource.ts

@@ -9,7 +9,7 @@ export const removeuserfromgroup = defineFunction({
   name: `removeuserfromgroup-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -19,6 +19,10 @@ export function applyEscapeHatches(backend: Backend) {
     'AUTH_MEDIAVAULT1F08412D_USERPOOLID',
     backend.auth.resources.userPool.userPoolId
   );
+  backend.removeuserfromgroup.addEnvironment(
+    'REGION',
+    backend.removeuserfromgroup.stack.region
+  );
   new aws_iam.Policy(
     backend.removeuserfromgroup.resources.lambda,
     'UnmappedCognitoActionsPolicy',

amplify-migration-apps/media-vault/_snapshot.post.generate/amplify/function/thumbnailgen/resource.ts

@@ -8,7 +8,7 @@ export const thumbnailgen = defineFunction({
   name: `thumbnailgen-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -18,4 +18,8 @@ export function applyEscapeHatches(backend: Backend) {
     'STORAGE_MEDIAVAULT_BUCKETNAME',
     backend.storage.resources.bucket.bucketName
   );
+  backend.thumbnailgen.addEnvironment(
+    'REGION',
+    backend.thumbnailgen.stack.region
+  );
 }

amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/function/moodboardGetRandomEmoji/resource.ts

@@ -8,10 +8,14 @@ export const moodboardGetRandomEmoji = defineFunction({
   name: `moodboardGetRandomEmoji-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
 export function applyEscapeHatches(backend: Backend) {
   backend.moodboardGetRandomEmoji.resources.cfnResources.cfnFunction.functionName = `moodboardGetRandomEmoji-${branchName}`;
+  backend.moodboardGetRandomEmoji.addEnvironment(
+    'REGION',
+    backend.moodboardGetRandomEmoji.stack.region
+  );
 }

amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/function/moodboardKinesisReader/resource.ts

@@ -10,7 +10,7 @@ export const moodboardKinesisReader = defineFunction({
   name: `moodboardKinesisReader-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -23,6 +23,10 @@ export function applyEscapeHatches(
     'ANALYTICS_MOODBOARDKINESIS_KINESISSTREAMARN',
     analytics.kinesisStreamArn
   );
+  backend.moodboardKinesisReader.addEnvironment(
+    'REGION',
+    backend.moodboardKinesisReader.stack.region
+  );
   backend.moodboardKinesisReader.resources.lambda.addToRolePolicy(
     new aws_iam.PolicyStatement({
       actions: [

amplify-migration-apps/mood-board/_snapshot.post.generate/amplify/function/moodboardKinesisTrigger/resource.ts

@@ -12,7 +12,7 @@ export const moodboardKinesisTrigger = defineFunction({
   name: `moodboardKinesisTrigger-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -33,6 +33,10 @@ export function applyEscapeHatches(
     'API_MOODBOARD_GRAPHQLAPIIDOUTPUT',
     backend.data.apiId
   );
+  backend.moodboardKinesisTrigger.addEnvironment(
+    'REGION',
+    backend.moodboardKinesisTrigger.stack.region
+  );
   backend.data.resources.graphqlApi.grantMutation(
     backend.moodboardKinesisTrigger.resources.lambda
   );

amplify-migration-apps/product-catalog/_snapshot.post.generate/amplify/function/S3Trigger1ef46783/resource.ts

@@ -8,7 +8,7 @@ export const S3Trigger1ef46783 = defineFunction({
   name: `S3Trigger1ef46783-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
@@ -26,6 +26,10 @@ export function applyEscapeHatches(backend: Backend) {
     'API_PRODUCTCATALOG_GRAPHQLAPIIDOUTPUT',
     backend.data.apiId
   );
+  backend.S3Trigger1ef46783.addEnvironment(
+    'REGION',
+    backend.S3Trigger1ef46783.stack.region
+  );
   backend.data.resources.graphqlApi.grantMutation(
     backend.S3Trigger1ef46783.resources.lambda
   );

amplify-migration-apps/product-catalog/_snapshot.post.generate/amplify/function/lowstockproducts/resource.ts

@@ -10,7 +10,6 @@ export const lowstockproducts = defineFunction({
   memoryMB: 128,
   environment: {
     ENV: `${branchName}`,
-    REGION: 'us-east-1',
     LOW_STOCK_THRESHOLD: '5',
     PRODUCT_CATALOG_SECRET:
       '/amplify/productcatalog/x/AMPLIFY_lowstockproducts_PRODUCT_CATALOG_SECRET',
@@ -32,6 +31,10 @@ export function applyEscapeHatches(backend: Backend) {
     'API_PRODUCTCATALOG_GRAPHQLAPIIDOUTPUT',
     backend.data.apiId
   );
+  backend.lowstockproducts.addEnvironment(
+    'REGION',
+    backend.lowstockproducts.stack.region
+  );
   backend.data.resources.graphqlApi.grantQuery(
     backend.lowstockproducts.resources.lambda
   );

amplify-migration-apps/project-boards/_snapshot.post.generate/amplify/function/quotegenerator/resource.ts

@@ -8,10 +8,14 @@ export const quotegenerator = defineFunction({
   name: `quotegenerator-${branchName}`,
   timeoutSeconds: 25,
   memoryMB: 128,
-  environment: { ENV: `${branchName}`, REGION: 'us-east-1' },
+  environment: { ENV: `${branchName}` },
   runtime: 22,
 });
 
 export function applyEscapeHatches(backend: Backend) {
   backend.quotegenerator.resources.cfnResources.cfnFunction.functionName = `quotegenerator-${branchName}`;
+  backend.quotegenerator.addEnvironment(
+    'REGION',
+    backend.quotegenerator.stack.region
+  );
 }

amplify-migration-apps/store-locator/_snapshot.post.generate/amplify/function/storelocator41a9495f41a9495fPostConfirmation/resource.ts

@@ -11,12 +11,15 @@ export const storelocator41a9495f41a9495fPostConfirmation = defineFunction({
   environment: {
     ENV: `${branchName}`,
     MODULES: 'add-to-group',
-    REGION: 'us-east-1',
     GROUP: 'storeLocatorAdmin',
   },
   runtime: 22,
 });
 
 export function applyEscapeHatches(backend: Backend) {
   backend.storelocator41a9495f41a9495fPostConfirmation.resources.cfnResources.cfnFunction.functionName = `storelocator41a9495f41a9495fPostConfirmation-${branchName}`;
+  backend.storelocator41a9495f41a9495fPostConfirmation.addEnvironment(
+    'REGION',
+    backend.storelocator41a9495f41a9495fPostConfirmation.stack.region
+  );
 }

packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/data/data.generator.test.ts

@@ -583,6 +583,7 @@ describe('DataGenerator', () => {
     expect(writtenFile('resource.ts')).toMatchInlineSnapshot(`
       "import { defineData } from '@aws-amplify/backend';
       import type { Backend } from '../backend';
+      import { myAuthFn } from '../function/myAuthFn/resource';
 
       const schema = \`type Todo @model { id: ID! }\`;