@go-to-k/cdkd 0.3.1 → 0.3.3

package/dist/cli.js

@@ -11216,6 +11216,7 @@ var LambdaFunctionProvider = class {
           `Pre-delete VPC detach failed for ${physicalId}: ${error instanceof Error ? error.message : String(error)} \u2014 continuing with delete`
         );
       }
+      await this.waitForLambdaUpdateCompleted(physicalId);
     }
     try {
       await this.lambdaClient.send(new DeleteFunctionCommand({ FunctionName: physicalId }));
@@ -11323,6 +11324,56 @@ var LambdaFunctionProvider = class {
    * Timeout is a soft warning — downstream Subnet/SG deletion has its own
    * retries.
    */
+  /**
+   * Poll GetFunction until LastUpdateStatus is no longer `InProgress`.
+   *
+   * After UpdateFunctionConfiguration the Lambda service processes the
+   * change (including VPC detach + hyperplane ENI release) asynchronously.
+   * Returning early — i.e. calling DeleteFunction while the update is still
+   * `InProgress` — aborts the detach, leaving ENIs attached and blocking
+   * downstream Subnet / SG deletion.
+   *
+   * Bounded by eniWaitTimeoutMs (10min) and treated as a soft warning on
+   * timeout: the subsequent ENI cleanup loop and downstream retries cover
+   * the residual edge case.
+   */
+  async waitForLambdaUpdateCompleted(functionName) {
+    const start = Date.now();
+    let delay = this.eniWaitInitialDelayMs;
+    for (; ; ) {
+      let status;
+      try {
+        const resp = await this.lambdaClient.send(
+          new GetFunctionCommand({ FunctionName: functionName })
+        );
+        status = resp.Configuration?.LastUpdateStatus;
+      } catch (error) {
+        if (error instanceof ResourceNotFoundException) {
+          return;
+        }
+        this.logger.debug(
+          `GetFunction failed while waiting for ${functionName} update: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      if (status && status !== "InProgress") {
+        this.logger.debug(
+          `Lambda ${functionName} update completed (LastUpdateStatus=${status}) after ${Date.now() - start}ms`
+        );
+        return;
+      }
+      const elapsed = Date.now() - start;
+      if (elapsed >= this.eniWaitTimeoutMs) {
+        this.logger.warn(
+          `Timeout (${this.eniWaitTimeoutMs}ms) waiting for Lambda ${functionName} update to complete; proceeding with delete`
+        );
+        return;
+      }
+      const remaining = this.eniWaitTimeoutMs - elapsed;
+      const sleepMs = Math.min(delay, remaining);
+      await this.sleep(sleepMs);
+      delay = Math.min(delay * 2, this.eniWaitMaxDelayMs);
+    }
+  }
   async cleanupLambdaEnis(functionName) {
     const start = Date.now();
     let delay = this.eniWaitInitialDelayMs;
@@ -11330,14 +11381,12 @@ var LambdaFunctionProvider = class {
     this.logger.debug(
       `Cleaning up Lambda VPC ENIs for function ${functionName} (timeout ${this.eniWaitTimeoutMs}ms)`
     );
-    const descriptionNeedle = `AWS Lambda VPC ENI`;
-    const functionNamePattern = new RegExp(`(^|-)${escapeRegExp(functionName)}(-|$)`);
     for (; ; ) {
       attempt++;
       let enis = [];
       let listFailed = false;
       try {
-        enis = await this.listLambdaEnis(descriptionNeedle, functionNamePattern);
+        enis = await this.listLambdaEnis(functionName);
       } catch (error) {
         this.logger.warn(
           `DescribeNetworkInterfaces failed while cleaning up Lambda ENIs of ${functionName}: ${error instanceof Error ? error.message : String(error)}`
@@ -11386,8 +11435,9 @@ var LambdaFunctionProvider = class {
    * Server-side filter (`description`) does not support wildcards on this
    * API, so we narrow with `requester-id` + match Description client-side.
    */
-  async listLambdaEnis(descriptionNeedle, functionNamePattern) {
+  async listLambdaEnis(functionName) {
     const enis = [];
+    const descriptionPrefix = "AWS Lambda VPC ENI-";
     let nextToken;
     do {
       const resp = await this.ec2Client.send(
@@ -11401,7 +11451,11 @@ var LambdaFunctionProvider = class {
       );
       for (const ni of resp.NetworkInterfaces ?? []) {
         const desc = ni.Description ?? "";
-        if (ni.NetworkInterfaceId && desc.includes(descriptionNeedle) && functionNamePattern.test(desc)) {
+        if (!ni.NetworkInterfaceId || !desc.startsWith(descriptionPrefix)) {
+          continue;
+        }
+        const token = desc.slice(descriptionPrefix.length);
+        if (functionName === token || functionName.startsWith(`${token}-`)) {
           enis.push({ id: ni.NetworkInterfaceId, status: ni.Status ?? "unknown" });
         }
       }
@@ -11497,9 +11551,6 @@ var LambdaFunctionProvider = class {
     return (crc ^ 4294967295) >>> 0;
   }
 };
-function escapeRegExp(input) {
-  return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 
 // src/provisioning/providers/lambda-permission-provider.ts
 import {
@@ -27605,7 +27656,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command8();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.3.1");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.3.3");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createDeployCommand());