@go-to-k/cdkd 0.23.1 → 0.24.0

package/dist/index.js

@@ -6691,13 +6691,11 @@ var CustomResourceProvider = class _CustomResourceProvider {
       );
     }
     try {
-      const requestId = `cdkd-${Date.now()}-${Math.random().toString(36).substring(7)}`;
-      const responseKey = this.getResponseKey(requestId);
-      const responseURL = await this.generateResponseURL(responseKey);
+      const invocation = await this.prepareInvocation();
       const request = {
         RequestType: "Create",
-        RequestId: requestId,
-        ResponseURL: responseURL,
+        RequestId: invocation.requestId,
+        ResponseURL: invocation.responseURL,
         ResourceType: resourceType,
         LogicalResourceId: logicalId,
         StackId: `arn:aws:cloudformation:us-east-1:000000000000:stack/cdkd-${logicalId}/cdkd`,
@@ -6707,7 +6705,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Create"
       );
@@ -6746,13 +6744,11 @@ var CustomResourceProvider = class _CustomResourceProvider {
       );
     }
     try {
-      const requestId = `cdkd-${Date.now()}-${Math.random().toString(36).substring(7)}`;
-      const responseKey = this.getResponseKey(requestId);
-      const responseURL = await this.generateResponseURL(responseKey);
+      const invocation = await this.prepareInvocation();
       const request = {
         RequestType: "Update",
-        RequestId: requestId,
-        ResponseURL: responseURL,
+        RequestId: invocation.requestId,
+        ResponseURL: invocation.responseURL,
         ResourceType: resourceType,
         LogicalResourceId: logicalId,
         PhysicalResourceId: physicalId,
@@ -6764,7 +6760,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Update"
       );
@@ -6808,13 +6804,11 @@ var CustomResourceProvider = class _CustomResourceProvider {
       return;
     }
     try {
-      const requestId = `cdkd-${Date.now()}-${Math.random().toString(36).substring(7)}`;
-      const responseKey = this.getResponseKey(requestId);
-      const responseURL = await this.generateResponseURL(responseKey);
+      const invocation = await this.prepareInvocation();
       const request = {
         RequestType: "Delete",
-        RequestId: requestId,
-        ResponseURL: responseURL,
+        RequestId: invocation.requestId,
+        ResponseURL: invocation.responseURL,
         ResourceType: resourceType,
         LogicalResourceId: logicalId,
         PhysicalResourceId: physicalId,
@@ -6825,7 +6819,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Delete"
       );
@@ -6944,6 +6938,28 @@ var CustomResourceProvider = class _CustomResourceProvider {
     const timeoutMs = isAsyncPattern ? this.asyncResponseTimeoutMs : this.SYNC_RESPONSE_TIMEOUT_MS;
     return await this.pollS3Response(responseKey, logicalId, operation, timeoutMs, isAsyncPattern);
   }
+  /**
+   * Prepare a single Custom Resource invocation: generate the request id,
+   * derive the S3 response key from it, sign the pre-signed PUT URL for that
+   * key, and return all three together.
+   *
+   * **The request id, response key, and response URL must all be derived from
+   * the SAME generation step.** Previously these were generated by separate
+   * calls inside `create` / `update` / `delete`, which made it possible for a
+   * future refactor (e.g. wrapping URL signing in a retry that re-rolls the
+   * id) to silently break the invariant — the Lambda would write to one S3
+   * key while cdkd polled a different one, hanging the deploy until the
+   * polling timeout (up to 1 hour). See issue #90.
+   *
+   * Centralising this in one helper makes that invariant impossible to
+   * violate at the call sites.
+   */
+  async prepareInvocation() {
+    const requestId = `cdkd-${Date.now()}-${Math.random().toString(36).substring(7)}`;
+    const responseKey = this.getResponseKey(requestId);
+    const responseURL = await this.generateResponseURL(responseKey);
+    return { requestId, responseKey, responseURL };
+  }
   /**
    * Generate a pre-signed S3 PUT URL for Lambda to send its response
    */