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

package/index.js

@@ -63094,12 +63094,12 @@ var ManagementClient = class {
     const url2 = joinUrlAndPath(this.baseUrl, "v1/extensions", extensionId, "/aliases");
     return (await axios_default.get(url2, await this.requestConfigProvider())).data;
   }
-  async getAuditLog(objectType2, objectId) {
+  async getAuditLog(objectType2, objectId, createdAfter) {
     const url2 = joinUrlAndPath(this.baseUrl, "v1/audit");
     const config = await this.requestConfigProvider();
     const response = await axios_default.get(url2, {
       ...config,
-      params: { ...config.params, objectType: objectType2, objectId }
+      params: { ...config.params, objectType: objectType2, objectId, createdAfter }
     });
     return response.data;
   }
@@ -63432,7 +63432,7 @@ var PublishVersionCommand = class {
 
 // packages/kong-cli/src/common/deployment.ts
 var DEPLOY_SUCCESS_ACTIONS = /* @__PURE__ */ new Set(["deployment completed"]);
-var DEPLOY_FAILURE_ACTIONS = /* @__PURE__ */ new Set(["deployment failed", "save deployment details"]);
+var DEPLOY_FAILURE_ACTIONS = /* @__PURE__ */ new Set(["deployment failed"]);
 function isFailureEvent(event) {
   return event.eventType === "error" || DEPLOY_FAILURE_ACTIONS.has(event.action);
 }
@@ -63453,8 +63453,12 @@ function analyzeDeployment(events) {
 }
 async function getDeploymentLog(management, query) {
   const [aliasEvents, baseEvents] = await Promise.all([
-    management.getAuditLog(query.objectType, `${query.basedOnId}-${query.aliasName}`),
-    management.getAuditLog(query.objectType, query.basedOnId)
+    management.getAuditLog(
+      query.objectType,
+      `${query.basedOnId}-${query.aliasName}`,
+      query.createdAfter
+    ),
+    management.getAuditLog(query.objectType, query.basedOnId, query.createdAfter)
   ]);
   return [...aliasEvents, ...baseEvents].sort((a, b) => b.created.localeCompare(a.created));
 }
@@ -63516,6 +63520,26 @@ function validateName(value) {
     );
   }
 }
+var DEPLOY_STEPS = [
+  "start extension set alias",
+  "create deployment",
+  "health check",
+  "save deployment details",
+  "deployment completed"
+];
+function createDeploySteps() {
+  return DEPLOY_STEPS.map((action) => {
+    const handlers = {
+      resolve: () => void 0,
+      reject: () => void 0
+    };
+    const done = new Promise((resolve2, reject) => {
+      handlers.resolve = resolve2;
+      handlers.reject = reject;
+    });
+    return { action, done, settle: (error) => error ? handlers.reject(error) : handlers.resolve() };
+  });
+}
 var SetAliasCommand = class {
   constructor(profile) {
     this.profile = profile;
@@ -63525,6 +63549,7 @@ var SetAliasCommand = class {
   }
   async execute(aliasName, extensionVersion, timeoutSeconds) {
     validateName(aliasName);
+    const startedAt = utcNow(DEFAULT_TIMEZONE);
     await new Listr(
       [
         {
@@ -63577,33 +63602,54 @@ var SetAliasCommand = class {
         },
         {
           title: "Wait for deployment",
-          task: async (ctx, task) => {
+          // 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();
-            const printNewEvents = (events) => {
-              for (const event of [...events].reverse()) {
-                const key = `${event.created}|${event.action}`;
-                if (seen.has(key)) {
-                  continue;
-                }
-                seen.add(key);
-                task.output = `${event.eventType === "error" ? "\u2717" : "\u2713"} ${event.action}`;
-              }
-            };
-            const result = await pollDeployment(this.managementClient, {
+            void pollDeployment(this.managementClient, {
               objectType: "EXTENSION_ALIAS",
               basedOnId: ctx.kongJson.id,
               aliasName,
+              createdAfter: startedAt,
               timeoutSeconds,
-              onProgress: (progress) => printNewEvents(progress.events)
+              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));
             });
-            if (result.status === "failed") {
-              throw new AppError(deploymentErrorMessage(result.events));
-            }
-            if (result.timedOut) {
-              task.output = `Still deploying after ${result.waitedSeconds}s \u2014 check the UI for completion.`;
-            }
-          },
-          rendererOptions: { bottomBar: Infinity, persistentOutput: true }
+            return task.newListr(
+              steps.map((step) => ({ title: step.action, task: () => step.done })),
+              {
+                concurrent: false,
+                exitOnError: true,
+                rendererOptions: { collapseSubtasks: false }
+              }
+            );
+          }
         }
       ],
       {

package/package.json

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

package/packages/kong-cli/src/common/deployment.d.ts

@@ -12,6 +12,8 @@ export interface DeploymentQuery {
     objectType: DeployObjectType;
     basedOnId: string;
     aliasName: string;
+    /** Only fetch audit events created at/after this UTC timestamp (ISO-8601). */
+    createdAfter?: string;
 }
 export interface DeploymentResult {
     /**

package/packages/kong-cli/src/services/managementClient.d.ts

@@ -11,5 +11,5 @@ export declare class ManagementClient {
     getExtensionSnapshot(extensionId: AppExtension["id"], extensionSnapshotVersion: AppSnapshot["version"]): Promise<Optional<AppSnapshotDetails>>;
     getExtensionSnapshotVersions(extensionId: AppExtension["id"]): Promise<AppSnapshot[]>;
     getExtensionSnapshotAliases(extensionId: AppExtension["id"]): Promise<AppExtensionAlias[]>;
-    getAuditLog(objectType: DeployObjectType, objectId: string): Promise<AppAuditLog[]>;
+    getAuditLog(objectType: DeployObjectType, objectId: string, createdAfter?: string): Promise<AppAuditLog[]>;
 }