@zuplo/cli 1.21.0 → 1.23.0

package/dist/cmds/deploy.js

@@ -12,7 +12,6 @@ export default {
             describe: "The API Key from Zuplo",
             envVar: "API_KEY",
         })
-            .demandOption(["api-key"])
             .option("dir", {
             type: "string",
             describe: "The directory containing your zup",
@@ -20,6 +19,13 @@ export default {
             normalize: true,
             hidden: true,
         })
+            .option("verify-remote", {
+            type: "boolean",
+            describe: "Verify that this Git repository matches the one configured on Zuplo. Use --no-verify-remote to disable.",
+            default: true,
+        })
+            .demandOption(["api-key"])
+            .boolean("verify-remote")
             .check(async (argv) => {
             return await new YargsChecker(validDeployDirectoryValidator).check(argv.dir);
         })

package/dist/deploy/archive.js

@@ -8,11 +8,12 @@ import * as temp from "temp";
 import { DEPLOYER_METADATA_FILE } from "../common/constants.js";
 import { logger } from "../common/logger.js";
 export const ARCHIVE_EXTENSION = ".tar.gz";
-export async function archive(dir) {
+export async function archive(argv) {
     const tarball = temp.path({ suffix: ARCHIVE_EXTENSION });
+    const dir = argv.dir;
     const ignoreFn = createIgnoreFunction(dir);
     const normalizedDir = join(relative(process.cwd(), dir));
-    const metadata = await prepareDeployerMetadata(dir);
+    const metadata = await prepareDeployerMetadata(argv);
     await tar.create({
         gzip: true,
         file: tarball,
@@ -59,12 +60,14 @@ function createIgnoreFunction(normalizedDir) {
         return baseIgnore.add("node_modules/");
     }
 }
-async function prepareDeployerMetadata(dir) {
-    const metadata = await generateMetadata(dir);
+async function prepareDeployerMetadata(argv) {
+    const dir = argv.dir;
+    const metadata = await generateMetadata(argv);
     await writeGeneratedMetadata(dir, metadata);
     return metadata;
 }
-async function generateMetadata(dir) {
+async function generateMetadata(argv) {
+    const dir = argv.dir;
     const git = simpleGit({ baseDir: dir });
     const status = await git.status();
     if (!status.current) {
@@ -73,10 +76,12 @@ async function generateMetadata(dir) {
     const branch = status.current.trim();
     const sha = (await git.revparse(["HEAD"])).trim();
     const repoUrl = (await git.listRemote(["--get-url"])).trim();
+    const verifyRemote = argv["verify-remote"];
     return {
         branch,
         repoUrl,
         sha,
+        verifyRemote,
     };
 }
 async function writeGeneratedMetadata(dir, metadata) {

package/dist/deploy/handler.js

@@ -6,7 +6,7 @@ import { archive, ARCHIVE_EXTENSION } 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.dir);
+    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",
@@ -28,12 +28,13 @@ 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, buildResult } = await pollDeployment(argv, fileId, account, project);
+                const { url, steps, 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}. Here's the build result: ${JSON.stringify(buildResult, null, 2)}`);
+                    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 {

package/dist/deploy/poll-deployment.js

@@ -5,6 +5,8 @@ function wait(duration = settings.POLL_INTERVAL) {
     return new Promise((resolve) => setTimeout(resolve, duration));
 }
 export async function pollDeployment(argv, fileId, account, project) {
+    const MAX_RETRY_ATTEMPTS_FOR_SERVER_UPDATES = 5;
+    let CURRENT_RETRY_ATTEMPTS_FOR_SERVER_UPDATES = 0;
     for (let pollRetry = 0; pollRetry < settings.MAX_POLL_RETRIES; pollRetry++) {
         printDiagnosticsToConsole(`Polling for deployment status... (${pollRetry}/${settings.MAX_POLL_RETRIES})`);
         const response = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployment-status/${fileId}`, {
@@ -15,7 +17,7 @@ export async function pollDeployment(argv, fileId, account, project) {
         });
         if (response.ok) {
             const rawJSON = await response.text();
-            const { status, url, buildResult } = JSON.parse(rawJSON);
+            const { status, url, steps, buildResult } = JSON.parse(rawJSON);
             switch (status) {
                 case "IN_PROGRESS":
                     await wait();
@@ -25,6 +27,7 @@ export async function pollDeployment(argv, fileId, account, project) {
                     if (zupResponse.ok) {
                         return {
                             url,
+                            steps,
                             buildResult,
                         };
                     }
@@ -33,6 +36,7 @@ export async function pollDeployment(argv, fileId, account, project) {
                     }
                 case "ERROR":
                     return {
+                        steps,
                         buildResult,
                     };
             }
@@ -41,6 +45,13 @@ export async function pollDeployment(argv, fileId, account, project) {
             await wait();
             continue;
         }
+        else if (response.status === 500 &&
+            CURRENT_RETRY_ATTEMPTS_FOR_SERVER_UPDATES <
+                MAX_RETRY_ATTEMPTS_FOR_SERVER_UPDATES) {
+            CURRENT_RETRY_ATTEMPTS_FOR_SERVER_UPDATES++;
+            await wait();
+            continue;
+        }
         else {
             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}`);

package/package.json

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