@zuplo/cli 1.18.0 → 1.20.0

package/README.md

@@ -4,7 +4,9 @@
 zup <command>
 
 Commands:
+  zup delete  Deletes the zup at the URL
   zup deploy  Deploys current Git branch of the current directory.
+  zup list    Lists all deployed zups
   zup test    Runs the tests under /tests against an endpoint
 
 Options:

package/dist/cli.js

@@ -3,7 +3,9 @@ dotenv.config();
 import { gte } from "semver";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs/yargs";
+import deleteZup from "./cmds/delete.js";
 import deploy from "./cmds/deploy.js";
+import list from "./cmds/list.js";
 import test from "./cmds/test.js";
 import { printCriticalFailureToConsoleAndExit } from "./common/output.js";
 const MIN_NODE_VERSION = "18.0.0";
@@ -11,7 +13,9 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
     void yargs(hideBin(process.argv))
         .env("ZUPLO")
         .version(false)
+        .command(deleteZup)
         .command(deploy)
+        .command(list)
         .command(test)
         .demandCommand()
         .strictCommands()

package/dist/cmds/delete.js

@@ -0,0 +1,29 @@
+import setBlocking from "../common/output.js";
+import { deleteZup } from "../delete/handler.js";
+export default {
+    desc: "Deletes the zup at the URL",
+    command: "delete",
+    builder: (yargs) => {
+        return yargs
+            .option("api-key", {
+            type: "string",
+            describe: "The API Key from Zuplo",
+            envVar: "API_KEY",
+        })
+            .option("url", {
+            type: "string",
+            describe: "The URL of the zup to delete",
+        })
+            .option("wait", {
+            type: "boolean",
+            describe: "Should the CLI wait until the zup is deleted",
+        })
+            .boolean("wait")
+            .demandOption(["api-key", "url"])
+            .middleware([setBlocking]);
+    },
+    handler: async (argv) => {
+        await deleteZup(argv);
+    },
+};
+//# sourceMappingURL=delete.js.map

package/dist/cmds/list.js

@@ -0,0 +1,20 @@
+import setBlocking from "../common/output.js";
+import { list } from "../list/handler.js";
+export default {
+    desc: "Lists all deployed zups",
+    command: "list",
+    builder: (yargs) => {
+        return yargs
+            .option("api-key", {
+            type: "string",
+            describe: "The API Key from Zuplo",
+            envVar: "API_KEY",
+        })
+            .demandOption(["api-key"])
+            .middleware([setBlocking]);
+    },
+    handler: async (argv) => {
+        await list(argv);
+    },
+};
+//# sourceMappingURL=list.js.map

package/dist/delete/handler.js

