Merge pull request #955 from awslabs/bump/2.39.0

chore(release): 2.39.0
awslabs · Apr 23, 2023 · 316fb15 · 316fb15
2 parents adebe8c + aabee8d
commit 316fb15
Show file tree

Hide file tree

Showing 51 changed files with 169 additions and 237 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.39.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.38.0...v2.39.0) (2023-04-23)
+
+Built on CDK v2.76.0
+
+### Bug Fixes
+
+* **aws-*-stepfunctions:** generate stack specific physical log group name ([#945](https://github.com/awslabs/aws-solutions-constructs/issues/945)) ([3e46579](https://github.com/awslabs/aws-solutions-constructs/commit/3e46579ef02e726143cf437be293c9435d013f5f))
+
 ## [2.38.0](https://github.com/awslabs/aws-solutions-constructs/compare/v2.37.0...v2.38.0) (2023-04-16)
 
 Build on CDK v2.74.0

diff --git a/deployment/v2/align-version.js b/deployment/v2/align-version.js
@@ -10,7 +10,7 @@ const findVersion = process.argv[2];
 const replaceVersion = process.argv[3];
 
 // these versions need to be sourced from a config file
-const awsCdkLibVersion = '2.74.0';
+const awsCdkLibVersion = '2.76.0';
 const constructsVersion = '10.0.0';
 const MODULE_EXEMPTIONS = new Set([
   '@aws-cdk/cloudformation-diff',

diff --git a/source/lerna.json b/source/lerna.json
@@ -6,5 +6,5 @@
     "./patterns/@aws-solutions-constructs/*"
   ],
   "rejectCycles": "true",
-  "version": "2.38.0"
+  "version": "2.39.0"
 }
diff --git a/...ructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.expected.json b/...ructs/aws-apigateway-kinesisstreams/test/integ.additional-request-templates.expected.json
@@ -560,9 +560,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     }

diff --git a/...ructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.expected.json b/...ructs/aws-apigateway-kinesisstreams/test/integ.apigateway-kinesis-overwrite.expected.json
@@ -512,9 +512,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     }

diff --git a/...ructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.expected.json b/...ructs/aws-apigateway-kinesisstreams/test/integ.custom-integration-responses.expected.json
@@ -544,9 +544,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     }

diff --git a/...-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.expected.json b/...-solutions-constructs/aws-apigateway-kinesisstreams/test/integ.no-arguments.expected.json
@@ -548,9 +548,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     }

diff --git a/...idge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.expected.json b/...idge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing-eventbus.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...s-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.expected.json b/...s-eventbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-existing.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...entbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.expected.json b/...entbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-new-eventbus.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...entbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.expected.json b/...entbridge-kinesisstreams/test/integ.eventbridge-kinesisstreams-no-arguments.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...solutions-constructs/aws-eventbridge-stepfunctions/test/eventbridge-stepfunctions.test.ts b/...solutions-constructs/aws-eventbridge-stepfunctions/test/eventbridge-stepfunctions.test.ts
@@ -197,28 +197,3 @@ test('check custom event bus resource with props when deploy:true', () => {
     Name: 'testcustomeventbus'
   });
 });
