fix(lambda): imported Function still has region and account from its …

…Stack, instead of its ARN (#18255) Fixes #18228 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Jan 4, 2022 · 01bbe4c · 01bbe4c
1 parent e3359e0
commit 01bbe4c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/packages/@aws-cdk/aws-cloudfront/test/web-distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/web-distribution.test.ts
@@ -1377,7 +1377,7 @@ added the ellipsis so a user would know there was more to ...`,
     // GIVEN
     const stack = new cdk.Stack();
     const sourceBucket = new s3.Bucket(stack, 'Bucket');
-    const lambdaVersion = lambda.Version.fromVersionArn(stack, 'Version', 'arn:my-version');
+    const lambdaVersion = lambda.Version.fromVersionArn(stack, 'Version', 'arn:aws:lambda:function-region:111111111111:function:function-name');
 
     // WHEN
     new CloudFrontWebDistribution(stack, 'MyDistribution', {

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/lambda/lambda-invoke-action.test.ts
@@ -267,7 +267,9 @@ describe('', () => {
     });
 
     test('exposes variables for other actions to consume', () => {
-      const stack = new Stack();
+      const stack = new Stack(undefined, undefined, {
+        env: { account: '123456789012', region: 'us-east-1' },
+      });
 
       const sourceOutput = new codepipeline.Artifact();
       const lambdaInvokeAction = new cpactions.LambdaInvokeAction({

diff --git a/packages/@aws-cdk/aws-lambda/lib/function.ts b/packages/@aws-cdk/aws-lambda/lib/function.ts
@@ -455,7 +455,9 @@ export class Function extends FunctionBase {
       protected readonly canCreatePermissions = attrs.sameEnvironment ?? this._isStackAccount();
 
       constructor(s: Construct, i: string) {
-        super(s, i);
+        super(s, i, {
+          environmentFromArn: functionArn,
+        });
 
         this.grantPrincipal = role || new iam.UnknownPrincipal({ resource: this });
 

diff --git a/packages/@aws-cdk/aws-lambda/test/function.test.ts b/packages/@aws-cdk/aws-lambda/test/function.test.ts
@@ -297,6 +297,35 @@ describe('function', () => {
     expect(imported.functionName).toEqual('ProcessKinesisRecords');
   });
 
+  describe('Function.fromFunctionAttributes()', () => {
+    let stack: cdk.Stack;
+
+    beforeEach(() => {
+      const app = new cdk.App();
+      stack = new cdk.Stack(app, 'Base', {
+        env: { account: '111111111111', region: 'stack-region' },
+      });
+    });
+
+    describe('for a function in a different account and region', () => {
+      let func: lambda.IFunction;
+
+      beforeEach(() => {
+        func = lambda.Function.fromFunctionAttributes(stack, 'iFunc', {
+          functionArn: 'arn:aws:lambda:function-region:222222222222:function:function-name',
+        });
+      });
+
+      test("the function's region is taken from the ARN", () => {
+        expect(func.env.region).toBe('function-region');
+      });
+
+      test("the function's account is taken from the ARN", () => {
+        expect(func.env.account).toBe('222222222222');
+      });
+    });
+  });
+
   describe('addPermissions', () => {
     test('imported Function w/ resolved account and function arn', () => {
       // GIVEN