From e7fad23979c09316c5fb9b5e617698597f8991ca Mon Sep 17 00:00:00 2001
From: Pahud Hsieh <pahudnet@gmail.com>
Date: Mon, 29 Apr 2024 21:47:28 +0000
Subject: [PATCH] revert

---
 .../aws-cdk-lib/aws-lambda/lib/function.ts    | 13 +---------
 .../aws-lambda/test/function.test.ts          | 24 -------------------
 .../aws-lambda/test/lambda-version.test.ts    |  3 ---
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/packages/aws-cdk-lib/aws-lambda/lib/function.ts b/packages/aws-cdk-lib/aws-lambda/lib/function.ts
index 3f784a5ccc247..dba046f447513 100644
--- a/packages/aws-cdk-lib/aws-lambda/lib/function.ts
+++ b/packages/aws-cdk-lib/aws-lambda/lib/function.ts
@@ -671,18 +671,7 @@ 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 {
-    /**
-     * If the functionArn has a trailing version or alias (more than 7 parts when split by ":",
-     * we trim off the trailing version/alias 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 });
-    }
+    return Function.fromFunctionAttributes(scope, id, { functionArn });
   }
 
   /**
diff --git a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
index 7711c3ff0fed3..f4c5382707641 100644
--- a/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
+++ b/packages/aws-cdk-lib/aws-lambda/test/function.test.ts
@@ -397,30 +397,6 @@ 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();
diff --git a/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts b/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts
index 3356fa2dbf400..6236a92df5dae 100644
--- a/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts
+++ b/packages/aws-cdk-lib/aws-lambda/test/lambda-version.test.ts
@@ -15,9 +15,6 @@ 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 });