fix(cli): Reviews

Author: byawitz

templates/cli/lib/commands/pull.js.twig

@@ -97,65 +97,70 @@ const pullFunctions = async ({ code, withVariables }) => {
 
         if (code === false) {
             warn("Source code download skipped.");
-        } else if (!func['deployment']) {
-            warn("Source code download skipped because function doesn't have active deployment.");
-        } else {
-            if (allowCodePull === null) {
-                const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
-                allowCodePull = codeAnswer.override;
+            continue;
+        }
+
+        if (allowCodePull === null) {
+            const codeAnswer = await inquirer.prompt(questionsPullFunctionsCode);
+            allowCodePull = codeAnswer.override;
+        }
+
+        if (!allowCodePull) {
+            continue;
+        }
+
+        let deploymentId = null;
+
+        try {
+            const fetchResponse = await functionsListDeployments({
+                functionId: func['$id'],
+                queries: [
+                    JSON.stringify({ method: 'limit', values: [1] }),
+                    JSON.stringify({ method: 'orderDesc', values: ['$id'] })
+                ],
+                parseOutput: false
+            });
+
+            if (fetchResponse['total'] > 0) {
+                deploymentId = fetchResponse['deployments'][0]['$id'];
             }
 
-            if (allowCodePull) {
-                log("Pulling active deployment's code ...");
-
-                let deploymentId = func['deployment'];
-
-                try {
-                    const fetchResponse = await functionsListDeployments({
-                        functionId: func['$id'],
-                        queries: [
-                            JSON.stringify({ method: 'limit', values: [1] }),
-                            JSON.stringify({ method: 'orderDesc', values: [''] })
-                        ],
-                        parseOutput: false
-                    });
-
-                    if (fetchResponse['total'] > 0) {
-                        deploymentId = fetchResponse['deployments'][0]['$id'];
-                    }
-
-                } catch (e) {
-                    log("Can't get last deployment ID, using local value instead")
-                }
-
-                const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
-                await functionsDownloadDeployment({
-                    functionId: func['$id'],
-                    deploymentId,
-                    destination: compressedFileName,
-                    overrideForCli: true,
-                    parseOutput: false
-                });
-
-                tar.extract({
-                    sync: true,
-                    cwd: func['path'],
-                    file: compressedFileName,
-                    strict: false,
-                });
-
-                fs.rmSync(compressedFileName);
-
-                if (withVariables) {
-                    const envFileLocation = `${func['path']}/.env`
-                    try {
-                        fs.rmSync(envFileLocation);
-                    } catch {
-                    }
-
-                    fs.writeFileSync(envFileLocation, func['vars'].map(r => `${r.key}=${r.value}\n`).join(''))
-                }
+        } catch {
+        }
+
+        if (deploymentId === null) {
+            log("Source code download skipped because function doesn't have any available deployment");
+            continue;
+        }
+
+        log("Pulling latest deployment code ...");
+
+        const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
+        await functionsDownloadDeployment({
+            functionId: func['$id'],
+            deploymentId,
+            destination: compressedFileName,
+            overrideForCli: true,
+            parseOutput: false
+        });
+
+        tar.extract({
+            sync: true,
+            cwd: func['path'],
+            file: compressedFileName,
+            strict: false,
+        });
+
+        fs.rmSync(compressedFileName);
+
+        if (withVariables) {
+            const envFileLocation = `${func['path']}/.env`
+            try {
+                fs.rmSync(envFileLocation);
+            } catch {
             }
+
+            fs.writeFileSync(envFileLocation, func['vars'].map(r => `${r.key}=${r.value}\n`).join(''))
         }
     }