@devkong/cli 0.0.67-alpha.6 → 0.0.67-alpha.8

package/assets/python-install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 EXTENSION_DIR=$1
 
@@ -8,18 +9,17 @@ else
     PYTHON_CMD="python3"
 fi
 
-if [ -x "$(command -v python)" ]; then
-    PIP_CMD="pip"
-else
-    PIP_CMD="pip3"
-fi
-
 cd "$EXTENSION_DIR" || exit
 
-$PYTHON_CMD -m venv .venv
+# Recreate the venv from scratch so a stale interpreter path (e.g. left over
+# after a Python/nvm/pyenv upgrade) can't leave pip pointing at a missing
+# binary, which fails with "cannot execute: required file not found".
+$PYTHON_CMD -m venv --clear .venv
 
 source .venv/bin/activate
 
-$PIP_CMD freeze > requirements-lock.txt
-$PIP_CMD install --default-timeout=120 -r requirements-dev.txt -r requirements.txt
-$PIP_CMD freeze > requirements-lock.txt
+# Invoke pip via `python -m pip` rather than the pip/pip3 wrapper so we don't
+# depend on the wrapper script's (possibly stale) shebang.
+python -m pip freeze > requirements-lock.txt
+python -m pip install --default-timeout=120 -r requirements-dev.txt -r requirements.txt
+python -m pip freeze > requirements-lock.txt

package/index.js

@@ -63521,9 +63521,7 @@ function validateName(value) {
   }
 }
 var DEPLOY_STEPS = [
-  "start extension set alias",
   "create deployment",
-  "health check",
   "save deployment details",
   "deployment completed"
 ];
@@ -63550,6 +63548,7 @@ var SetAliasCommand = class {
   async execute(aliasName, extensionVersion, timeoutSeconds) {
     validateName(aliasName);
     const startedAt = utcNow(DEFAULT_TIMEZONE);
+    const steps = createDeploySteps();
     await new Listr(
       [
         {
@@ -63596,61 +63595,12 @@ var SetAliasCommand = class {
               updatedBy: ""
             };
             await this.publicClient.assignExtensionAlias(ctx.kongJson.id, alias);
-            task.output = joinUrlAndPath(this.profile.kongBaseUrl, "/extensions/aliases");
+            this.pollDeploymentSteps(steps, ctx.kongJson.id, aliasName, startedAt, timeoutSeconds);
           },
           rendererOptions: { persistentOutput: true }
         },
-        {
-          title: "Wait for deployment",
-          // Render the known deployment steps as a checklist and tick each one
-          // off as its audit event arrives. Polling runs alongside the subtask
-          // list, settling a step per event and failing the rest on error; it
-          // stops on the failed or "deployment completed" event (poll terminal).
-          task: (ctx, task) => {
-            const steps = createDeploySteps();
-            const pending = new Map(steps.map((step) => [step.action, step]));
-            const seen = /* @__PURE__ */ new Set();
-            void pollDeployment(this.managementClient, {
-              objectType: "EXTENSION_ALIAS",
-              basedOnId: ctx.kongJson.id,
-              aliasName,
-              createdAfter: startedAt,
-              timeoutSeconds,
-              onProgress: (progress) => {
-                for (const event of [...progress.events].reverse()) {
-                  if (seen.has(event.action)) {
-                    continue;
-                  }
-                  seen.add(event.action);
-                  pending.get(event.action)?.settle();
-                }
-              }
-            }).then((result) => {
-              if (result.status === "failed") {
-                const error = new AppError(deploymentErrorMessage(result.events));
-                steps.forEach((step) => step.settle(error));
-              } else if (result.timedOut) {
-                const error = new AppError(
-                  `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.`
-                );
-                steps.forEach((step) => step.settle(error));
-              } else {
-                steps.forEach((step) => step.settle());
-              }
-            }).catch((error) => {
-              const wrapped = error instanceof Error ? error : new AppError(String(error));
-              steps.forEach((step) => step.settle(wrapped));
-            });
-            return task.newListr(
-              steps.map((step) => ({ title: step.action, task: () => step.done })),
-              {
-                concurrent: false,
-                exitOnError: true,
-                rendererOptions: { collapseSubtasks: false }
-              }
-            );
-          }
-        }
+        // Known deployment steps as a checklist; each ticks off on its event.
+        ...steps.map((step) => ({ title: step.action, task: () => step.done }))
       ],
       {
         renderer: "default",
@@ -63662,6 +63612,47 @@ var SetAliasCommand = class {
       }
     ).run();
   }
+  /**
+   * Poll the deployment audit log and settle one step per matching event. Runs
+   * detached from the task list; it settles a step as its event arrives and
+   * fails the rest on a failed/timed-out deployment, stopping on the failed or
+   * "deployment completed" event (poll terminal).
+   */
+  pollDeploymentSteps(steps, basedOnId, aliasName, createdAfter, timeoutSeconds) {
+    const pending = new Map(steps.map((step) => [step.action, step]));
+    const seen = /* @__PURE__ */ new Set();
+    void pollDeployment(this.managementClient, {
+      objectType: "EXTENSION_ALIAS",
+      basedOnId,
+      aliasName,
+      createdAfter,
+      timeoutSeconds,
+      onProgress: (progress) => {
+        for (const event of [...progress.events].reverse()) {
+          if (seen.has(event.action)) {
+            continue;
+          }
+          seen.add(event.action);
+          pending.get(event.action)?.settle();
+        }
+      }
+    }).then((result) => {
+      if (result.status === "failed") {
+        const error = new AppError(deploymentErrorMessage(result.events));
+        steps.forEach((step) => step.settle(error));
+      } else if (result.timedOut) {
+        const error = new AppError(
+          `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.`
+        );
+        steps.forEach((step) => step.settle(error));
+      } else {
+        steps.forEach((step) => step.settle());
+      }
+    }).catch((error) => {
+      const wrapped = error instanceof Error ? error : new AppError(String(error));
+      steps.forEach((step) => step.settle(wrapped));
+    });
+  }
 };
 
 // packages/kong-cli/src/common/cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli",
-  "version": "0.0.67-alpha.6",
+  "version": "0.0.67-alpha.8",
   "type": "commonjs",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/packages/kong-cli/src/commands/setAliasCommand.d.ts

@@ -5,4 +5,11 @@ export declare class SetAliasCommand {
     private managementClient;
     constructor(profile: Profile);
     execute(aliasName: string, extensionVersion: number, timeoutSeconds: number): Promise<void>;
+    /**
+     * Poll the deployment audit log and settle one step per matching event. Runs
+     * detached from the task list; it settles a step as its event arrives and
+     * fails the rest on a failed/timed-out deployment, stopping on the failed or
+     * "deployment completed" event (poll terminal).
+     */
+    private pollDeploymentSteps;
 }