Merge pull request #1091 from awslabs/bump/2.54.0

chore(release): 2.54.0
awslabs · Feb 29, 2024 · 8b25cd5 · 8b25cd5
2 parents b03585f + 57587f7
commit 8b25cd5
Show file tree

Hide file tree

Showing 63 changed files with 2,424 additions and 795 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.54.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.53.0...v2.54.0) (2024-02-29)
+
+Built on CDK v2.130.0
+
+### Bug Fixes
+
+* **step-functions** no longer attempt to modify cloudwatch logs permissions for state machines ([#1090](https://github.com/awslabs/aws-solutions-constructs/pull/1090))
+
 ## [2.53.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.52.1...v2.53.0) (2024-02-22)
 
 Built on CDK v2.127.0

diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js
@@ -10,7 +10,7 @@ const nullVersionMarker = process.argv[2];
 const targetSolutionsConstructsVersion = process.argv[3];
 
 // these versions need to be sourced from a config file
-const awsCdkLibVersion = '2.127.0';
+const awsCdkLibVersion = '2.130.0';
 
 for (const file of process.argv.splice(4)) {
   const pkg = JSON.parse(fs.readFileSync(file).toString());

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.53.0"
+  "version": "2.54.0"
 }
diff --git a/...sting-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-existing-eventbus.assets.json b/...sting-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-existing-eventbus.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "05fc1edac52c415d21de480b023de45248585d3e28f56576b766faa03e026538": {
+    "ad8ab564a1918f4dcd4f380744be433d1ddd07d98528aa35913bc98a4d2a0683": {
       "source": {
         "path": "evtstp-eventbridge-stepfunctions-existing-eventbus.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "05fc1edac52c415d21de480b023de45248585d3e28f56576b766faa03e026538.json",
+          "objectKey": "ad8ab564a1918f4dcd4f380744be433d1ddd07d98528aa35913bc98a4d2a0683.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ing-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-existing-eventbus.template.json b/...ing-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-existing-eventbus.template.json
@@ -234,40 +234,15 @@
         }
        ]
       },
-      {
-       "Action": [
-        "logs:DescribeLogGroups",
-        "logs:DescribeResourcePolicies",
-        "logs:PutResourcePolicy"
-       ],
-       "Effect": "Allow",
-       "Resource": {
-        "Fn::Join": [
-         "",
-         [
-          "arn:",
-          {
-           "Ref": "AWS::Partition"
-          },
-          ":logs:",
-          {
-           "Ref": "AWS::Region"
-          },
-          ":",
-          {
-           "Ref": "AWS::AccountId"
-          },
-          ":*"
-         ]
-        ]
-       }
-      },
       {
        "Action": [
         "logs:CreateLogDelivery",
         "logs:DeleteLogDelivery",
+        "logs:DescribeLogGroups",
+        "logs:DescribeResourcePolicies",
         "logs:GetLogDelivery",
         "logs:ListLogDeliveries",
+        "logs:PutResourcePolicy",
         "logs:UpdateLogDelivery"
        ],
        "Effect": "Allow",
@@ -288,7 +263,7 @@
      "rules_to_suppress": [
       {
        "id": "W12",
-       "reason": "The 'LogDelivery' actions do not support resource-level authorizations"
+       "reason": "These are CDK defaults. The 'LogDelivery' actions do not support resource-level authorizations. Any logging is done by State Machine code"
       }
      ]
     }

diff --git a/...s/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.js.snapshot/manifest.json b/...s/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.js.snapshot/manifest.json
@@ -66,7 +66,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/05fc1edac52c415d21de480b023de45248585d3e28f56576b766faa03e026538.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ad8ab564a1918f4dcd4f380744be433d1ddd07d98528aa35913bc98a4d2a0683.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...tions/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.js.snapshot/tree.json b/...tions/test/integ.evtstp-eventbridge-stepfunctions-existing-eventbus.js.snapshot/tree.json
@@ -369,40 +369,15 @@
                                         }
                                       ]
                                     },
