appwrite-cli 6.0.0-rc.6 → 6.0.0-rc.7

package/lib/commands/projects.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const projects = new Command("projects").description(commandDescriptions['projects']).configureHelp({
+const projects = new Command("projects").description(commandDescriptions['projects'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -74,7 +74,6 @@ const projectsList = async ({queries,search,parseOutput = true, overrideForCli =
             showConsoleLink('projects', 'list');
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -158,7 +157,6 @@ const projectsCreate = async ({projectId,name,teamId,region,description,logo,url
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -193,7 +191,6 @@ const projectsGet = async ({projectId,parseOutput = true, overrideForCli = false
             showConsoleLink('projects', 'get', projectId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -266,7 +263,6 @@ const projectsUpdate = async ({projectId,name,description,logo,url,legalName,leg
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -298,7 +294,6 @@ const projectsDelete = async ({projectId,parseOutput = true, overrideForCli = fa
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -338,7 +333,6 @@ const projectsUpdateApiStatus = async ({projectId,api,status,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -374,7 +368,6 @@ const projectsUpdateApiStatusAll = async ({projectId,status,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -410,7 +403,6 @@ const projectsUpdateAuthDuration = async ({projectId,duration,parseOutput = true
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -446,7 +438,6 @@ const projectsUpdateAuthLimit = async ({projectId,limit,parseOutput = true, over
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -482,7 +473,6 @@ const projectsUpdateAuthSessionsLimit = async ({projectId,limit,parseOutput = tr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -519,7 +509,6 @@ const projectsUpdateMockNumbers = async ({projectId,numbers,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -555,7 +544,6 @@ const projectsUpdateAuthPasswordDictionary = async ({projectId,enabled,parseOutp
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -591,7 +579,6 @@ const projectsUpdateAuthPasswordHistory = async ({projectId,limit,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -627,7 +614,6 @@ const projectsUpdatePersonalDataCheck = async ({projectId,enabled,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -663,7 +649,6 @@ const projectsUpdateSessionAlerts = async ({projectId,alerts,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -700,7 +685,6 @@ const projectsUpdateAuthStatus = async ({projectId,method,status,parseOutput = t
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -741,7 +725,6 @@ const projectsCreateJWT = async ({projectId,scopes,duration,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -776,7 +759,6 @@ const projectsListKeys = async ({projectId,parseOutput = true, overrideForCli =
             showConsoleLink('projects', 'listKeys', projectId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -822,7 +804,6 @@ const projectsCreateKey = async ({projectId,name,scopes,expire,parseOutput = tru
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -858,7 +839,6 @@ const projectsGetKey = async ({projectId,keyId,parseOutput = true, overrideForCl
             showConsoleLink('projects', 'getKey', projectId, keyId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -905,7 +885,6 @@ const projectsUpdateKey = async ({projectId,keyId,name,scopes,expire,parseOutput
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -938,7 +917,6 @@ const projectsDeleteKey = async ({projectId,keyId,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -986,7 +964,6 @@ const projectsUpdateOAuth2 = async ({projectId,provider,appId,secret,enabled,par
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1021,7 +998,6 @@ const projectsListPlatforms = async ({projectId,parseOutput = true, overrideForC
             showConsoleLink('projects', 'listPlatforms', projectId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -1074,7 +1050,6 @@ const projectsCreatePlatform = async ({projectId,type,name,key,store,hostname,pa
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1110,7 +1085,6 @@ const projectsGetPlatform = async ({projectId,platformId,parseOutput = true, ove
             showConsoleLink('projects', 'getPlatform', projectId, platformId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -1160,7 +1134,6 @@ const projectsUpdatePlatform = async ({projectId,platformId,name,key,store,hostn
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1193,7 +1166,6 @@ const projectsDeletePlatform = async ({projectId,platformId,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1233,7 +1205,6 @@ const projectsUpdateServiceStatus = async ({projectId,service,status,parseOutput
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1269,7 +1240,6 @@ const projectsUpdateServiceStatusAll = async ({projectId,status,parseOutput = tr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1337,7 +1307,6 @@ const projectsUpdateSmtp = async ({projectId,enabled,senderName,senderEmail,repl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1406,7 +1375,6 @@ const projectsCreateSmtpTest = async ({projectId,emails,senderName,senderEmail,h
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1442,7 +1410,6 @@ const projectsUpdateTeam = async ({projectId,teamId,parseOutput = true, override
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1476,7 +1443,6 @@ const projectsGetEmailTemplate = async ({projectId,type,locale,parseOutput = tru
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1530,7 +1496,6 @@ const projectsUpdateEmailTemplate = async ({projectId,type,locale,subject,messag
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1564,7 +1529,6 @@ const projectsDeleteEmailTemplate = async ({projectId,type,locale,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1598,7 +1562,6 @@ const projectsGetSmsTemplate = async ({projectId,type,locale,parseOutput = true,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1636,7 +1599,6 @@ const projectsUpdateSmsTemplate = async ({projectId,type,locale,message,parseOut
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1670,7 +1632,6 @@ const projectsDeleteSmsTemplate = async ({projectId,type,locale,parseOutput = tr
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1705,7 +1666,6 @@ const projectsListWebhooks = async ({projectId,parseOutput = true, overrideForCl
             showConsoleLink('projects', 'listWebhooks', projectId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -1767,7 +1727,6 @@ const projectsCreateWebhook = async ({projectId,name,events,url,security,enabled
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1803,7 +1762,6 @@ const projectsGetWebhook = async ({projectId,webhookId,parseOutput = true, overr
             showConsoleLink('projects', 'getWebhook', projectId, webhookId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -1866,7 +1824,6 @@ const projectsUpdateWebhook = async ({projectId,webhookId,name,events,url,securi
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1899,7 +1856,6 @@ const projectsDeleteWebhook = async ({projectId,webhookId,parseOutput = true, ov
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -1932,7 +1888,6 @@ const projectsUpdateWebhookSignature = async ({projectId,webhookId,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

package/lib/commands/proxy.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const proxy = new Command("proxy").description(commandDescriptions['proxy']).configureHelp({
+const proxy = new Command("proxy").description(commandDescriptions['proxy'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -71,7 +71,6 @@ const proxyListRules = async ({queries,search,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -114,7 +113,6 @@ const proxyCreateRule = async ({domain,resourceType,resourceId,parseOutput = tru
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -146,7 +144,6 @@ const proxyGetRule = async ({ruleId,parseOutput = true, overrideForCli = false,
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -178,7 +175,6 @@ const proxyDeleteRule = async ({ruleId,parseOutput = true, overrideForCli = fals
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -210,7 +206,6 @@ const proxyUpdateRuleVerification = async ({ruleId,parseOutput = true, overrideF
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

package/lib/commands/pull.js

@@ -6,7 +6,7 @@ const inquirer = require("inquirer");
 const { messagingListTopics } = require("./messaging");
 const { teamsList } = require("./teams");
 const { projectsGet } = require("./projects");
-const { functionsList, functionsDownloadDeployment } = require("./functions");
+const { functionsList, functionsGetDeploymentDownload, functionsListDeployments } = require("./functions");
 const { databasesGet, databasesListCollections, databasesList } = require("./databases");
 const { storageListBuckets } = require("./storage");
 const { localConfig } = require("../config");
@@ -56,7 +56,7 @@ const pullSettings = async () => {
     }
 }
 
-const pullFunctions = async ({ code }) => {
+const pullFunctions = async ({ code, withVariables }) => {
     log("Fetching functions ...");
     let total = 0;
 
@@ -83,47 +83,84 @@ const pullFunctions = async ({ code }) => {
         const localFunction = localConfig.getFunction(func.$id);
 
         func['path'] = localFunction['path'];
-        if(!localFunction['path']) {
+        if (!localFunction['path']) {
             func['path'] = `functions/${func.$id}`;
         }
-
+        if (!withVariables) {
+            delete func['vars'];
+        }
         localConfig.addFunction(func);
 
         if (!fs.existsSync(func['path'])) {
             fs.mkdirSync(func['path'], { recursive: true });
         }
 
-        if(code === false) {
+        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 ...");
-
-                const compressedFileName = `${func['$id']}-${+new Date()}.tar.gz`
-                await functionsDownloadDeployment({
-                    functionId: func['$id'],
-                    deploymentId: func['deployment'],
-                    destination: compressedFileName,
-                    overrideForCli: true,
-                    parseOutput: false
-                });
-
-                tar.extract({
-                    sync: true,
-                    cwd: func['path'],
-                    file: compressedFileName,
-                    strict: false,
-                });
-
-                fs.rmSync(compressedFileName);
+        } 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 functionsGetDeploymentDownload({
+            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(''))
         }
     }
 
@@ -170,7 +207,7 @@ const pullCollection = async () => {
             parseOutput: false
         }, 100, 'collections');
 
-        for(const collection of collections) {
+        for (const collection of collections) {
             localConfig.addCollection({
                 ...collection,
                 '$createdAt': undefined,
@@ -198,7 +235,7 @@ const pullBucket = async () => {
 
     const { buckets } = await paginate(storageListBuckets, { parseOutput: false }, 100, 'buckets');
 
-    for(const bucket of buckets) {
+    for (const bucket of buckets) {
         total++;
         log(`Pulling bucket ${chalk.bold(bucket['name'])} ...`);
         localConfig.addBucket(bucket);
@@ -223,7 +260,7 @@ const pullTeam = async () => {
 
     const { teams } = await paginate(teamsList, { parseOutput: false }, 100, 'teams');
 
-    for(const team of teams) {
+    for (const team of teams) {
         total++;
         log(`Pulling team ${chalk.bold(team['name'])} ...`);
         localConfig.addTeam(team);
@@ -248,7 +285,7 @@ const pullMessagingTopic = async () => {
 
     const { topics } = await paginate(messagingListTopics, { parseOutput: false }, 100, 'topics');
 
-    for(const topic of topics) {
+    for (const topic of topics) {
         total++;
         log(`Pulling topic ${chalk.bold(topic['name'])} ...`);
         localConfig.addMessagingTopic(topic);
@@ -279,6 +316,7 @@ pull
     .alias("functions")
     .description("Pulling your Appwrite cloud function")
     .option("--no-code", "Don't pull the function's code")
+    .option("--with-variables", `Pull function variables. ${chalk.red('recommend for testing purposes only')}`)
     .action(actionRunner(pullFunctions))
 
 pull