fix(lambda): version.fromVersionArn creates invalid Version object

packages/aws-cdk-lib/aws-lambda/lib/function.ts

@@ -671,7 +671,18 @@ export class Function extends FunctionBase {
    * in the same account and region as the stack you are importing it into.
    */
   public static fromFunctionArn(scope: Construct, id: string, functionArn: string): IFunction {
-    return Function.fromFunctionAttributes(scope, id, { functionArn });
+    /**
+     * First, validate the functionArn string. If it's ARN with trailing version or alias,
+     * we trim off the trailing to retrieve the real functionArn.
+     * See lambda resource ARN format here: https://docs.aws.amazon.com/lambda/latest/dg/lambda-api-permissions-ref.html
+     */
+    const parts = functionArn.split(':');
+    if (parts.length > 7) {
+      const _functionArn = parts.slice(0, 7).join(':');
+      return Function.fromFunctionAttributes(scope, id, { functionArn: _functionArn });
+    } else {
+      return Function.fromFunctionAttributes(scope, id, { functionArn });
+    }
   }
 
   /**

packages/aws-cdk-lib/aws-lambda/test/function.test.ts

@@ -397,6 +397,30 @@ describe('function', () => {
     expect(imported.functionName).toEqual('ProcessKinesisRecords');
   });
 
+  test('fromFunctionArn with verionArn as the input', () => {
+    // GIVEN
+    const stack2 = new cdk.Stack();
+
+    // WHEN
+    const imported = lambda.Function.fromFunctionArn(stack2, 'Imported', 'arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords:1');
+
+    // THEN
+    expect(imported.functionArn).toEqual('arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords');
+    expect(imported.functionName).toEqual('ProcessKinesisRecords');
+  });
+
+  test('fromFunctionArn with trailing alias as the input', () => {
+    // GIVEN
+    const stack2 = new cdk.Stack();
+
+    // WHEN
+    const imported = lambda.Function.fromFunctionArn(stack2, 'Imported', 'arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords:TEST');
+
+    // THEN
+    expect(imported.functionArn).toEqual('arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords');
+    expect(imported.functionName).toEqual('ProcessKinesisRecords');
+  });
+
   test('Function.fromFunctionName', () => {
     // GIVEN
     const stack = new cdk.Stack();

packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts

@@ -15,6 +15,9 @@ describe('lambda version', () => {
     // WHEN
     const version = lambda.Version.fromVersionArn(stack, 'Version', 'arn:aws:lambda:region:account-id:function:function-name:version');
 
+    expect(version.version).toStrictEqual('version');
+    expect(version.lambda.functionArn).toStrictEqual('arn:aws:lambda:region:account-id:function:function-name');
+
     new cdk.CfnOutput(stack, 'ARN', { value: version.functionArn });
     new cdk.CfnOutput(stack, 'Name', { value: version.functionName });