@@ -0,0 +1,73 @@
+import { logger } from "../common/logger.js";
+import { printCriticalFailureToConsoleAndExit, printResultToConsoleAndExitGracefully, } from "../common/output.js";
+import settings from "../common/settings.js";
+import { pingDeployment } from "./poll-deployment.js";
+export async function deleteZup(argv) {
+    let deploymentName;
+    try {
+        let url = argv.url;
+        if (!/^(http:\/\/|https:\/\/)/i.test(argv.url)) {
+            url = "https://" + url;
+        }
+        const parsedUrl = new URL(argv.url);
+        if (parsedUrl.username || parsedUrl.password) {
+            logger.error(`Extra username and/or password was included in the URL.`);
+            printCriticalFailureToConsoleAndExit(`Error: Extraneous username and/or password in the URL. Only include the hostname.`);
+        }
+        if (parsedUrl.pathname !== "/") {
+            logger.error(`Extra pathname was included in the URL: ${parsedUrl.pathname}`);
+            printCriticalFailureToConsoleAndExit(`Error: Extraneous pathname in URL: ${parsedUrl.pathname}. Only include the hostname.`);
+        }
+        if (parsedUrl.search !== "") {
+            logger.error(`Extra search params were included in the URL: ${parsedUrl.search}`);
+            printCriticalFailureToConsoleAndExit(`Error: Extraneous search params in URL: ${parsedUrl.search}. Only include the hostname.`);
+        }
+        deploymentName = parsedUrl.hostname.split(".")[0];
+    }
+    catch (err) {
+        logger.error(err, "Failed to parse the URL");
+        printCriticalFailureToConsoleAndExit(`Error: Failed to parse the URL: ${argv.url}. Ensure you have entered a valid URL.`);
+    }
+    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
+        method: "GET",
+        headers: {
+            Authorization: `Bearer ${argv["api-key"]}`,
+        },
+    });
+    if (whoAmIResponse.ok) {
+        const { account, project } = await whoAmIResponse.json();
+        const deleteResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments/${deploymentName}`, {
+            method: "DELETE",
+            headers: {
+                Authorization: `Bearer ${argv["api-key"]}`,
+            },
+        });
+        if (deleteResponse.ok) {
+            if (argv.wait) {
+                const deleted = await pingDeployment(argv);
+                if (!deleted) {
+                    logger.error(`Failed to confirm deletion of zup within alloted time frame.`);
+                    printCriticalFailureToConsoleAndExit(`Error: Failed to confirm deletion of zup within alloted time frame of ${settings.MAX_POLL_RETRIES * settings.POLL_INTERVAL} ms. Your zup is still be available at ${argv.url}.`);
+                }
+                else {
+                    printResultToConsoleAndExitGracefully(`Deleted ${argv.url}`);
+                }
+            }
+            else {
+                printResultToConsoleAndExitGracefully(`Enqueued deletion of ${argv.url}`);
+            }
+        }
+        else {
+            logger.error({
+                status: deleteResponse.status,
+                statusText: deleteResponse.statusText,
+            }, "Failed to enqueue the deletion request");
+            printCriticalFailureToConsoleAndExit("Error: Failed to enqueue the deletion request. Try again later.");
+        }
+    }
+    else {
+        logger.error({ status: whoAmIResponse.status, statusText: whoAmIResponse.statusText }, "Failed to determine who-am-i");
+        printCriticalFailureToConsoleAndExit("Error: Failed to validate the API key. Check your API key.");
+    }
+}
+//# sourceMappingURL=handler.js.map

package/dist/delete/poll-deployment.js

@@ -0,0 +1,20 @@
+import { printDiagnosticsToConsole } from "../common/output.js";
+import settings from "../common/settings.js";
+function wait(duration = settings.POLL_INTERVAL) {
+    return new Promise((resolve) => setTimeout(resolve, duration));
+}
+export async function pingDeployment(argv) {
+    for (let pollRetry = 0; pollRetry < settings.MAX_POLL_RETRIES; pollRetry++) {
+        printDiagnosticsToConsole(`Waiting for zup to be deleted... (${pollRetry}/${settings.MAX_POLL_RETRIES})`);
+        const response = await fetch(`${argv.url}/__zuplo/build`);
+        if (!response.ok) {
+            return true;
+        }
+        else {
+            await wait();
+            continue;
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=poll-deployment.js.map

package/dist/deploy/handler.js

@@ -28,12 +28,12 @@ export async function deploy(argv) {
             if (uploadResponse.ok) {
                 printDiagnosticsToConsole(`Deploying the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}...`);
                 const fileId = parse(new URL(uploadUrl).pathname).base.replace(ARCHIVE_EXTENSION, "");
-                const { url } = await pollDeployment(argv, fileId, account, project);
+                const { url, buildResult } = await pollDeployment(argv, fileId, account, project);
                 if (url) {
                     printResultToConsoleAndExitGracefully(`Deployed to ${url}`);
                 }
                 else {
-                    printCriticalFailureToConsoleAndExit(`Failed to deploy the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}.`);
+                    printCriticalFailureToConsoleAndExit(`Failed to deploy the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}. Here's the build result: ${JSON.stringify(buildResult, null, 2)}`);
                 }
             }
             else {
@@ -49,12 +49,12 @@ export async function deploy(argv) {
                 status: uploadUrlResponse.status,
                 statusText: uploadUrlResponse.statusText,
             }, "Failed to retrieve uploadUrl");
