chore: update code

aws · Jan 1, 2024 · a347097 · a347097
1 parent 07f3987
commit a347097
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 67 deletions.
diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/lambda.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/lib/lambda.ts
@@ -22,26 +22,16 @@ export class LambdaAction implements cloudwatch.IAlarmAction {
    */
   bind(_scope: Construct, _alarm: cloudwatch.IAlarm): cloudwatch.AlarmActionConfig {
     if (this.lambdaFunction.stack.account === Stack.of(_scope).account) {
-      new lambda.CfnPermission(_scope, 'AlarmPermission', {
+      new lambda.CfnPermission(_scope, `${this.lambdaFunction.node.id}AlarmPermission`, {
         sourceAccount: Stack.of(_scope).account,
         action: 'lambda:InvokeFunction',
         sourceArn: _alarm.alarmArn,
         principal: 'lambda.alarms.cloudwatch.amazonaws.com',
         functionName: this.lambdaFunction.functionName,
       });
     }
-    if ((this.lambdaFunction as lambda.IAlias).aliasName) {
-      return {
-        alarmActionArn: `arn:${Stack.of(this.lambdaFunction.stack).partition}:lambda:${Stack.of(this.lambdaFunction.stack).region}:${Stack.of(this.lambdaFunction.stack).account}:function:${this.lambdaFunction.functionName}:${(this.lambdaFunction as lambda.IAlias).aliasName}`,
-      };
-    } else if ((this.lambdaFunction as lambda.IAlias).version) {
-      return {
-        alarmActionArn: `arn:${Stack.of(this.lambdaFunction.stack).partition}:lambda:${Stack.of(this.lambdaFunction.stack).region}:${Stack.of(this.lambdaFunction.stack).account}:function:${this.lambdaFunction.functionName}:${(this.lambdaFunction as lambda.IVersion).version}`,
-      };
-    } else {
-      return {
-        alarmActionArn: `arn:${Stack.of(this.lambdaFunction.stack).partition}:lambda:${Stack.of(this.lambdaFunction.stack).region}:${Stack.of(this.lambdaFunction.stack).account}:function:${this.lambdaFunction.functionName}`,
-      };
-    }
+    return {
+      alarmActionArn: this.lambdaFunction.functionArn,
+    };
   }
 }
diff --git a/packages/aws-cdk-lib/aws-cloudwatch-actions/test/lambda.test.ts b/packages/aws-cdk-lib/aws-cloudwatch-actions/test/lambda.test.ts
@@ -33,23 +33,9 @@ def handler(event, context):
   Template.fromStack(stack).hasResourceProperties('AWS::CloudWatch::Alarm', {
     AlarmActions: [
       {
-        'Fn::Join': [
-          '',
-          [
-            'arn:',
-            {
-              Ref: 'AWS::Partition',
-            },
-            ':lambda:',
-            {
-              Ref: 'AWS::Region',
-            },
-            ':',
-            {
-              Ref: 'AWS::AccountId',
-            },
-            ':alarmLambda',
-          ],
+        'Fn::GetAtt': [
+          'alarmLambda131DB691',
+          'Arn',
         ],
       },
     ],
@@ -86,24 +72,7 @@ def handler(event, context):
   Template.fromStack(stack).hasResourceProperties('AWS::CloudWatch::Alarm', {
     AlarmActions: [
       {
-        'Fn::Join': [
-          '',
-          [
-            'arn:',
-            {
-              Ref: 'AWS::Partition',
-            },
-            ':lambda:',
-            {
-              Ref: 'AWS::Region',
-            },
-            ':',
-            {
-              Ref: 'AWS::AccountId',
-            },
-            ':alarmLambda:aliasName',
-          ],
-        ],
+        Ref: 'alarmLambdaAliasaliasName41B27313',
       },
     ],
   });
@@ -136,24 +105,7 @@ def handler(event, context):
   Template.fromStack(stack).hasResourceProperties('AWS::CloudWatch::Alarm', {
     AlarmActions: [
       {
-        'Fn::Join': [
-          '',
-          [
-            'arn:',
-            {
-              Ref: 'AWS::Partition',
-            },
-            ':lambda:',
-            {
-              Ref: 'AWS::Region',
-            },
-            ':',
-            {
-              Ref: 'AWS::AccountId',
-            },
-            ':alarmLambda:1',
-          ],
-        ],
+        Ref: 'alarmLambdaCurrentVersionBDCE825Cf5e98d107ecb420808f3d9421127310e',
       },
     ],
   });