-                                    {
-                                      "Action": [
-                                        "logs:DescribeLogGroups",
-                                        "logs:DescribeResourcePolicies",
-                                        "logs:PutResourcePolicy"
-                                      ],
-                                      "Effect": "Allow",
-                                      "Resource": {
-                                        "Fn::Join": [
-                                          "",
-                                          [
-                                            "arn:",
-                                            {
-                                              "Ref": "AWS::Partition"
-                                            },
-                                            ":logs:",
-                                            {
-                                              "Ref": "AWS::Region"
-                                            },
-                                            ":",
-                                            {
-                                              "Ref": "AWS::AccountId"
-                                            },
-                                            ":*"
-                                          ]
-                                        ]
-                                      }
-                                    },
                                     {
                                       "Action": [
                                         "logs:CreateLogDelivery",
                                         "logs:DeleteLogDelivery",
+                                        "logs:DescribeLogGroups",
+                                        "logs:DescribeResourcePolicies",
                                         "logs:GetLogDelivery",
                                         "logs:ListLogDeliveries",
+                                        "logs:PutResourcePolicy",
                                         "logs:UpdateLogDelivery"
                                       ],
                                       "Effect": "Allow",
@@ -745,7 +720,7 @@
             },
             "constructInfo": {
               "fqn": "@aws-solutions-constructs/aws-eventbridge-stepfunctions.EventbridgeToStepfunctions",
-              "version": "2.52.1"
+              "version": "2.53.0"
             }
           },
           "Integ": {

diff --git a/...ctions-new-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-new-eventbus.assets.json b/...ctions-new-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-new-eventbus.assets.json
@@ -14,15 +14,15 @@
         }
       }
     },
-    "c0c6a4481a83c0f870bcda3ac5271734a130dea0f47a3ce4a714a30ddcbc93b4": {
+    "317f1eec8d886232ed0717798a08a6dff5b18b1f4e4c3e718fafce0763125def": {
       "source": {
         "path": "evtstp-eventbridge-stepfunctions-new-eventbus.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "c0c6a4481a83c0f870bcda3ac5271734a130dea0f47a3ce4a714a30ddcbc93b4.json",
+          "objectKey": "317f1eec8d886232ed0717798a08a6dff5b18b1f4e4c3e718fafce0763125def.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ions-new-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-new-eventbus.template.json b/...ions-new-eventbus.js.snapshot/evtstp-eventbridge-stepfunctions-new-eventbus.template.json
@@ -228,40 +228,15 @@
         }
        ]
       },
-      {
-       "Action": [
-        "logs:DescribeLogGroups",
-        "logs:DescribeResourcePolicies",
-        "logs:PutResourcePolicy"
-       ],
-       "Effect": "Allow",
-       "Resource": {
-        "Fn::Join": [
-         "",
-         [
-          "arn:",
-          {
-           "Ref": "AWS::Partition"
-          },
-          ":logs:",
-          {
-           "Ref": "AWS::Region"
-          },
-          ":",
-          {
-           "Ref": "AWS::AccountId"
-          },
-          ":*"
-         ]
-        ]
-       }
-      },
       {
        "Action": [
         "logs:CreateLogDelivery",
         "logs:DeleteLogDelivery",
+        "logs:DescribeLogGroups",
+        "logs:DescribeResourcePolicies",
         "logs:GetLogDelivery",
         "logs:ListLogDeliveries",
+        "logs:PutResourcePolicy",
         "logs:UpdateLogDelivery"
        ],
        "Effect": "Allow",
@@ -282,7 +257,7 @@
      "rules_to_suppress": [
       {
        "id": "W12",
-       "reason": "The 'LogDelivery' actions do not support resource-level authorizations"
+       "reason": "These are CDK defaults. The 'LogDelivery' actions do not support resource-level authorizations. Any logging is done by State Machine code"
       }
      ]
     }

diff --git a/...ctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.js.snapshot/manifest.json b/...ctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.js.snapshot/manifest.json
@@ -66,7 +66,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c0c6a4481a83c0f870bcda3ac5271734a130dea0f47a3ce4a714a30ddcbc93b4.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/317f1eec8d886232ed0717798a08a6dff5b18b1f4e4c3e718fafce0763125def.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [

diff --git a/...pfunctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.js.snapshot/tree.json b/...pfunctions/test/integ.evtstp-eventbridge-stepfunctions-new-eventbus.js.snapshot/tree.json
@@ -345,40 +345,15 @@
                                         }
                                       ]
                                     },
