Merge branch 'main' into logicalId-consistency

aws · Apr 3, 2024 · 28fcdbe · 28fcdbe
2 parents b743db6 + 36fd79d
commit 28fcdbe
Show file tree

Hide file tree

Showing 28 changed files with 470 additions and 103 deletions.
diff --git a/...t/integ.lambda-alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStack.assets.json b/...t/integ.lambda-alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStack.assets.json
diff --git a/...integ.lambda-alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStack.template.json b/...integ.lambda-alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStack.template.json
@@ -79,8 +79,36 @@
      }
     ],
     "EvaluationPeriods": 1,
+    "InsufficientDataActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "MetricName": "Errors",
     "Namespace": "AWS/Lambda",
+    "OKActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "Period": 60,
     "Statistic": "Sum",
     "Threshold": 1,
@@ -309,8 +337,36 @@
      }
     ],
     "EvaluationPeriods": 1,
+    "InsufficientDataActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "MetricName": "Errors",
     "Namespace": "AWS/Lambda",
+    "OKActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "Period": 60,
     "Statistic": "Sum",
     "Threshold": 1,

diff --git a/...alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStackWithFeatureFlag.assets.json b/...alarm-action.js.snapshot/LambdaAlarmActionIntegrationTestStackWithFeatureFlag.assets.json
diff --git a/...arm-action.js.snapshot/LambdaAlarmActionIntegrationTestStackWithFeatureFlag.template.json b/...arm-action.js.snapshot/LambdaAlarmActionIntegrationTestStackWithFeatureFlag.template.json
@@ -79,8 +79,36 @@
      }
     ],
     "EvaluationPeriods": 1,
+    "InsufficientDataActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "MetricName": "Errors",
     "Namespace": "AWS/Lambda",
+    "OKActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "Period": 60,
     "Statistic": "Sum",
     "Threshold": 1,
@@ -309,8 +337,36 @@
      }
     ],
     "EvaluationPeriods": 1,
+    "InsufficientDataActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "MetricName": "Errors",
     "Namespace": "AWS/Lambda",
+    "OKActions": [
+     {
+      "Ref": "alarmLambdaFeatureCurrentVersionCF39751979501d2f67eaf906b2ef0c378303873b"
+     },
+     {
+      "Ref": "alarmLambdaFeatureAliasaliasName16F91D34"
+     },
+     {
+      "Fn::GetAtt": [
+       "alarmLambdaFeatureD560800F",
+       "Arn"
+      ]
+     }
+    ],
     "Period": 60,
     "Statistic": "Sum",
     "Threshold": 1,

diff --git a/...nteg/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.js.snapshot/manifest.json b/...nteg/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.js.snapshot/manifest.json
diff --git a/...rk-integ/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.js.snapshot/tree.json b/...rk-integ/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.js.snapshot/tree.json
diff --git a/...cdk-testing/framework-integ/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.ts b/...cdk-testing/framework-integ/test/aws-cloudwatch-actions/test/integ.lambda-alarm-action.ts
@@ -40,6 +40,12 @@ class LambdaAlarmActionIntegrationTestStack extends Stack {
     alarm.addAlarmAction(new cloudwatchActions.LambdaAction(version));
     alarm.addAlarmAction(new cloudwatchActions.LambdaAction(aliasName));
     alarm.addAlarmAction(new cloudwatchActions.LambdaAction(alarmLambda));
+    alarm.addOkAction(new cloudwatchActions.LambdaAction(version));
+    alarm.addOkAction(new cloudwatchActions.LambdaAction(aliasName));
+    alarm.addOkAction(new cloudwatchActions.LambdaAction(alarmLambda));
+    alarm.addInsufficientDataAction(new cloudwatchActions.LambdaAction(version));
+    alarm.addInsufficientDataAction(new cloudwatchActions.LambdaAction(aliasName));
+    alarm.addInsufficientDataAction(new cloudwatchActions.LambdaAction(alarmLambda));
 
     if (isFeature) {
       const alarm2 = new cloudwatch.Alarm(this, `Alarm${lambdaIdSuffix}`, {
@@ -53,6 +59,12 @@ class LambdaAlarmActionIntegrationTestStack extends Stack {
       alarm2.addAlarmAction(new cloudwatchActions.LambdaAction(version));
       alarm2.addAlarmAction(new cloudwatchActions.LambdaAction(aliasName));
       alarm2.addAlarmAction(new cloudwatchActions.LambdaAction(alarmLambda));
+      alarm2.addOkAction(new cloudwatchActions.LambdaAction(version));
+      alarm2.addOkAction(new cloudwatchActions.LambdaAction(aliasName));
+      alarm2.addOkAction(new cloudwatchActions.LambdaAction(alarmLambda));
+      alarm2.addInsufficientDataAction(new cloudwatchActions.LambdaAction(version));
+      alarm2.addInsufficientDataAction(new cloudwatchActions.LambdaAction(aliasName));
+      alarm2.addInsufficientDataAction(new cloudwatchActions.LambdaAction(alarmLambda));
     }
   }
 }

diff --git a/....managed-policy.js.snapshot/ManagedPolicyIntegDefaultTestDeployAssert27007DC6.assets.json b/....managed-policy.js.snapshot/ManagedPolicyIntegDefaultTestDeployAssert27007DC6.assets.json
diff --git a/...test/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.assets.json b/...test/aws-iam/test/integ.managed-policy.js.snapshot/aws-cdk-iam-managed-policy.assets.json
diff --git a/...ws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/cdk.out
diff --git a/...cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/integ.json
diff --git a/...-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-iam/test/integ.managed-policy.js.snapshot/manifest.json