@zuplo/cli 1.41.0 → 1.42.0

package/dist/cmds/delete.js

@@ -1,3 +1,4 @@
+import { configure } from "../common/middleware/user-configuration.js";
 import setBlocking from "../common/output.js";
 import { deleteZup } from "../delete/handler.js";
 export default {
@@ -13,6 +14,10 @@ export default {
             .option("url", {
             type: "string",
             describe: "The URL of the zup to delete",
+        })
+            .option("project", {
+            type: "string",
+            describe: "The project name",
         })
             .option("wait", {
             type: "boolean",
@@ -20,7 +25,7 @@ export default {
         })
             .boolean("wait")
             .demandOption(["api-key", "url"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         await deleteZup(argv);

package/dist/cmds/deploy.js

@@ -1,3 +1,4 @@
+import { configure } from "../common/middleware/user-configuration.js";
 import setBlocking from "../common/output.js";
 import { validDeployDirectoryValidator } from "../common/validators/file-system-validator.js";
 import { YargsChecker } from "../common/validators/lib.js";
@@ -29,7 +30,7 @@ export default {
             .check(async (argv) => {
             return await new YargsChecker(validDeployDirectoryValidator).check(argv.dir);
         })
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         await deploy(argv);

package/dist/cmds/list.js

@@ -1,3 +1,4 @@
+import { configure } from "../common/middleware/user-configuration.js";
 import setBlocking from "../common/output.js";
 import { list } from "../list/handler.js";
 export default {
@@ -9,9 +10,13 @@ export default {
             type: "string",
             describe: "The API Key from Zuplo",
             envVar: "API_KEY",
+        })
+            .option("project", {
+            type: "string",
+            describe: "The project name",
         })
             .demandOption(["api-key"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         await list(argv);

package/dist/cmds/tunnel/create.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { create } from "../../tunnel/create/handler.js";
 export default {
@@ -15,7 +16,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key", "tunnel-name"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         create(argv);

package/dist/cmds/tunnel/delete.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { deleteTunnel } from "../../tunnel/delete/handler.js";
 export default {
@@ -11,7 +12,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         deleteTunnel(argv);

package/dist/cmds/tunnel/describe.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { describe } from "../../tunnel/describe/handler.js";
 export default {
@@ -15,7 +16,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key", "tunnel-id"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         describe(argv);

package/dist/cmds/tunnel/list.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { list } from "../../tunnel/list/handler.js";
 export default {
@@ -11,7 +12,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         await list(argv);

package/dist/cmds/tunnel/rotate-token.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { rotateToken } from "../../tunnel/rotate-token/handler.js";
 export default {
@@ -15,7 +16,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key", "tunnel-id"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         rotateToken(argv);

package/dist/cmds/tunnel/services/describe.js

@@ -1,3 +1,4 @@
+import { configure } from "../../../common/middleware/user-configuration.js";
 import setBlocking from "../../../common/output.js";
 import { describe, } from "../../../tunnel/services/describe/handler.js";
 export default {
@@ -15,7 +16,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key", "tunnel-id"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         describe(argv);

package/dist/cmds/tunnel/services/update.js

@@ -1,3 +1,4 @@
+import { configure } from "../../../common/middleware/user-configuration.js";
 import setBlocking from "../../../common/output.js";
 import { updateServices, } from "../../../tunnel/services/update/handler.js";
 export default {
@@ -19,7 +20,7 @@ export default {
             envVar: "API_KEY",
         })
             .demandOption(["api-key", "configuration-file", "tunnel-id"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         updateServices(argv);

package/dist/cmds/variable/create.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { create } from "../../variable/create/handler.js";
 export default {
@@ -25,9 +26,13 @@ export default {
             type: "string",
             describe: "The API Key from Zuplo",
             envVar: "API_KEY",
+        })
+            .option("project", {
+            type: "string",
+            describe: "The project name",
         })
             .demandOption(["api-key", "name", "value", "is-secret", "branch"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         create(argv);

package/dist/cmds/variable/update.js

@@ -1,3 +1,4 @@
+import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
 import { update } from "../../variable/update/handler.js";
 export default {
@@ -17,13 +18,12 @@ export default {
             type: "string",
             describe: "The branch where the variable exists",
         })
-            .option("api-key", {
+            .option("project", {
             type: "string",
-            describe: "The API Key from Zuplo",
-            envVar: "API_KEY",
+            describe: "The project name",
         })
             .demandOption(["api-key", "name", "value", "branch"])
-            .middleware([setBlocking]);
+            .middleware([setBlocking, configure]);
     },
     handler: async (argv) => {
         update(argv);

package/dist/common/constants.js

@@ -1,3 +1,5 @@
+export const ZUPLO_PREFERRED_JSON_FILE = "zuplo.jsonc";
+export const ZUPLO_FALLBACK_JSON_FILE = "zuplo.json";
 export const DEPLOYER_METADATA_FILE = "deployer.json";
 export const TEST_IN_FOLDER = "tests";
 export const TEST_OUT_FOLDER = ".zuplo/__tests__";

package/dist/common/middleware/user-configuration.js

@@ -0,0 +1,59 @@
+import { parse } from "jsonc-parser";
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { resolve } from "node:path";
+import { ZUPLO_FALLBACK_JSON_FILE, ZUPLO_PREFERRED_JSON_FILE, } from "../constants.js";
+import { logger } from "../logger.js";
+import { printCriticalFailureToConsoleAndExit } from "../output.js";
+import settings from "../settings.js";
+export async function configure(argv) {
+    const cliParametersConfiguration = { ...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 apiKeyMetadata = await whoAmIResponse.json();
+        Object.assign(argv, omitNull(apiKeyMetadata));
+        const { project: zuploJsoncProject } = await processZuploConfigurationFile();
+        if (zuploJsoncProject) {
+            argv.project = zuploJsoncProject;
+        }
+        Object.assign(argv, cliParametersConfiguration);
+    }
+    else {
+        logger.trace({ status: whoAmIResponse.status, statusText: whoAmIResponse.statusText }, "Failed to determine who-am-i");
+        printCriticalFailureToConsoleAndExit("Error: Failed to validate the API key. Check your API key.");
+    }
+}
+async function processZuploConfigurationFile() {
+    const preferredPath = resolve(".", ZUPLO_PREFERRED_JSON_FILE);
+    const fallbackPath = resolve(".", ZUPLO_FALLBACK_JSON_FILE);
+    let fileContents = "{}";
+    if (existsSync(preferredPath)) {
+        fileContents = await readFile(preferredPath, "utf-8");
+    }
+    else if (existsSync(fallbackPath)) {
+        fileContents = await readFile(fallbackPath, "utf-8");
+    }
+    else {
+        logger.trace("No zuplo.jsonc file found");
+        return {};
+    }
+    const errors = [];
+    const data = parse(fileContents, errors);
+    if (errors.length > 0) {
+        logger.trace(errors[0], "Failed to parse zuplo.jsonc");
+        printCriticalFailureToConsoleAndExit("Error: Failed to parse the values from zuplo.jsonc. Check your zuplo.jsonc file.");
+    }
+    return data;
+}
+let omitNull = (obj) => {
+    Object.keys(obj)
+        .filter((k) => obj[k] === null)
+        .forEach((k) => delete obj[k]);
+    return obj;
+};
+//# sourceMappingURL=user-configuration.js.map

package/dist/delete/handler.js

@@ -28,46 +28,34 @@ export async function deleteZup(argv) {
         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",
+    const { account, project } = argv;
+    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 (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}`);
-                }
+    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(`Enqueued deletion of ${argv.url}`);
+                printResultToConsoleAndExitGracefully(`Deleted ${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.");
+            printResultToConsoleAndExitGracefully(`Enqueued deletion of ${argv.url}`);
         }
     }
     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.");
+        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.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/deploy/handler.js

@@ -2,60 +2,48 @@ import { parse } from "path";
 import { logger } from "../common/logger.js";
 import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../common/output.js";
 import settings from "../common/settings.js";
-import { archive, ARCHIVE_EXTENSION } from "./archive.js";
+import { ARCHIVE_EXTENSION, archive } from "./archive.js";
 import { upload } from "./file-upload.js";
 import { pollDeployment } from "./poll-deployment.js";
 export async function deploy(argv) {
     const archiveMetadata = await archive(argv);
     logger.info(`Tarball created locally at ${archiveMetadata}`);
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account, project } = argv;
+    const uploadUrlResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/sources`, {
+        method: "POST",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account, project } = await whoAmIResponse.json();
-        const uploadUrlResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/sources`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
-        });
-        if (uploadUrlResponse.ok) {
-            const { uploadUrl } = await uploadUrlResponse.json();
-            const uploadResponse = await upload(archiveMetadata.tarball, uploadUrl);
-            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, steps, buildResult } = await pollDeployment(argv, fileId, account, project);
-                if (url) {
-                    printResultToConsoleAndExitGracefully(`Deployed to ${url}`);
-                }
-                else {
-                    const diagnostics = buildResult ?? steps;
-                    printCriticalFailureToConsoleAndExit(`Failed to deploy the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}. Here's the diagnostics: ${JSON.stringify(diagnostics, null, 2)}`);
-                }
+    if (uploadUrlResponse.ok) {
+        const { uploadUrl } = await uploadUrlResponse.json();
+        const uploadResponse = await upload(archiveMetadata.tarball, uploadUrl);
+        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, steps, buildResult } = await pollDeployment(argv, fileId, account, project);
+            if (url) {
+                printResultToConsoleAndExitGracefully(`Deployed to ${url}`);
             }
             else {
-                logger.error({
-                    status: uploadResponse.status,
-                    statusText: uploadResponse.statusText,
-                }, "Failed to upload source to cloud storage");
-                printDiagnosticsToConsole("Error: Failed to upload source to cloud storage. Try again later.");
+                const diagnostics = buildResult ?? steps;
+                printCriticalFailureToConsoleAndExit(`Failed to deploy the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}. Here's the diagnostics: ${JSON.stringify(diagnostics, null, 2)}`);
             }
         }
         else {
             logger.error({
-                status: uploadUrlResponse.status,
-                statusText: uploadUrlResponse.statusText,
-            }, "Failed to retrieve uploadUrl");
-            printCriticalFailureToConsoleAndExit("Error: Failed to determine where to upload your files. Try again later.");
+                status: uploadResponse.status,
+                statusText: uploadResponse.statusText,
+            }, "Failed to upload source to cloud storage");
+            printDiagnosticsToConsole("Error: Failed to upload source to cloud storage. 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.");
+        logger.error({
+            status: uploadUrlResponse.status,
+            statusText: uploadUrlResponse.statusText,
+        }, "Failed to retrieve uploadUrl");
+        printCriticalFailureToConsoleAndExit("Error: Failed to determine where to upload your files. Try again later.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/list/handler.js

@@ -1,37 +1,25 @@
 import { logger } from "../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../common/output.js";
+import { 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`, {
+    const { account, project } = argv;
+    const listResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
         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.");
-        }
+    if (listResponse.ok) {
+        const { data: deployments } = await listResponse.json();
+        const output = deployments.map((deployment) => deployment.url).join("\n");
+        printResultToConsoleAndExitGracefully(output);
     }
     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.");
+        logger.error({
+            status: listResponse.status,
+            statusText: listResponse.statusText,
+        }, "Failed to list deployed zups");
+        printDiagnosticsToConsole("Error: Failed to list deployed zups. Try again later.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/create/handler.js

@@ -1,39 +1,27 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
 import settings from "../../common/settings.js";
 export async function create(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account } = argv;
+    const createResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels`, {
+        method: "POST",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
+            "Content-Type": "application/json",
         },
+        body: JSON.stringify({ name: argv["tunnel-name"] }),
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const createResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({ name: argv["tunnel-name"] }),
-        });
-        if (createResponse.ok) {
-            const tunnel = await createResponse.json();
-            printTableToConsoleAndExitGracefully(tunnel);
-        }
-        else {
-            logger.error({
-                status: createResponse.status,
-                statusText: createResponse.statusText,
-                response: await createResponse.text(),
-            }, "Failed to create tunnel for account");
-            printDiagnosticsToConsole("Error: Failed to create tunnel for your account. Check the arguments.");
-        }
+    if (createResponse.ok) {
+        const tunnel = await createResponse.json();
+        printTableToConsoleAndExitGracefully(tunnel);
     }
     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.");
+        logger.error({
+            status: createResponse.status,
+            statusText: createResponse.statusText,
+            response: await createResponse.text(),
+        }, "Failed to create tunnel for account");
+        printDiagnosticsToConsole("Error: Failed to create tunnel for your account. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/delete/handler.js

@@ -3,48 +3,36 @@ import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printR
 import settings from "../../common/settings.js";
 import { pollTeardownOperation } from "./poll-teardown-operation.js";
 export async function deleteTunnel(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account } = argv;
+    const deleteResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}`, {
+        method: "DELETE",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const deleteResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}`, {
-            method: "DELETE",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
+    if (deleteResponse.ok) {
+        const teardownOperation = await deleteResponse.json();
+        printDiagnosticsToConsole(`Deleting tunnel ${argv["tunnel-id"]} on account ${account}...`);
+        const polledTearDownOperation = await pollTeardownOperation({
+            argv,
+            account,
+            teardownOperationId: teardownOperation.id,
         });
-        if (deleteResponse.ok) {
-            const teardownOperation = await deleteResponse.json();
-            printDiagnosticsToConsole(`Deleting tunnel ${argv["tunnel-id"]} on account ${account}...`);
-            const polledTearDownOperation = await pollTeardownOperation({
-                argv,
-                account,
-                teardownOperationId: teardownOperation.id,
-            });
-            if (polledTearDownOperation.status === "success") {
-                printResultToConsoleAndExitGracefully(`Tunnel ${argv["tunnel-id"]} deleted successfully.`);
-            }
-            else {
-                printDiagnosticsToConsole(polledTearDownOperation.details);
-                printCriticalFailureToConsoleAndExit(`Tunnel ${argv["tunnel-id"]} failed to delete. Here's the error: ${polledTearDownOperation.message}`);
-            }
+        if (polledTearDownOperation.status === "success") {
+            printResultToConsoleAndExitGracefully(`Tunnel ${argv["tunnel-id"]} deleted successfully.`);
         }
         else {
-            logger.error({
-                status: deleteResponse.status,
-                statusText: deleteResponse.statusText,
-                response: await deleteResponse.text(),
-            }, "Failed to delete tunnel for account");
-            printDiagnosticsToConsole("Error: Failed to delete the tunnel for your account. Check the arguments.");
+            printDiagnosticsToConsole(polledTearDownOperation.details);
+            printCriticalFailureToConsoleAndExit(`Tunnel ${argv["tunnel-id"]} failed to delete. Here's the error: ${polledTearDownOperation.message}`);
         }
     }
     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.");
+        logger.error({
+            status: deleteResponse.status,
+            statusText: deleteResponse.statusText,
+            response: await deleteResponse.text(),
+        }, "Failed to delete tunnel for account");
+        printDiagnosticsToConsole("Error: Failed to delete the tunnel for your account. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/describe/handler.js

@@ -1,37 +1,25 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
 import settings from "../../common/settings.js";
 export async function describe(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
+    const { account } = argv;
+    const describeResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}`, {
         method: "GET",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const describeResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}`, {
-            method: "GET",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
-        });
-        if (describeResponse.ok) {
-            const tunnel = await describeResponse.json();
-            printTableToConsoleAndExitGracefully(tunnel);
-        }
-        else {
-            logger.error({
-                status: describeResponse.status,
-                statusText: describeResponse.statusText,
-                response: await describeResponse.text(),
-            }, "Failed to describe tunnel for account");
-            printDiagnosticsToConsole("Error: Failed to describe tunnel for your account. Check the arguments.");
-        }
+    if (describeResponse.ok) {
+        const tunnel = await describeResponse.json();
+        printTableToConsoleAndExitGracefully(tunnel);
     }
     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.");
+        logger.error({
+            status: describeResponse.status,
+            statusText: describeResponse.statusText,
+            response: await describeResponse.text(),
+        }, "Failed to describe tunnel for account");
+        printDiagnosticsToConsole("Error: Failed to describe tunnel for your account. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/list/handler.js

@@ -1,46 +1,34 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, printTableToConsoleAndExitGracefully, } 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`, {
+    const { account } = await argv;
+    const listResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels`, {
         method: "GET",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const listResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels`, {
-            method: "GET",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
-        });
-        if (listResponse.ok) {
-            const tunnels = await listResponse.json();
-            if (tunnels.data.length === 0) {
-                const output = "No tunnels found";
-                printResultToConsoleAndExitGracefully(output);
-            }
-            else {
-                const table = tunnels.data.map((tunnel) => {
-                    return { "tunnel-id": tunnel.id, name: tunnel.name };
-                });
-                printTableToConsoleAndExitGracefully(table);
-            }
+    if (listResponse.ok) {
+        const tunnels = await listResponse.json();
+        if (tunnels.data.length === 0) {
+            const output = "No tunnels found";
+            printResultToConsoleAndExitGracefully(output);
         }
         else {
-            logger.error({
-                status: listResponse.status,
-                statusText: listResponse.statusText,
-                response: await listResponse.text(),
-            }, "Failed to list tunnels for account");
-            printDiagnosticsToConsole("Error: Failed to list tunnels for your account. Try again later.");
+            const table = tunnels.data.map((tunnel) => {
+                return { "tunnel-id": tunnel.id, name: tunnel.name };
+            });
+            printTableToConsoleAndExitGracefully(table);
         }
     }
     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.");
+        logger.error({
+            status: listResponse.status,
+            statusText: listResponse.statusText,
+            response: await listResponse.text(),
+        }, "Failed to list tunnels for account");
+        printDiagnosticsToConsole("Error: Failed to list tunnels for your account. Try again later.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/rotate-token/handler.js

@@ -1,37 +1,25 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printTableToConsoleAndExitGracefully, } from "../../common/output.js";
 import settings from "../../common/settings.js";
 export async function rotateToken(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account } = argv;
+    const rotateResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/$rotate-token`, {
+        method: "POST",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const rotateResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/$rotate-token`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
-        });
-        if (rotateResponse.ok) {
-            const tunnel = await rotateResponse.json();
-            printTableToConsoleAndExitGracefully(tunnel);
-        }
-        else {
-            logger.error({
-                status: rotateResponse.status,
-                statusText: rotateResponse.statusText,
-                response: await rotateResponse.text(),
-            }, "Failed to rotate token for tunnel");
-            printDiagnosticsToConsole("Error: Failed to rotate token for tunnel. Check the arguments.");
-        }
+    if (rotateResponse.ok) {
+        const tunnel = await rotateResponse.json();
+        printTableToConsoleAndExitGracefully(tunnel);
     }
     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.");
+        logger.error({
+            status: rotateResponse.status,
+            statusText: rotateResponse.statusText,
+            response: await rotateResponse.text(),
+        }, "Failed to rotate token for tunnel");
+        printDiagnosticsToConsole("Error: Failed to rotate token for tunnel. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/services/describe/handler.js

@@ -1,37 +1,25 @@
 import { logger } from "../../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../../../common/output.js";
+import { printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../../../common/output.js";
 import settings from "../../../common/settings.js";
 export async function describe(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
+    const { account } = argv;
+    const describeResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/services-configuration`, {
         method: "GET",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
         },
     });
-    if (whoAmIResponse.ok) {
-        const { account } = await whoAmIResponse.json();
-        const describeResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/services-configuration`, {
-            method: "GET",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-            },
-        });
-        if (describeResponse.ok) {
-            const tunnel = await describeResponse.json();
-            printResultToConsoleAndExitGracefully(JSON.stringify(tunnel, null, 2));
-        }
-        else {
-            logger.error({
-                status: describeResponse.status,
-                statusText: describeResponse.statusText,
-                response: await describeResponse.text(),
-            }, "Failed to describe services for tunnel");
-            printDiagnosticsToConsole("Error: Failed to describe the services for your tunnel. Check the arguments.");
-        }
+    if (describeResponse.ok) {
+        const tunnel = await describeResponse.json();
+        printResultToConsoleAndExitGracefully(JSON.stringify(tunnel, null, 2));
     }
     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.");
+        logger.error({
+            status: describeResponse.status,
+            statusText: describeResponse.statusText,
+            response: await describeResponse.text(),
+        }, "Failed to describe services for tunnel");
+        printDiagnosticsToConsole("Error: Failed to describe the services for your tunnel. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/tunnel/services/update/handler.js

@@ -4,57 +4,45 @@ import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printR
 import settings from "../../../common/settings.js";
 import { pollProvisioningOperation } from "./poll-provisioning-operations.js";
 export async function updateServices(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    let contents;
+    try {
+        contents = await readFile(argv["configuration-file"], "utf-8");
+    }
+    catch (err) {
+        printCriticalFailureToConsoleAndExit(`Error reading the configuration file at ${argv["configuration-file"]}: ${err.message}}`);
+    }
+    const { account } = argv;
+    const deleteResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/services-configuration`, {
+        method: "PUT",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
+            "Content-Type": "application/json",
         },
+        body: contents,
     });
-    if (whoAmIResponse.ok) {
-        let contents;
-        try {
-            contents = await readFile(argv["configuration-file"], "utf-8");
-        }
-        catch (err) {
-            printCriticalFailureToConsoleAndExit(`Error reading the configuration file at ${argv["configuration-file"]}: ${err.message}}`);
-        }
-        const { account } = await whoAmIResponse.json();
-        const deleteResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/tunnels/${argv["tunnel-id"]}/services-configuration`, {
-            method: "PUT",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-                "Content-Type": "application/json",
-            },
-            body: contents,
+    if (deleteResponse.ok) {
+        const provisioningOperation = await deleteResponse.json();
+        printDiagnosticsToConsole(`Updating services on tunnel ${argv["tunnel-id"]} on account ${account}...`);
+        const polledProvisioningOperation = await pollProvisioningOperation({
+            argv,
+            account,
+            provisioningOperationId: provisioningOperation.id,
         });
-        if (deleteResponse.ok) {
-            const provisioningOperation = await deleteResponse.json();
-            printDiagnosticsToConsole(`Updating services on tunnel ${argv["tunnel-id"]} on account ${account}...`);
-            const polledProvisioningOperation = await pollProvisioningOperation({
-                argv,
-                account,
-                provisioningOperationId: provisioningOperation.id,
-            });
-            if (polledProvisioningOperation.status === "success") {
-                printResultToConsoleAndExitGracefully(`Tunnel ${argv["tunnel-id"]} updated successfully.`);
-            }
-            else {
-                printDiagnosticsToConsole(polledProvisioningOperation.details);
-                printCriticalFailureToConsoleAndExit(`Tunnel ${argv["tunnel-id"]} failed to update. Here's the error: ${polledProvisioningOperation.message}`);
-            }
+        if (polledProvisioningOperation.status === "success") {
+            printResultToConsoleAndExitGracefully(`Tunnel ${argv["tunnel-id"]} updated successfully.`);
         }
         else {
-            logger.error({
-                status: deleteResponse.status,
-                statusText: deleteResponse.statusText,
-                response: await deleteResponse.text(),
-            }, "Failed to update tunnel for account");
-            printDiagnosticsToConsole("Error: Failed to update the tunnel for your account. Check the arguments.");
+            printDiagnosticsToConsole(polledProvisioningOperation.details);
+            printCriticalFailureToConsoleAndExit(`Tunnel ${argv["tunnel-id"]} failed to update. Here's the error: ${polledProvisioningOperation.message}`);
         }
     }
     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.");
+        logger.error({
+            status: deleteResponse.status,
+            statusText: deleteResponse.statusText,
+            response: await deleteResponse.text(),
+        }, "Failed to update tunnel for account");
+        printDiagnosticsToConsole("Error: Failed to update the tunnel for your account. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/variable/create/handler.js

@@ -1,43 +1,31 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsole, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printResultToConsole, } from "../../common/output.js";
 import settings from "../../common/settings.js";
 export async function create(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account, project } = argv;
+    const createResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/branches/${encodeURIComponent(argv["branch"])}/variables`, {
+        method: "POST",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
+            "Content-Type": "application/json",
         },
+        body: JSON.stringify({
+            name: argv["name"],
+            isSecret: argv["is-secret"],
+            value: argv["value"],
+        }),
     });
-    if (whoAmIResponse.ok) {
-        const { account, project } = await whoAmIResponse.json();
-        const createResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/branches/${encodeURIComponent(argv["branch"])}/variables`, {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                name: argv["name"],
-                isSecret: argv["is-secret"],
-                value: argv["value"],
-            }),
-        });
-        if (createResponse.ok) {
-            const variable = await createResponse.json();
-            printResultToConsole(variable.name + " created successfully");
-            console.log(variable);
-        }
-        else {
-            logger.error({
-                status: createResponse.status,
-                statusText: createResponse.statusText,
-            }, "Failed to create variable");
-            printDiagnosticsToConsole("Error: Failed to create variable. Check the arguments.");
-        }
+    if (createResponse.ok) {
+        const variable = await createResponse.json();
+        printResultToConsole(variable.name + " created successfully");
+        console.log(variable);
     }
     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.");
+        logger.error({
+            status: createResponse.status,
+            statusText: createResponse.statusText,
+        }, "Failed to create variable");
+        printDiagnosticsToConsole("Error: Failed to create variable. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/dist/variable/update/handler.js

@@ -1,41 +1,29 @@
 import { logger } from "../../common/logger.js";
-import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsole, } from "../../common/output.js";
+import { printDiagnosticsToConsole, printResultToConsole, } from "../../common/output.js";
 import settings from "../../common/settings.js";
 export async function update(argv) {
-    const whoAmIResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`, {
-        method: "GET",
+    const { account, project } = argv;
+    const updateResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/branches/${encodeURIComponent(argv["branch"])}/variables/${encodeURIComponent(argv["name"])}`, {
+        method: "PATCH",
         headers: {
             Authorization: `Bearer ${argv["api-key"]}`,
+            "Content-Type": "application/json",
         },
+        body: JSON.stringify({
+            value: argv["value"],
+        }),
     });
-    if (whoAmIResponse.ok) {
-        const { account, project } = await whoAmIResponse.json();
-        const updateResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/branches/${encodeURIComponent(argv["branch"])}/variables/${encodeURIComponent(argv["name"])}`, {
-            method: "PATCH",
-            headers: {
-                Authorization: `Bearer ${argv["api-key"]}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                value: argv["value"],
-            }),
-        });
-        if (updateResponse.ok) {
-            const variable = await updateResponse.json();
-            printResultToConsole(variable.name + " updated successfully");
-            console.log(variable);
-        }
-        else {
-            logger.error({
-                status: updateResponse.status,
-                statusText: updateResponse.statusText,
-            }, "Failed to update variable");
-            printDiagnosticsToConsole("Error: Failed to update variable. Check the arguments.");
-        }
+    if (updateResponse.ok) {
+        const variable = await updateResponse.json();
+        printResultToConsole(variable.name + " updated successfully");
+        console.log(variable);
     }
     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.");
+        logger.error({
+            status: updateResponse.status,
+            statusText: updateResponse.statusText,
+        }, "Failed to update variable");
+        printDiagnosticsToConsole("Error: Failed to update variable. Check the arguments.");
     }
 }
 //# sourceMappingURL=handler.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "author": "Zuplo, Inc.",
@@ -56,6 +56,7 @@
     "execa": "^6.1.0",
     "fast-glob": "^3.2.12",
     "ignore": "^5.2.4",
+    "jsonc-parser": "^3.2.0",
     "pino": "^8.11.0",
     "pino-pretty": "^9.4.0",
     "prettier": "^2.8.7",