unique log group name in the case for removing and recreating the sam…

…e Provider
aws · Jan 5, 2024 · 277023c · 277023c
1 parent bf391e4
commit 277023c
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 11 deletions.
diff --git a/...ith-waiter-state-machine.js.snapshot/integ-provider-with-waiter-state-machine.assets.json b/...ith-waiter-state-machine.js.snapshot/integ-provider-with-waiter-state-machine.assets.json
diff --git a/...h-waiter-state-machine.js.snapshot/integ-provider-with-waiter-state-machine.template.json b/...h-waiter-state-machine.js.snapshot/integ-provider-with-waiter-state-machine.template.json
@@ -2077,7 +2077,18 @@
   "MyProviderWithDefaultLogwaiterstatemachineLogGroup5907E67B": {
    "Type": "AWS::Logs::LogGroup",
    "Properties": {
-    "LogGroupName": "/aws/vendedlogs/states/waiter-state-machine-c8755c6a4f7af107037ba386c1af047796ca4678a8-Logs",
+    "LogGroupName": {
+     "Fn::Join": [
+      "",
+      [
+       "/aws/vendedlogs/states/waiter-state-machine-",
+       {
+        "Ref": "MyProviderWithDefaultLogframeworkisCompleteC86EC850"
+       },
+       "-c8755c6a4f7af107037ba386c1af047796ca4678a8"
+      ]
+     ]
+    },
     "RetentionInDays": 731
    },
    "UpdateReplacePolicy": "Retain",

diff --git a/...est/provider-framework/integ.provider-with-waiter-state-machine.js.snapshot/manifest.json b/...est/provider-framework/integ.provider-with-waiter-state-machine.js.snapshot/manifest.json
diff --git a/...es/test/provider-framework/integ.provider-with-waiter-state-machine.js.snapshot/tree.json b/...es/test/provider-framework/integ.provider-with-waiter-state-machine.js.snapshot/tree.json
diff --git a/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts b/packages/aws-cdk-lib/custom-resources/lib/provider-framework/waiter-state-machine.ts
@@ -89,6 +89,7 @@ export class WaiterStateMachine extends Construct {
    * The ARN of the state machine.
    */
   public readonly stateMachineArn: string;
+  private readonly isCompleteHandler: IFunction;
 
   constructor(scope: Construct, id: string, props: WaiterStateMachineProps) {
     super(scope, id);
@@ -125,6 +126,7 @@ export class WaiterStateMachine extends Construct {
       },
     });
 
+    this.isCompleteHandler = props.isCompleteHandler;
     const resource = new CfnStateMachine(this, 'Resource', {
       definitionString: definition,
       roleArn: role.roleArn,
@@ -173,12 +175,9 @@ export class WaiterStateMachine extends Construct {
       resources: ['*'],
     }));
 
-    // Using `node.addr` because it needs to be a unique log group name in the AWS account,
-    // not using `node.path` because of the possibility of exceeding the maximum number of characters for the log group name.
-    // The `addr` value does not change when moving the construct tree using the ID `Default`.
     const logGroupName =
       FeatureFlags.of(this).isEnabled(cxapi.WAITER_STATE_MACHINE_LOG_GROUP_NAME)
-        ? `/aws/vendedlogs/states/waiter-state-machine-${this.node.addr}-Logs`
+        ? `/aws/vendedlogs/states/waiter-state-machine-${this.isCompleteHandler.functionName}-${this.node.addr}`
         : undefined;
     const logGroup = logOptions?.destination ?? new LogGroup(this, 'LogGroup', {
       logGroupName,

diff --git a/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts b/packages/aws-cdk-lib/custom-resources/test/provider-framework/waiter-state-machine.test.ts
@@ -292,7 +292,18 @@ describe('state machine', () => {
 
     // THEN
     Template.fromStack(stack).hasResourceProperties('AWS::Logs::LogGroup', {
-      LogGroupName: '/aws/vendedlogs/states/waiter-state-machine-c892b744a2306a661f17f50ce17de4b606ce3fc700-Logs',
+      LogGroupName: {
+        'Fn::Join': [
+          '',
+          [
+            '/aws/vendedlogs/states/waiter-state-machine-',
+            {
+              Ref: 'isCompleteBBB74F92',
+            },
+            '-c892b744a2306a661f17f50ce17de4b606ce3fc700',
+          ],
+        ],
+      },
     });
   });
 });