appwrite-cli 6.0.0-rc.4 → 6.0.0-rc.5

package/lib/commands/push.js

@@ -2,13 +2,13 @@ const chalk = require('chalk');
 const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
-const { localConfig, globalConfig } = require("../config");
+const { localConfig, globalConfig, KeysAttributes, KeysFunction, whitelistKeys, KeysTopics, KeysStorage, KeysTeams, } = require("../config");
 const { Spinner, SPINNER_ARC, SPINNER_DOTS } = require('../spinner');
 const { paginate } = require('../paginate');
-const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionsConfirmPushCollections, questionsPushMessagingTopics, questionsPushResources } = require("../questions");
-const { cliConfig, actionRunner, success, warn, log, error, commandDescriptions, drawTable } = require("../parser");
+const { questionsPushBuckets, questionsPushTeams, questionsPushFunctions, questionsGetEntrypoint, questionsPushCollections, questionPushChanges, 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, functionsUpdateDeployment, functionsGetDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
+const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsGetDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
 const {
     databasesGet,
     databasesCreate,
@@ -37,6 +37,7 @@ const {
     databasesUpdateRelationshipAttribute,
     databasesCreateRelationshipAttribute,
     databasesDeleteAttribute,
+    databasesDeleteIndex,
     databasesListAttributes,
     databasesListIndexes,
     databasesUpdateCollection
@@ -53,6 +54,7 @@ const {
     teamsCreate
 } = require("./teams");
 const {
+    projectsGet,
     projectsUpdate,
     projectsUpdateServiceStatus,
     projectsUpdateAuthStatus,
@@ -68,8 +70,9 @@ const { checkDeployConditions } = require('../utils');
 const STEP_SIZE = 100;      // Resources
 const POLL_DEBOUNCE = 2000; // Milliseconds
 const POLL_MAX_DEBOUNCE = 1800; // Times of POLL_DEBOUNCE (1 hour)
+const POLL_DEFAULT_VALUE = 30;
 
-let pollMaxDebounces = 30;
+let pollMaxDebounces = POLL_DEFAULT_VALUE;
 
 const changeableKeys = ['status', 'required', 'xdefault', 'elements', 'min', 'max', 'default', 'error'];
 
@@ -90,11 +93,13 @@ const awaitPools = {
             return true;
         }
 
-        let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Found a large number of attributes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Found a large number of attributes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
@@ -121,11 +126,13 @@ const awaitPools = {
             return true;
         }
 
-        let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Found a large number of indexes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Found a large number of indexes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
@@ -151,11 +158,13 @@ const awaitPools = {
             return true;
         }
 
-        let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(total / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Found a large number of variables, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Found a large number of variables, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
@@ -170,11 +179,13 @@ const awaitPools = {
             return false;
         }
 
-        let steps = Math.max(1, Math.ceil(attributeKeys.length / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(attributeKeys.length / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Found a large number of attributes to be deleted. Increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Found a large number of attributes to be deleted. Increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         const { attributes } = await paginate(databasesListAttributes, {
@@ -203,11 +214,13 @@ const awaitPools = {
             return false;
         }
 
-        let steps = Math.max(1, Math.ceil(attributeKeys.length / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(attributeKeys.length / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Creating a large number of attributes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Creating a large number of attributes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         const { attributes } = await paginate(databasesListAttributes, {
@@ -243,16 +256,53 @@ const awaitPools = {
             iteration + 1
         );
     },
+    deleteIndexes: async (databaseId, collectionId, indexesKeys, iteration = 1) => {
+        if (iteration > pollMaxDebounces) {
+            return false;
+        }
+
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(attributeKeys.length / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
+
+                log('Found a large number of indexes to be deleted. Increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
+        }
+
+        const { indexes } = await paginate(databasesListIndexes, {
+            databaseId,
+            collectionId,
+            parseOutput: false
+        }, 100, 'indexes');
+
+        const ready = indexesKeys.filter(index => indexes.includes(index.key));
+
+        if (ready.length === 0) {
+            return true;
+        }
+
+        await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
+
+        return await awaitPools.expectIndexes(
+            databaseId,
+            collectionId,
+            indexesKeys,
+            iteration + 1
+        );
+    },
     expectIndexes: async (databaseId, collectionId, indexKeys, iteration = 1) => {
         if (iteration > pollMaxDebounces) {
             return false;
         }
 
-        let steps = Math.max(1, Math.ceil(indexKeys.length / STEP_SIZE));
-        if (steps > 1 && iteration === 1) {
-            pollMaxDebounces *= steps;
+        if (pollMaxDebounces === POLL_DEFAULT_VALUE) {
+            let steps = Math.max(1, Math.ceil(indexKeys.length / STEP_SIZE));
+            if (steps > 1 && iteration === 1) {
+                pollMaxDebounces *= steps;
 
-            log('Creating a large number of indexes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+                log('Creating a large number of indexes, increasing timeout to ' + (pollMaxDebounces * POLL_DEBOUNCE / 1000 / 60) + ' minutes')
+            }
         }
 
         const { indexes } = await paginate(databasesListIndexes, {
@@ -290,6 +340,73 @@ const awaitPools = {
     },
 }
 
+const approveChanges = async (resource, resourceGetFunction, keys, resourceName, resourcePlural) => {
+    log('Checking for changes');
+    const changes = [];
+
+    await Promise.all(resource.map(async (localResource) => {
+        try {
+            const remoteResource = await resourceGetFunction({
+                [resourceName]: localResource['$id'],
+                parseOutput: false,
+            });
+
+            for (let [key, value] of Object.entries(whitelistKeys(remoteResource, keys))) {
+                if (Array.isArray(value) && Array.isArray(localResource[key])) {
+                    if (JSON.stringify(value) !== JSON.stringify(localResource[key])) {
+                        changes.push({
+                            id: localResource['$id'],
+                            key,
+                            remote: chalk.red(value.join('\n')),
+                            local: chalk.green(localResource[key].join('\n'))
+                        })
+                    }
+                } else if (value !== localResource[key]) {
+                    changes.push({
+                        id: localResource['$id'],
+                        key,
+                        remote: chalk.red(value),
+                        local: chalk.green(localResource[key])
+                    })
+                }
+            }
+        } catch (e) {
+            if (Number(e.code) !== 404) {
+                throw e;
+            }
+        }
+    }));
+
+    if (changes.length === 0) {
+        return true;
+    }
+
+    drawTable(changes);
+    if (!cliConfig.force) {
+        const answers = await inquirer.prompt(questionPushChanges);
+        if (answers.changes.toLowerCase() === 'yes') {
+            return true;
+        }
+    }
+
+    success(`Successfully pushed 0 ${resourcePlural}.`);
+    return false;
+}
+
+const getObjectChanges = (remote, local, index, what) => {
+    const changes = [];
+
+    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]) })
+            }
+        }
+    }
+
+    return changes;
+}
+
 const createAttribute = async (databaseId, collectionId, attribute) => {
     switch (attribute.type) {
         case 'string':
@@ -523,8 +640,18 @@ const updateAttribute = async (databaseId, collectionId, attribute) => {
             })
     }
 }
-const deleteAttribute = async (collection, attribute) => {
-    log(`Deleting attribute ${attribute.key} of ${collection.name} ( ${collection['$id']} )`);
+const deleteAttribute = async (collection, attribute, isIndex = false) => {
+    log(`Deleting ${isIndex ? 'index' : 'attribute'} ${attribute.key} of ${collection.name} ( ${collection['$id']} )`);
+
+    if (isIndex) {
+        await databasesDeleteIndex({
+            databaseId: collection['databaseId'],
+            collectionId: collection['$id'],
+            key: attribute.key,
+            parseOutput: false
+        });
+        return;
+    }
 
     await databasesDeleteAttribute({
         databaseId: collection['databaseId'],
@@ -555,6 +682,10 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
     let attribute = remote;
 
     for (let key of Object.keys(remote)) {
+        if (!KeysAttributes.has(key)) {
+            continue;
+        }
+
         if (changeableKeys.includes(key)) {
             if (!recraeting) {
                 if (remote[key] !== local[key]) {
@@ -570,7 +701,12 @@ const checkAttributeChanges = (remote, local, collection, recraeting = true) =>
             continue;
         }
 
-        if (remote[key] !== local[key]) {
+        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])}`;
         }
@@ -590,7 +726,7 @@ const generateChangesObject = (attribute, collection, isAdding) => {
     return {
         key: `${chalk.yellow(attribute.key)} in ${collection.name} (${collection['$id']})`,
         attribute: attribute,
-        reason: isAdding ? 'Field doesn\'t exist on the remote server' : 'Field doesn\'t exist in appwrite.json file',
+        reason: isAdding ? 'Field isn\'t present on the remote server' : 'Field isn\'t present on the appwrite.json file',
         action: isAdding ? chalk.green('adding') : chalk.red('deleting')
     };
 
@@ -599,12 +735,9 @@ const generateChangesObject = (attribute, collection, isAdding) => {
 /**
  * Filter deleted and recreated attributes,
  * return list of attributes to create
- * @param remoteAttributes
- * @param localAttributes
- * @param collection
  * @returns {Promise<*|*[]>}
  */
-const attributesToCreate = async (remoteAttributes, localAttributes, collection) => {
+const attributesToCreate = async (remoteAttributes, localAttributes, collection, isIndex = false) => {
 
     const deleting = remoteAttributes.filter((attribute) => !attributesContains(attribute, localAttributes)).map((attr) => generateChangesObject(attr, collection, false));
     const adding = localAttributes.filter((attribute) => !attributesContains(attribute, remoteAttributes)).map((attr) => generateChangesObject(attr, collection, true));
@@ -626,14 +759,14 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection)
     }));
 
     if (!cliConfig.force) {
-        if (deleting.length > 0) {
+        if (deleting.length > 0 && !isIndex) {
             log(`Attribute deletion will cause ${chalk.red('loss of data')}`);
         }
-        if (conflicts.length > 0) {
+        if (conflicts.length > 0 && !isIndex) {
             log(`Attribute recreation will cause ${chalk.red('loss of data')}`);
         }
 
-        const answers = await inquirer.prompt(questionsPushCollections[1]);
+        const answers = await inquirer.prompt(questionPushChanges);
 
         if (answers.changes.toLowerCase() !== 'yes') {
             return changedAttributes;
@@ -642,17 +775,17 @@ const attributesToCreate = async (remoteAttributes, localAttributes, collection)
 
     if (conflicts.length > 0) {
         changedAttributes = conflicts.map((change) => change.attribute);
-        await Promise.all(changedAttributes.map((changed) => deleteAttribute(collection, changed)));
+        await Promise.all(changedAttributes.map((changed) => deleteAttribute(collection, changed, isIndex)));
         remoteAttributes = remoteAttributes.filter((attribute) => !attributesContains(attribute, changedAttributes))
     }
 
     if (changes.length > 0) {
         changedAttributes = changes.map((change) => change.attribute);
-        await Promise.all(changedAttributes.map((changed) => updateAttribute(collection['databaseId'],collection['$id'], changed)));
+        await Promise.all(changedAttributes.map((changed) => updateAttribute(collection['databaseId'], collection['$id'], changed)));
     }
 
     const deletingAttributes = deleting.map((change) => change.attribute);
-    await Promise.all(deletingAttributes.map((attribute) => deleteAttribute(collection, attribute)));
+    await Promise.all(deletingAttributes.map((attribute) => deleteAttribute(collection, attribute, isIndex)));
     const attributeKeys = [...remoteAttributes.map(attribute => attribute.key), ...deletingAttributes.map(attribute => attribute.key)]
 
     if (attributeKeys.length) {
@@ -737,6 +870,37 @@ const pushResources = async () => {
 };
 
 const pushSettings = async () => {
+    checkDeployConditions(localConfig);
+
+    try {
+        let response = await projectsGet({
+            parseOutput: false,
+            projectId: localConfig.getProject().projectId
+        });
+
+        const remoteSettings = localConfig.createSettingsObject(response ?? {});
+        const localSettings = localConfig.getProject().projectSettings ?? {};
+
+        log('Checking for changes');
+        const changes = [];
+
+        changes.push(...(getObjectChanges(remoteSettings, localSettings, 'services', 'Service')));
+        changes.push(...(getObjectChanges(remoteSettings['auth'] ?? {}, localSettings['auth'] ?? {}, 'methods', 'Auth method')));
+        changes.push(...(getObjectChanges(remoteSettings['auth'] ?? {}, localSettings['auth'] ?? {}, 'security', 'Auth security')));
+
+        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;
+                }
+            }
+        }
+    } catch (e) {
+    }
+
     try {
         log("Pushing project settings ...");
 
@@ -796,9 +960,7 @@ const pushSettings = async () => {
     }
 }
 
-const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero: false }) => {
-    let response = {};
-
+const pushFunction = async ({ functionId, async, code } = { returnOnZero: false }) => {
     const functionIds = [];
 
     if (functionId) {
@@ -806,11 +968,6 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
     } else if (cliConfig.all) {
         checkDeployConditions(localConfig);
         const functions = localConfig.getFunctions();
-        if (functions.length === 0) {
-            log("No functions found.");
-            hint("Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
-            return;
-        }
         functionIds.push(...functions.map((func) => {
             return func.$id;
         }));
@@ -818,7 +975,15 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
 
     if (functionIds.length <= 0) {
         const answers = await inquirer.prompt(questionsPushFunctions[0]);
-        functionIds.push(...answers.functions);
+        if (answers.functions) {
+            functionIds.push(...answers.functions);
+        }
+    }
+
+    if (functionIds.length === 0) {
+        log("No functions found.");
+        hint("Use 'appwrite pull functions' to synchronize existing one, or use 'appwrite init function' to create a new one.");
+        return;
     }
 
     let functions = functionIds.map((id) => {
@@ -844,6 +1009,10 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
         }
     }
 
+    if (!(await approveChanges(functions, functionsGet, KeysFunction, 'functionId', 'functions'))) {
+        return;
+    }
+
     log('Pushing functions ...');
 
     Spinner.start(false);
@@ -852,6 +1021,8 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
     const failedDeployments = [];
 
     await Promise.all(functions.map(async (func) => {
+        let response = {};
+
         const ignore = func.ignore ? 'appwrite.json' : '.gitignore';
         let functionExists = false;
         let deploymentCreated = false;
@@ -859,7 +1030,6 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
         const updaterRow = new Spinner({ status: '', resource: func.name, id: func['$id'], end: `Ignoring using: ${ignore}` });
 
         updaterRow.update({ status: 'Getting' }).startSpinner(SPINNER_DOTS);
-
         try {
             response = await functionsGet({
                 functionId: func['$id'],
@@ -930,6 +1100,14 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
             }
         }
 
+        if (code === false) {
+            successfullyPushed++;
+            successfullyDeployed++;
+            updaterRow.update({ status: 'Pushed' });
+            updaterRow.stopSpinner();
+            return;
+        }
+
         try {
             updaterRow.update({ status: 'Pushing' }).replaceSpinner(SPINNER_ARC);
             response = await functionsCreateDeployment({
@@ -961,11 +1139,6 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
                 let pollChecks = 0;
 
                 while (true) {
-                    if (pollChecks >= POLL_MAX_DEBOUNCE) {
-                        updaterRow.update({ end: 'Deployment is taking too long. Please check the console for more details.' })
-                        break;
-                    }
-
                     response = await functionsGetDeployment({
                         functionId: func['$id'],
                         deploymentId: deploymentId,
@@ -1004,7 +1177,7 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
                     }
 
                     pollChecks++;
-                    await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
+                    await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE * 1.5));
                 }
             } catch (e) {
                 updaterRow.fail({ errorMessage: e.message ?? 'Unknown error occurred. Please try again' })
@@ -1018,15 +1191,15 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
 
     failedDeployments.forEach((failed) => {
         const { name, deployment, $id } = failed;
-        const failUrl = `${globalConfig.getEndpoint().replace('/v1', '')}/console/project-${localConfig.getProject().projectId}/functions/function-${$id}/deployment-${deployment}`;
+        const failUrl = `${globalConfig.getEndpoint().slice(0, -3)}/console/project-${localConfig.getProject().projectId}/functions/function-${$id}/deployment-${deployment}`;
 
         error(`Deployment of ${name} has failed. Check at ${failUrl} for more details\n`);
     });
 
     if (!async) {
-        if(successfullyPushed === 0) {
+        if (successfullyPushed === 0) {
             error('No functions were pushed.');
-        } else if(successfullyDeployed != successfullyPushed) {
+        } else if (successfullyDeployed !== successfullyPushed) {
             warn(`Successfully pushed ${successfullyDeployed} of ${successfullyPushed} functions`)
         } else {
             success(`Successfully pushed ${successfullyPushed} functions.`);
@@ -1036,28 +1209,36 @@ const pushFunction = async ({ functionId, async, returnOnZero } = { returnOnZero
     }
 }
 
-const pushCollection = async ({ returnOnZero } = { returnOnZero: false }) => {
+const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false }) => {
     const collections = [];
 
+    if (attempts) {
+        pollMaxDebounces = attempts;
+    }
+
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
-        if (localConfig.getCollections().length === 0) {
-            log("No collections found.");
-            hint("Use 'appwrite pull collections' to synchronize existing one, or use 'appwrite init collection' to create a new one.");
-            return;
-        }
         collections.push(...localConfig.getCollections());
     } else {
-        const answers = await inquirer.prompt(questionsPushCollections[0])
-        const configCollections = new Map();
-        localConfig.getCollections().forEach((c) => {
-            configCollections.set(`${c['databaseId']}|${c['$id']}`, c);
-        });
-        answers.collections.forEach((a) => {
-            const collection = configCollections.get(a);
-            collections.push(collection);
-        })
+        const answers = await inquirer.prompt(questionsPushCollections)
+        if (answers.collections) {
+            const configCollections = new Map();
+            localConfig.getCollections().forEach((c) => {
+                configCollections.set(`${c['databaseId']}|${c['$id']}`, c);
+            });
+            answers.collections.forEach((a) => {
+                const collection = configCollections.get(a);
+                collections.push(collection);
+            })
+        }
+    }
+
+    if (collections.length === 0) {
+        log("No collections found.");
+        hint("Use 'appwrite pull collections' to synchronize existing one, or use 'appwrite init collection' to create a new one.");
+        return;
     }
+
     const databases = Array.from(new Set(collections.map(collection => collection['databaseId'])));
 
     log('Checking for changes ...');
@@ -1132,17 +1313,20 @@ const pushCollection = async ({ returnOnZero } = { returnOnZero: false }) => {
             }
         }
     }))
-
+    let numberOfCollections = 0;
     // Serialize attribute actions
     for (let collection of collections) {
         let attributes = collection.attributes;
+        let indexes = collection.indexes;
 
         if (collection.isExisted) {
             attributes = await attributesToCreate(collection.remoteVersion.attributes, collection.attributes, collection);
+            indexes = await attributesToCreate(collection.remoteVersion.indexes, collection.indexes, collection, true);
 
-            if (Array.isArray(attributes) && attributes.length <= 0) {
+            if ((Array.isArray(attributes) && attributes.length <= 0) && (Array.isArray(indexes) && indexes.length <= 0)) {
                 continue;
             }
+
         }
 
         log(`Pushing collection ${collection.name} ( ${collection['databaseId']} - ${collection['$id']} ) attributes`)
@@ -1154,13 +1338,15 @@ const pushCollection = async ({ returnOnZero } = { returnOnZero: false }) => {
         }
 
         try {
-            await createIndexes(collection.indexes, collection);
+            await createIndexes(indexes, collection);
         } catch (e) {
             throw e;
         }
-
+        numberOfCollections++;
         success(`Pushed ${collection.name} ( ${collection['$id']} )`);
     }
+
+    success(`Pushed ${numberOfCollections} collections`);
 }
 
 const pushBucket = async ({ returnOnZero } = { returnOnZero: false }) => {
@@ -1171,17 +1357,20 @@ const pushBucket = async ({ returnOnZero } = { returnOnZero: false }) => {
 
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
-        if (configBuckets.length === 0) {
-            log("No buckets found.");
-            hint("Use 'appwrite pull buckets' to synchronize existing one, or use 'appwrite init bucket' to create a new one.");
-            return;
-        }
         bucketIds.push(...configBuckets.map((b) => b.$id));
     }
 
     if (bucketIds.length === 0) {
         const answers = await inquirer.prompt(questionsPushBuckets[0])
-        bucketIds.push(...answers.buckets);
+        if (answers.buckets) {
+            bucketIds.push(...answers.buckets);
+        }
+    }
+
+    if (bucketIds.length === 0) {
+        log("No buckets found.");
+        hint("Use 'appwrite pull buckets' to synchronize existing one, or use 'appwrite init bucket' to create a new one.");
+        return;
     }
 
     let buckets = [];
@@ -1191,6 +1380,10 @@ const pushBucket = async ({ returnOnZero } = { returnOnZero: false }) => {
         buckets.push(...idBuckets);
     }
 
+    if (!(await approveChanges(buckets, storageGetBucket, KeysStorage, 'bucketId', 'buckets'))) {
+        return;
+    }
+
     log('Pushing buckets ...');
 
     for (let bucket of buckets) {
@@ -1249,16 +1442,20 @@ const pushTeam = async ({ returnOnZero } = { returnOnZero: false }) => {
 
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
-        if (configTeams.length === 0) {
-            log("No teams found.");
-            hint("Use 'appwrite pull teams' to synchronize existing one, or use 'appwrite init team' to create a new one.");
-        }
         teamIds.push(...configTeams.map((t) => t.$id));
     }
 
     if (teamIds.length === 0) {
         const answers = await inquirer.prompt(questionsPushTeams[0])
-        teamIds.push(...answers.teams);
+        if (answers.teams) {
+            teamIds.push(...answers.teams);
+        }
+    }
+
+    if (teamIds.length === 0) {
+        log("No teams found.");
+        hint("Use 'appwrite pull teams' to synchronize existing one, or use 'appwrite init team' to create a new one.");
+        return;
     }
 
     let teams = [];
@@ -1268,6 +1465,11 @@ const pushTeam = async ({ returnOnZero } = { returnOnZero: false }) => {
         teams.push(...idTeams);
     }
 
+    if (!(await approveChanges(teams, teamsGet, KeysTeams, 'teamId', 'teams'))) {
+        return;
+    }
+
+
     log('Pushing teams ...');
 
     for (let team of teams) {
@@ -1311,16 +1513,20 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
 
     if (cliConfig.all) {
         checkDeployConditions(localConfig);
-        if (configTopics.length === 0) {
-            log("No topics found.");
-            hint("Use 'appwrite pull topics' to synchronize existing one, or use 'appwrite init topic' to create a new one.");
-        }
         topicsIds.push(...configTopics.map((b) => b.$id));
     }
 
     if (topicsIds.length === 0) {
         const answers = await inquirer.prompt(questionsPushMessagingTopics[0])
-        topicsIds.push(...answers.topics);
+        if (answers.topics) {
+            topicsIds.push(...answers.topics);
+        }
+    }
+
+    if (topicsIds.length === 0) {
+        log("No topics found.");
+        hint("Use 'appwrite pull topics' to synchronize existing one, or use 'appwrite init topic' to create a new one.");
+        return;
     }
 
     let topics = [];
@@ -1337,6 +1543,10 @@ const pushMessagingTopic = async ({ returnOnZero } = { returnOnZero: false }) =>
         }
     }
 
+    if (!(await approveChanges(topics, messagingGetTopic, KeysTopics, 'topicId', 'topics'))) {
+        return;
+    }
+
     log('Pushing topics ...');
 
     for (let topic of topics) {
@@ -1402,14 +1612,16 @@ push
     .command("function")
     .alias("functions")
     .description("Push functions in the current directory.")
-    .option(`-f, --functionId <functionId>`, `Function ID`)
+    .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")
     .action(actionRunner(pushFunction));
 
 push
     .command("collection")
     .alias("collections")
     .description("Push collections in the current project.")
+    .option(`-a, --attempts <numberOfAttempts>`, `Max number of attempts before timing out. default: 30.`)
     .action(actionRunner(pushCollection));
 
 push