-            printDiagnosticsToConsole("Error: Failed to determine where to upload your files. Try again later.");
+            printCriticalFailureToConsoleAndExit("Error: Failed to determine where to upload your files. Try again later.");
         }
     }
     else {
         logger.error({ status: whoAmIResponse.status, statusText: whoAmIResponse.statusText }, "Failed to determine who-am-i");
-        printDiagnosticsToConsole("Error: Failed to validate the API key. Check your API key.");
+        printCriticalFailureToConsoleAndExit("Error: Failed to validate the API key. Check your API key.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/deploy/poll-deployment.js

@@ -1,3 +1,4 @@
+import { logger } from "../common/logger.js";
 import { printDiagnosticsToConsole } from "../common/output.js";
 import settings from "../common/settings.js";
 function wait(duration = settings.POLL_INTERVAL) {
@@ -13,7 +14,8 @@ export async function pollDeployment(argv, fileId, account, project) {
             },
         });
         if (response.ok) {
-            const { status, url } = await response.json();
+            const rawJSON = await response.text();
+            const { status, url, buildResult } = JSON.parse(rawJSON);
             switch (status) {
                 case "IN_PROGRESS":
                     await wait();
@@ -23,6 +25,7 @@ export async function pollDeployment(argv, fileId, account, project) {
                     if (zupResponse.ok) {
                         return {
                             url,
+                            buildResult,
                         };
                     }
                     else {
@@ -30,7 +33,7 @@ export async function pollDeployment(argv, fileId, account, project) {
                     }
                 case "ERROR":
                     return {
-                        url: undefined,
+                        buildResult,
                     };
             }
         }
@@ -39,11 +42,10 @@ export async function pollDeployment(argv, fileId, account, project) {
             continue;
         }
         else {
-            throw new Error(`Unexpected response from server: ${response.status} ${response.statusText}`);
+            logger.error(`Unexpected error from server while polling for deployment: ${response.status} ${response.statusText} ${await response.text()}`);
+            throw new Error(`Unexpected response from server while polling for deployment: ${response.status} ${response.statusText}`);
         }
     }
-    return {
-        url: undefined,
-    };
+    return {};
 }
 //# sourceMappingURL=poll-deployment.js.map

package/dist/list/handler.js

@@ -0,0 +1,37 @@
+import { logger } from "../common/logger.js";
+import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../common/output.js";
+import settings from "../common/settings.js";
+export async function list(argv) {
+    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
+        method: "GET",
+        headers: {
+            Authorization: `Bearer ${argv["api-key"]}`,
+        },
+    });
+    if (whoAmIResponse.ok) {
+        const { account, project } = await whoAmIResponse.json();
+        const listResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
+            method: "GET",
+            headers: {
+                Authorization: `Bearer ${argv["api-key"]}`,
+            },
+        });
+        if (listResponse.ok) {
+            const { data: deployments } = await listResponse.json();
+            const output = deployments.map((deployment) => deployment.url).join("\n");
+            printResultToConsoleAndExitGracefully(output);
+        }
+        else {
+            logger.error({
+                status: listResponse.status,
+                statusText: listResponse.statusText,
+            }, "Failed to list deployed zups");
+            printDiagnosticsToConsole("Error: Failed to list deployed zups. Try again later.");
+        }
+    }
+    else {
+        logger.error({ status: whoAmIResponse.status, statusText: whoAmIResponse.statusText }, "Failed to determine who-am-i");
+        printCriticalFailureToConsoleAndExit("Error: Failed to validate the API key. Check your API key.");
+    }
+}
+//# sourceMappingURL=handler.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "author": "Zuplo, Inc.",