@go-to-k/cdkd 0.23.0 → 0.23.2

package/dist/cli.js

@@ -7344,13 +7344,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`,
@@ -7360,7 +7358,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Create"
       );
@@ -7399,13 +7397,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,
@@ -7417,7 +7413,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Update"
       );
@@ -7461,13 +7457,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,
@@ -7478,7 +7472,7 @@ var CustomResourceProvider = class _CustomResourceProvider {
       const cfnResponse = await this.sendRequest(
         serviceToken,
         request,
-        responseKey,
+        invocation.responseKey,
         logicalId,
         "Delete"
       );
@@ -7597,6 +7591,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
    */
@@ -32651,7 +32667,7 @@ Preparing to destroy stack: ${stackName}`);
       } else {
         const regions = refs.map((r) => r.region ?? "(legacy)").join(", ");
         throw new Error(
-          `Stack '${stackName}' has state in multiple regions: ${regions}. Use 'cdkd state orphan ${stackName} --region <region>' to remove cdkd's record for one region, or run destroy from a CDK app whose env.region matches one of them.`
+          `Stack '${stackName}' has state in multiple regions: ${regions}. Use 'cdkd state orphan ${stackName} --stack-region <region>' to remove cdkd's record for one region, or run destroy from a CDK app whose env.region matches one of them.`
         );
       }
       const stateResult = await stateBackend.getState(stackName, stackTargetRegion);
@@ -33320,7 +33336,7 @@ function resolveSingleRegion(stackName, refs, requestedRegion) {
     return matches[0];
   const regions = matches.map((r) => r.region ?? "(legacy)").join(", ");
   throw new Error(
-    `Stack '${stackName}' has state in multiple regions: ${regions}. Re-run with --region <region> to disambiguate.`
+    `Stack '${stackName}' has state in multiple regions: ${regions}. Re-run with --stack-region <region> to disambiguate.`
   );
 }
 async function setupStateBackend(options) {
@@ -33790,7 +33806,7 @@ WARNING: This destroys ${stackNames.length} stack(s) and removes their state rec
       } else {
         const regions = refs.map((r) => r.region ?? "(legacy)").join(", ");
         throw new Error(
-          `Stack '${stackName}' has state in multiple regions: ${regions}. Use --region <region> to pick one.`
+          `Stack '${stackName}' has state in multiple regions: ${regions}. Use --stack-region <region> to pick one.`
         );
       }
       for (const ref of targets) {
@@ -34377,7 +34393,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command13();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.23.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.23.2");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());