revert: "fix(lambda): version.fromVersionArn creates invalid Version …

…object" (#30003) ### Issue # (if applicable) Revert #29820 Closes #30002 ### Reason for this change ### Description of changes ### Description of how you validated changes ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Apr 29, 2024 · ced7a46 · ced7a46
1 parent 2699ffd
commit ced7a46
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 39 deletions.
diff --git 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
@@ -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
@@ -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 });