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

package/lib/commands/push.js

@@ -2,10 +2,10 @@ const chalk = require('chalk');
 const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
-const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, } = require("../config");
+const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, KeysCollection } = require("../config");
 const { Spinner, SPINNER_ARC, SPINNER_DOTS } = require('../spinner');
 const { paginate } = require('../paginate');
-const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
+const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, questionPushChangesConfirmation, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
 const { cliConfig, actionRunner, success, warn, log, hint, error, commandDescriptions, drawTable } = require("../parser");
 const { proxyListRules } = require('./proxy');
 const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsGetDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
@@ -340,18 +340,62 @@ const awaitPools = {
     },
 }
 
-const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural) => {
+const getConfirmation = async () => {
+    if (cliConfig.force) {
+        return true;
+    }
+
+    async function fixConfirmation() {
+        const answers = await inquirer.prompt(questionPushChangesConfirmation);
+        if (answers.changes !== 'YES' && answers.changes !== 'NO') {
+            return await fixConfirmation();
+        }
+
+        return answers.changes;
+    }
+
+    let answers = await inquirer.prompt(questionPushChanges);
+
+    if (answers.changes !== 'YES' && answers.changes !== 'NO') {
+        answers.changes = await fixConfirmation();
+    }
+
+    if (answers.changes === 'YES') {
+        return true;
+    }
+
+    warn('Skipping push action. Changes were not applied.');
+    return false;
+
+};
+const isEmpty = (value) => (value === null || value === undefined || (typeof value === "string" && value.trim().length === 0) || (Array.isArray(value) && value.length === 0));
+
+const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural, skipKeys = [], secondId = '', secondResourceName = '') => {
     log('Checking for changes ...');
     const changes = [];
 
     await Promise.all(resource.map(async (localResource) => {
         try {
-            const remoteResource = await resourceGetFunction({
+            const options = {
                 [resourceName]: localResource['$id'],
                 parseOutput: false,
-            });
+            };
+
+            if (secondId !== '' && secondResourceName !== '') {
+                options[secondResourceName] = localResource[secondId]
+            }
+
+            const remoteResource = await resourceGetFunction(options);
 
             for (let [key, value] of Object.entries(whitelistKeys(remoteResource, keys))) {
+                if (skipKeys.includes(key)) {
+                    continue;
+                }
+
+                if (isEmpty(value) && isEmpty(localResource[key])) {
+                    continue;
+                }
+
                 if (Array.isArray(value) && Array.isArray(localResource[key])) {
                     if (JSON.stringify(value) !== JSON.stringify(localResource[key])) {
                         changes.push({
@@ -382,11 +426,8 @@ const approveChanges = async (resource, resourceGetFunction, keys, resourceName,
     }
 
     drawTable(changes);
-    if (!cliConfig.force) {
-        const answers = await inquirer.prompt(questionPushChanges);
-        if (answers.changes.toLowerCase() === 'yes') {
-            return true;
-        }
+    if ((await getConfirmation()) === true) {
+        return true;
     }
 
     success(`Successfully pushed 0 ${resourcePlural}.`);
@@ -399,7 +440,7 @@ const getObjectChanges = (remote, local, index, what) => {
     if (remote[index] && local[index]) {
         for (let [service, status] of Object.entries(remote[index])) {
             if (status !== local[index][service]) {
-                changes.push({ group: what,setting: service, remote: chalk.red(status), local: chalk.green(local[index][service]) })
+                changes.push({ group: what, setting: service, remote: chalk.red(status), local: chalk.green(local[index][service]) })
             }
         }
     }
@@ -661,6 +702,24 @@ const deleteAttribute = async (collection, attribute, isIndex = false) => {
     });
 }
 
+const compareAttribute = (remote, local, reason, key) => {
+    if (isEmpty(remote) && isEmpty(local)) {
+        return reason;
+    }
+
+    if (Array.isArray(remote) && Array.isArray(local)) {
+        if (JSON.stringify(remote) !== JSON.stringify(local)) {
+            const bol = reason === '' ? '' : '\n';
+            reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
+        }
+    } else if (remote !== local) {
+        const bol = reason === '' ? '' : '\n';
+        reason += `${bol}${key} changed from ${chalk.red(remote)} to ${chalk.green(local)}`;
+    }
+
+    return reason
+}
+
 
 /**
  * Check if attribute non-changeable fields has been changed
@@ -688,11 +747,7 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
 
         if (changeableKeys.includes(key)) {
             if (!recraeting) {
-                if (remote[key] !== local[key]) {
-                    const bol = reason === '' ? '' : '\n';
-                    reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-                    attribute = local;
-                }
+                reason += compareAttribute(remote[key], local[key], reason, key)
             }
             continue;
         }
@@ -701,15 +756,7 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
             continue;
         }
 
-        if (Array.isArray(remote[key]) && Array.isArray(local[key])) {
-            if (JSON.stringify(remote[key]) !== JSON.stringify(local[key])) {
-                const bol = reason === '' ? '' : '\n';
-                reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-            }
-        } else if (remote[key] !== local[key]) {
-            const bol = reason === '' ? '' : '\n';
-            reason += `${bol}${key} changed from ${chalk.red(remote[key])} to ${chalk.green(local[key])}`;
-        }
+        reason += compareAttribute(remote[key], local[key], reason, key)
     }
 
     return reason === '' ? undefined : { key: keyName, attribute, reason, action };
@@ -766,9 +813,7 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection,
             log(`Attribute recreation will cause ${chalk.red('loss of data')}`);
         }
 
-        const answers = await inquirer.prompt(questionPushChanges);
-
-        if (answers.changes.toLowerCase() !== 'yes') {
+        if ((await getConfirmation()) !== true) {
             return changedAttributes;
         }
     }
@@ -890,12 +935,9 @@ const pushSettings = async () => {
 
         if (changes.length > 0) {
             drawTable(changes);
-            if (!cliConfig.force) {
-                const answers = await inquirer.prompt(questionPushChanges);
-                if (answers.changes.toLowerCase() !== 'yes') {
-                    success(`Successfully pushed 0 project settings.`);
-                    return;
-                }
+            if ((await getConfirmation()) !== true) {
+                success(`Successfully pushed 0 project settings.`);
+                return;
             }
         }
     } catch (e) {
@@ -960,7 +1002,9 @@ const pushSettings = async () => {
     }
 }
 
-const pushFunction = async ({ functionId, async, code } = { returnOnZero: false }) => {
+const pushFunction = async ({ functionId, async, code, withVariables } = { returnOnZero: false }) => {
+    process.chdir(localConfig.configDirectoryPath)
+
     const functionIds = [];
 
     if (functionId) {
@@ -1009,7 +1053,7 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
         }
     }
 
-    if (!(await approveChanges(functions, functionsGet, KeysFunction, 'functionId', 'functions'))) {
+    if (!(await approveChanges(functions, functionsGet, KeysFunction, 'functionId', 'functions', ['vars']))) {
         return;
     }
 
@@ -1019,6 +1063,7 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
     let successfullyPushed = 0;
     let successfullyDeployed = 0;
     const failedDeployments = [];
+    const errors = [];
 
     await Promise.all(functions.map(async (func) => {
         let response = {};
@@ -1055,11 +1100,6 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
                 entrypoint: func.entrypoint,
                 commands: func.commands,
                 scopes: func.scopes,
-                providerRepositoryId: func.providerRepositoryId ?? "",
-                installationId: func.installationId ?? '',
-                providerBranch: func.providerBranch ?? '',
-                providerRootDirectory: func.providerRootDirectory ?? '',
-                providerSilentMode: func.providerSilentMode ?? false,
                 vars: JSON.stringify(response.vars),
                 parseOutput: false
             });
@@ -1068,6 +1108,7 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
             if (Number(e.code) === 404) {
                 functionExists = false;
             } else {
+                errors.push(e);
                 updaterRow.fail({ errorMessage: e.message ?? 'General error occurs please try again' });
                 return;
             }
@@ -1095,11 +1136,45 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
 
                 updaterRow.update({ status: 'Created' });
             } catch (e) {
+                errors.push(e)
                 updaterRow.fail({ errorMessage: e.message ?? 'General error occurs please try again' });
                 return;
             }
         }
 
+        if (withVariables) {
+            updaterRow.update({ status: 'Updating variables' }).replaceSpinner(SPINNER_ARC);
+
+            const { variables } = await paginate(functionsListVariables, {
+                functionId: func['$id'],
+                parseOutput: false
+            }, 100, 'variables');
+
+            await Promise.all(variables.map(async variable => {
+                await functionsDeleteVariable({
+                    functionId: func['$id'],
+                    variableId: variable['$id'],
+                    parseOutput: false
+                });
+            }));
+
+            let result = await awaitPools.wipeVariables(func['$id']);
+            if (!result) {
+                updaterRow.fail({ errorMessage: `Variable deletion timed out.` })
+                return;
+            }
+
+            // Deploy local variables
+            await Promise.all((func['vars'] ?? []).map(async variable => {
+                await functionsCreateVariable({
+                    functionId: func['$id'],
+                    key: variable['key'],
+                    value: variable['value'],
+                    parseOutput: false
+                });
+            }));
+        }
+
         if (code === false) {
             successfullyPushed++;
             successfullyDeployed++;
@@ -1123,6 +1198,8 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
             deploymentCreated = true;
             successfullyPushed++;
         } catch (e) {
+            errors.push(e);
+
             switch (e.code) {
                 case 'ENOENT':
                     updaterRow.fail({ errorMessage: 'Not found in the current directory. Skipping...' })
@@ -1180,6 +1257,7 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
                     await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE * 1.5));
                 }
             } catch (e) {
+                errors.push(e);
                 updaterRow.fail({ errorMessage: e.message ?? 'Unknown error occurred. Please try again' })
             }
         }
@@ -1207,6 +1285,12 @@ const pushFunction = async ({ functionId, async, code } = { returnOnZero: false
     } else {
         success(`Successfully pushed ${successfullyPushed} functions.`);
     }
+
+    if (cliConfig.verbose) {
+        errors.forEach(e => {
+            console.error(e);
+        })
+    }
 }
 
 const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false }) => {
@@ -1241,8 +1325,6 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
 
     const databases = Array.from(new Set(collections.map(collection => collection['databaseId'])));
 
-    log('Checking for changes ...');
-
     // Parallel db actions
     await Promise.all(databases.map(async (databaseId) => {
         const localDatabase = localConfig.getDatabase(databaseId);
@@ -1273,6 +1355,10 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
         }
     }));
 
+
+    if (!(await approveChanges(collections, databasesGetCollection, KeysCollection, 'collectionId', 'collections', ['attributes', 'indexes'], 'databaseId', 'databaseId',))) {
+        return;
+    }
     // Parallel collection actions
     await Promise.all(collections.map(async (collection) => {
         try {
@@ -1343,10 +1429,10 @@ const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false
             throw e;
         }
         numberOfCollections++;
-        success(`Pushed ${collection.name} ( ${collection['$id']} )`);
+        success(`Successfully pushed ${collection.name} ( ${collection['$id']} )`);
     }
 
-    success(`Pushed ${numberOfCollections} collections`);
+    success(`Successfully pushed ${numberOfCollections} collections`);
 }
 
 const pushBucket = async ({ returnOnZero } = { returnOnZero: false }) => {
@@ -1509,7 +1595,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
 
     let topicsIds = [];
     const configTopics = localConfig.getMessagingTopics();
-    let overrideExisting = cliConfig.force;
 
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
@@ -1536,13 +1621,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
         topics.push(...idTopic);
     }
 
-    if (!cliConfig.force) {
-        const answers = await inquirer.prompt(questionsPushMessagingTopics[1])
-        if (answers.override.toLowerCase() === "yes") {
-            overrideExisting = true;
-        }
-    }
-
     if (!(await approveChanges(topics, messagingGetTopic, KeysTopics, 'topicId', 'topics'))) {
         return;
     }
@@ -1559,11 +1637,6 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
             })
             log(`Topic ${topic.name} ( ${topic['$id']} ) already exists.`);
 
-            if (!overrideExisting) {
-                log(`Skipping ${topic.name} ( ${topic['$id']} )`);
-                continue;
-            }
-
             await messagingUpdateTopic({
                 topicId: topic['$id'],
                 name: topic.name,
@@ -1615,6 +1688,7 @@ push
     .option(`-f, --function-id <function-id>`, `ID of function to run`)
     .option(`-A, --async`, `Don't wait for functions deployments status`)
     .option("--no-code", "Don't push the function's code")
+    .option("--with-variables", `Push function variables.`)
     .action(actionRunner(pushFunction));
 
 push
@@ -1643,9 +1717,9 @@ push
     .action(actionRunner(pushMessagingTopic));
 
 const deploy = new Command("deploy")
-    .description(commandDescriptions['push'])
+    .description('Removed. Use appwrite push instead')
     .action(actionRunner(async () => {
-        warn("Did you mean to run 'appwrite push' command?");
+        warn("appwrite deploy has been removed. Please use 'appwrite push' instead");
     }));
 
 module.exports = {

package/lib/commands/run.js

@@ -17,9 +17,7 @@ const { systemHasCommand, isPortTaken, getAllFiles } = require('../utils');
 const { runtimeNames, systemTools, JwtManager, Queue } = require('../emulation/utils');
 const { dockerStop, dockerCleanup, dockerStart, dockerBuild, dockerPull } = require('../emulation/docker');
 
-const runFunction = async ({ port, functionId, variables, reload, userId } = {}) => {
-    console.log(variables);
-    console.log(reload);
+const runFunction = async ({ port, functionId, withVariables, reload, userId } = {}) => {
     // Selection
     if(!functionId) {
         const answers = await inquirer.prompt(questionsRunFunctions[0]);
@@ -117,7 +115,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
     const userVariables = {};
     const allVariables = {};
 
-    if(variables) {
+    if(withVariables) {
         try {
             const { variables: remoteVariables } = await paginate(functionsListVariables, {
                 functionId: func['$id'],
@@ -129,7 +127,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
                 userVariables[v.key] = v.value;
             });
         } catch(err) {
-            warn("Remote variables not fetched. Production environment variables will not be avaiable. Reason: " + err.message);
+            warn("Remote variables not fetched. Production environment variables will not be available. Reason: " + err.message);
         }
     }
 
@@ -186,7 +184,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
         const ignorer = ignore();
         ignorer.add('.appwrite');
         ignorer.add('code.tar.gz');
-    
+
         if (func.ignore) {
             ignorer.add(func.ignore);
         } else if (fs.existsSync(path.join(functionPath, '.gitignore'))) {
@@ -218,14 +216,14 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
             const dependencyFile = files.find((filePath) => tool.dependencyFiles.includes(filePath));
             if(tool.isCompiled || dependencyFile) {
                 log(`Rebuilding the function due to file changes ...`);
-                await dockerBuild(func, variables);
+                await dockerBuild(func, allVariables);
 
                 if(!Queue.isEmpty()) {
                     Queue.unlock();
                     return;
                 }
 
-                await dockerStart(func, variables, port);
+                await dockerStart(func, allVariables, port);
             } else {
                 log('Hot-swapping function.. Files with change are ' + files.join(', '));
 
@@ -281,7 +279,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
                         file: buildPath
                     }, ['.']);
 
-                await dockerStart(func, variables, port);
+                await dockerStart(func, allVariables, port);
             }
         } catch(err) {
             console.error(err);
@@ -293,7 +291,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
     Queue.lock();
 
     log('Building function using Docker ...');
-    await dockerBuild(func, variables);
+    await dockerBuild(func, allVariables);
 
     if(!Queue.isEmpty()) {
         Queue.unlock();
@@ -302,7 +300,7 @@ const runFunction = async ({ port, functionId, variables, reload, userId } = {})
 
     log('Starting function using Docker ...');
     hint('Function automatically restarts when you edit your code.');
-    await dockerStart(func, variables, port);
+    await dockerStart(func, allVariables, port);
 
     Queue.unlock();
 }
@@ -323,7 +321,7 @@ run
     .option(`--function-id <function-id>`, `ID of function to run`)
     .option(`--port <port>`, `Local port`)
     .option(`--user-id <user-id>`, `ID of user to impersonate`)
-    .option(`--no-variables`, `Prevent pulling variables from function settings`)
+    .option(`--with-variables`, `Run with function variables from function settings`)
     .option(`--no-reload`, `Prevent live reloading of server when changes are made to function files`)
     .action(actionRunner(runFunction));
 

package/lib/commands/storage.js

@@ -35,7 +35,7 @@ function convertReadStreamToReadableStream(readStream) {
   });
 }
 
-const storage = new Command("storage").description(commandDescriptions['storage']).configureHelp({
+const storage = new Command("storage").description(commandDescriptions['storage'] ?? '').configureHelp({
     helpWidth: process.stdout.columns || 80
 })
 
@@ -74,7 +74,6 @@ const storageListBuckets = async ({queries,search,parseOutput = true, overrideFo
             showConsoleLink('storage', 'listBuckets');
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -148,7 +147,6 @@ const storageCreateBucket = async ({bucketId,name,permissions,fileSecurity,enabl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -183,7 +181,6 @@ const storageGetBucket = async ({bucketId,parseOutput = true, overrideForCli = f
             showConsoleLink('storage', 'getBucket', bucketId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -254,7 +251,6 @@ const storageUpdateBucket = async ({bucketId,name,permissions,fileSecurity,enabl
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -286,7 +282,6 @@ const storageDeleteBucket = async ({bucketId,parseOutput = true, overrideForCli
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -329,7 +324,6 @@ const storageListFiles = async ({bucketId,queries,search,parseOutput = true, ove
             showConsoleLink('storage', 'listFiles', bucketId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -465,7 +459,6 @@ const storageCreateFile = async ({bucketId,fileId,file,permissions,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -500,7 +493,6 @@ const storageGetFile = async ({bucketId,fileId,parseOutput = true, overrideForCl
             showConsoleLink('storage', 'getFile', bucketId, fileId);
          } else {
             parse(response)
-            success()
         }
     }
 
@@ -543,7 +535,6 @@ const storageUpdateFile = async ({bucketId,fileId,name,permissions,parseOutput =
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -576,7 +567,6 @@ const storageDeleteFile = async ({bucketId,fileId,parseOutput = true, overrideFo
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -621,7 +611,6 @@ const storageGetFileDownload = async ({bucketId,fileId,parseOutput = true, overr
     fs.writeFileSync(destination, response);
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -710,7 +699,6 @@ const storageGetFilePreview = async ({bucketId,fileId,width,height,gravity,quali
     fs.writeFileSync(destination, response);
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -755,7 +743,6 @@ const storageGetFileView = async ({bucketId,fileId,parseOutput = true, overrideF
     fs.writeFileSync(destination, response);
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -790,7 +777,6 @@ const storageGetUsage = async ({range,parseOutput = true, overrideForCli = false
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;
@@ -829,7 +815,6 @@ const storageGetBucketUsage = async ({bucketId,range,parseOutput = true, overrid
             showConsoleLink('storage', 'getBucketUsage', bucketId);
          } else {
             parse(response)
-            success()
         }
     }