-
-test('check LogGroup name', () => {
-  const stack = new cdk.Stack();
-
-  deployNewStateMachine(stack);
-
-  // Perform some fancy stuff to examine the specifics of the LogGroupName
-  const expectedPrefix = '/aws/vendedlogs/states/constructs/';
-  const lengthOfDatetimeSuffix = 13;
-
-  const template = Template.fromStack(stack);
-  const LogGroup = template.findResources("AWS::Logs::LogGroup");
-
-  const logName = LogGroup.testeventbridgestepfunctionsStateMachineLogGroup826A5B74.Properties.LogGroupName;
-  const suffix = logName.slice(-lengthOfDatetimeSuffix);
-
-  // Look for the expected Prefix and the 13 digit time suffix
-  expect(logName.slice(0, expectedPrefix.length)).toEqual(expectedPrefix);
-  expect(IsWholeNumber(suffix)).not.toBe(false);
-});
-
-function IsWholeNumber(target: string): boolean {
-  const numberPattern = /[0-9]{13}/;
-  return target.match(numberPattern) !== null;
-}
diff --git a/...-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json b/...-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.expected.json
@@ -3,7 +3,27 @@
     "testeventbridgestepfunctionsconstructStateMachineLogGroup3098B32C": {
       "Type": "AWS::Logs::LogGroup",
       "Properties": {
-        "LogGroupName": "integ-test-no-arguments"
+        "LogGroupName": {
+          "Fn::Join": [
+            "",
+            [
+              "/aws/vendedlogs/states/constructs/eventbridge-stepfunctions-no-argumenttest-eventbridge-stepfunctions-constructStateMachineLog-",
+              {
+                "Fn::Select": [
+                  2,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Ref": "AWS::StackId"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          ]
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",

diff --git a/...structs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.ts b/...structs/aws-eventbridge-stepfunctions/test/integ.eventbridge-stepfunctions-no-argument.ts
@@ -33,7 +33,6 @@ const props: EventbridgeToStepfunctionsProps = {
   },
   logGroupProps: {
     removalPolicy: RemovalPolicy.DESTROY,
-    logGroupName: "integ-test-no-arguments"
   },
 };
 

diff --git a/...ons-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json b/...ons-constructs/aws-fargate-kinesisstreams/test/integ.existingFargateService.expected.json
@@ -1120,9 +1120,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json b/...@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.existingVpc.expected.json
@@ -841,9 +841,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...ns-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json b/...ns-constructs/aws-fargate-kinesisstreams/test/integ.fargateServiceFromProps.expected.json
@@ -8,9 +8,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json b/...@aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.noArguments.expected.json
@@ -8,9 +8,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json b/...aws-solutions-constructs/aws-fargate-kinesisstreams/test/integ.vpcFromProps.expected.json
@@ -8,9 +8,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...ns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/fargate-stepfunctions.test.ts b/...ns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/fargate-stepfunctions.test.ts
@@ -321,29 +321,3 @@ function testStateMachineProps(stack: cdk.Stack, userProps?: stepfunctions.State
 
   return defaults.consolidateProps(defaultTestProp, userProps);
 }
-
-test('check LogGroup name', () => {
-  const stack = new cdk.Stack();
-  const publicApi = true;
-
-  createFargateConstructWithNewResources(stack, publicApi);
-
-  // Perform some fancy stuff to examine the specifics of the LogGroupName
-  const expectedPrefix = '/aws/vendedlogs/states/constructs/';
-  const lengthOfDatetimeSuffix = 13;
-
-  const template = Template.fromStack(stack);
-  const LogGroup = template.findResources("AWS::Logs::LogGroup");
-
-  const logName = LogGroup.testconstructStateMachineLogGroup2EB4F48B.Properties.LogGroupName;
-  const suffix = logName.slice(-lengthOfDatetimeSuffix);
-
-  // Look for the expected Prefix and the 13 digit time suffix
-  expect(logName.slice(0, expectedPrefix.length)).toEqual(expectedPrefix);
-  expect(IsWholeNumber(suffix)).not.toBe(false);
-});
-
-function IsWholeNumber(target: string): boolean {
-  const numberPattern = /[0-9]{13}/;
-  return target.match(numberPattern) !== null;
-}
diff --git a/...aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json b/...aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.expected.json
@@ -1076,7 +1076,27 @@
     "testconstructStateMachineLogGroup2EB4F48B": {
       "Type": "AWS::Logs::LogGroup",
       "Properties": {
-        "LogGroupName": "with-lambda"
+        "LogGroupName": {
+          "Fn::Join": [
+            "",
+            [
+              "/aws/vendedlogs/states/constructs/new-resourcestest-constructStateMachineLog-",
+              {
+                "Fn::Select": [
+                  2,
+                  {
+                    "Fn::Split": [
+                      "/",
+                      {
+                        "Ref": "AWS::StackId"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          ]
+        }
       },
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete",

diff --git a/.../patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.ts b/.../patterns/@aws-solutions-constructs/aws-fargate-stepfunctions/test/integ.new-resources.ts
@@ -50,7 +50,6 @@ const constructProps: FargateToStepfunctionsProps = {
   stateMachineEnvironmentVariableName: 'CUSTOM_NAME',
   logGroupProps: {
     removalPolicy: RemovalPolicy.DESTROY,
-    logGroupName: "with-lambda"
   }
 };
 

diff --git a/...lutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.expected.json b/...lutions-constructs/aws-iot-kinesisstreams/test/integ.existing-kinesisstream.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...ws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.expected.json b/...ws-solutions-constructs/aws-iot-kinesisstreams/test/integ.new-kinesisstream.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...ns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.expected.json b/...ns/@aws-solutions-constructs/aws-iot-kinesisstreams/test/integ.no-arguments.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...s-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json b/...s-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.code-asset-job.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json b/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.existing-job.expected.json
@@ -89,9 +89,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json b/...aws-solutions-constructs/aws-kinesisstreams-gluejob/test/integ.no-arguments.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...tructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json b/...tructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.customLoggingBucket.expected.json
@@ -8,9 +8,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json b/...constructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-bucket.expected.json
@@ -46,9 +46,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...ts/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json b/...ts/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existing-logging-bucket.expected.json
@@ -47,9 +47,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },

diff --git a/...nstructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json b/...nstructs/aws-kinesisstreams-kinesisfirehose-s3/test/integ.existingStreamObj.expected.json
@@ -9,9 +9,6 @@
         "StreamEncryption": {
           "EncryptionType": "KMS",
           "KeyId": "alias/aws/kinesis"
-        },
-        "StreamModeDetails": {
-          "StreamMode": "PROVISIONED"
         }
       }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,6 @@ const props: EventbridgeToStepfunctionsProps = { @@
       },
       logGroupProps: {
         removalPolicy: RemovalPolicy.DESTROY,
-        logGroupName: "integ-test-no-arguments"
       },
     };
@@ Expand Down @@