-                                    {
-                                      "Action": [
-                                        "logs:DescribeLogGroups",
-                                        "logs:DescribeResourcePolicies",
-                                        "logs:PutResourcePolicy"
-                                      ],
-                                      "Effect": "Allow",
-                                      "Resource": {
-                                        "Fn::Join": [
-                                          "",
-                                          [
-                                            "arn:",
-                                            {
-                                              "Ref": "AWS::Partition"
-                                            },
-                                            ":logs:",
-                                            {
-                                              "Ref": "AWS::Region"
-                                            },
-                                            ":",
-                                            {
-                                              "Ref": "AWS::AccountId"
-                                            },
-                                            ":*"
-                                          ]
-                                        ]
-                                      }
-                                    },
                                     {
                                       "Action": [
                                         "logs:CreateLogDelivery",
                                         "logs:DeleteLogDelivery",
+                                        "logs:DescribeLogGroups",
+                                        "logs:DescribeResourcePolicies",
                                         "logs:GetLogDelivery",
                                         "logs:ListLogDeliveries",
+                                        "logs:PutResourcePolicy",
                                         "logs:UpdateLogDelivery"
                                       ],
                                       "Effect": "Allow",
@@ -745,7 +720,7 @@
             },
             "constructInfo": {
               "fqn": "@aws-solutions-constructs/aws-eventbridge-stepfunctions.EventbridgeToStepfunctions",
-              "version": "2.52.1"
+              "version": "2.53.0"
             }
           },
           "Integ": {

diff --git a/...unctions-no-argument.js.snapshot/evtstp-eventbridge-stepfunctions-no-argument.assets.json b/...unctions-no-argument.js.snapshot/evtstp-eventbridge-stepfunctions-no-argument.assets.json
@@ -1,15 +1,15 @@
 {
   "version": "36.0.0",
   "files": {
-    "74c566a36a8a986121cbe9ec6bb4c53b6f80a7bd4748db737199b26d4dc2a25f": {
+    "855ceec37ff0e29ed678adfaea9f9c7a7f128481581123820dae1d975c0a0fd1": {
       "source": {
         "path": "evtstp-eventbridge-stepfunctions-no-argument.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "74c566a36a8a986121cbe9ec6bb4c53b6f80a7bd4748db737199b26d4dc2a25f.json",
+          "objectKey": "855ceec37ff0e29ed678adfaea9f9c7a7f128481581123820dae1d975c0a0fd1.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

diff --git a/...ctions-no-argument.js.snapshot/evtstp-eventbridge-stepfunctions-no-argument.template.json b/...ctions-no-argument.js.snapshot/evtstp-eventbridge-stepfunctions-no-argument.template.json
@@ -64,40 +64,15 @@
    "Properties": {
     "PolicyDocument": {
      "Statement": [
-      {
-       "Action": [
-        "logs:DescribeLogGroups",
-        "logs:DescribeResourcePolicies",
-        "logs:PutResourcePolicy"
-       ],
-       "Effect": "Allow",
-       "Resource": {
-        "Fn::Join": [
-         "",
-         [
-          "arn:",
-          {
-           "Ref": "AWS::Partition"
-          },
-          ":logs:",
-          {
-           "Ref": "AWS::Region"
-          },
-          ":",
-          {
-           "Ref": "AWS::AccountId"
-          },
-          ":*"
-         ]
-        ]
-       }
-      },
       {
        "Action": [
         "logs:CreateLogDelivery",
         "logs:DeleteLogDelivery",
+        "logs:DescribeLogGroups",
+        "logs:DescribeResourcePolicies",
         "logs:GetLogDelivery",
         "logs:ListLogDeliveries",
+        "logs:PutResourcePolicy",
         "logs:UpdateLogDelivery"
        ],
        "Effect": "Allow",
@@ -118,7 +93,7 @@
      "rules_to_suppress": [
       {
        "id": "W12",
-       "reason": "The 'LogDelivery' actions do not support resource-level authorizations"
+       "reason": "These are CDK defaults. The 'LogDelivery' actions do not support resource-level authorizations. Any logging is done by State Machine code"
       }
      ]
     }

diff --git a/...nctions/test/integ.evtstp-eventbridge-stepfunctions-no-argument.js.snapshot/manifest.json b/...nctions/test/integ.evtstp-eventbridge-stepfunctions-no-argument.js.snapshot/manifest.json
@@ -66,7 +66,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/74c566a36a8a986121cbe9ec6bb4c53b6f80a7bd4748db737199b26d4dc2a25f.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/855ceec37ff0e29ed678adfaea9f9c7a7f128481581123820dae1d975c0a0fd1.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [