Merge pull request #555 from appwrite/feat-cli-func-secrets

Feat: CLI function variables

Author: christyjacob4

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

@@ -2,9 +2,9 @@ const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const { Command } = require("commander");
 const { localConfig } = require("../config");
-const { questionsDeployFunctions, questionsGetEntrypoint, questionsDeployCollections } = require("../questions");
+const { questionsDeployFunctions, questionsGetEntrypoint, questionsDeployCollections, questionsConfirmDeployCollections } = require("../questions");
 const { actionRunner, success, log, error, commandDescriptions } = require("../parser");
-const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsUpdateDeployment } = require('./functions');
+const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsUpdateDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
 const {
     databasesGet,
     databasesCreate,
@@ -39,7 +39,7 @@ const awaitPools = {
         const { attributes: remoteAttributes } = await databasesListAttributes({
             databaseId,
             collectionId,
-            limit: 100,
+            queries: [ 'limit(100)' ],
             parseOutput: false
         });
 
@@ -59,7 +59,7 @@ const awaitPools = {
         const { indexes: remoteIndexes } = await databasesListIndexes({
             databaseId,
             collectionId,
-            limit: 100,
+            queries: [ 'limit(100)' ],
             parseOutput: false
         });
 
@@ -79,7 +79,7 @@ const awaitPools = {
         const { attributes: remoteAttributes } = await databasesListAttributes({
             databaseId,
             collectionId,
-            limit: 100,
+            queries: [ 'limit(100)' ],
             parseOutput: false
         });
 
@@ -111,7 +111,7 @@ const awaitPools = {
         const { indexes: remoteIndexes } = await databasesListIndexes({
             databaseId,
             collectionId,
-            limit: 100,
+            queries: [ 'limit(100)' ],
             parseOutput: false
         });
 
@@ -142,7 +142,7 @@ const deploy = new Command("deploy")
         command.help()
     }));
 
-const deployFunction = async ({ functionId, all } = {}) => {
+const deployFunction = async ({ functionId, all, yes } = {}) => {
     let response = {};
 
     const functionIds = [];
@@ -160,7 +160,7 @@ const deployFunction = async ({ functionId, all } = {}) => {
     }
 
     if(functionIds.length <= 0) {
-        const answers = await inquirer.prompt(questionsDeployFunctions);
+        const answers = await inquirer.prompt(questionsDeployFunctions[0]);
         functionIds.push(...answers.functions);
     }
 
@@ -188,6 +188,46 @@ const deployFunction = async ({ functionId, all } = {}) => {
                 throw new Error(`Runtime missmatch! (local=${func.runtime},remote=${response.runtime}) Please delete remote function or update your appwrite.json`);
             }
 
+            if(func.variables) {
+                // Delete existing variables
+
+                // TODO: Pagination?
+                const { variables: remoteVariables } = await functionsListVariables({
+                    functionId: func['$id'],
+                    queries: [ 'limit(100)' ],
+                    parseOutput: false
+                });
+
+                if(remoteVariables.length > 0) {
+                    if(!yes) {
+                        const variableAnswers = await inquirer.prompt(questionsDeployFunctions[1])
+
+                        if (variableAnswers.override !== "YES") {
+                            log(`Received "${variableAnswers.override}". Skipping ${func.name} ( ${func['$id']} )`);
+                            continue;
+                        }
+                    }
+
+                    await Promise.all(remoteVariables.map(async remoteVariable => {
+                        await functionsDeleteVariable({
+                            functionId: func['$id'],
+                            variableId: remoteVariable['$id'],
+                            parseOutput: false
+                        });
+                    }));
+                }
+
+                // Deploy local variables
+                await Promise.all(Object.keys(func.variables).map(async localVariableKey => {
+                    await functionsCreateVariable({
+                        functionId: func['$id'],
+                        key: localVariableKey,
+                        value: func.variables[localVariableKey],
+                        parseOutput: false
+                    });
+                }));
+            }
+
             response = await functionsUpdate({
                 functionId: func['$id'],
                 name: func.name,
@@ -359,7 +399,7 @@ const createAttribute = async (databaseId, collectionId, attribute) => {
     }
 }
 
-const deployCollection = async ({ all } = {}) => {
+const deployCollection = async ({ all, yes } = {}) => {
     let response = {};
 
     let collectionIds = [];
@@ -413,10 +453,12 @@ const deployCollection = async ({ all } = {}) => {
             })
             log(`Collection ${collection.name} ( ${collection['$id']} ) already exists.`);
 
-            answers = await inquirer.prompt(questionsDeployCollections[1])
-            if (answers.override !== "YES") {
-                log(`Received "${answers.override}". Skipping ${collection.name} ( ${collection['$id']} )`);
-                continue;
+            if(!yes) {
+                answers = await inquirer.prompt(questionsDeployCollections[1])
+                if (answers.override !== "YES") {
+                    log(`Received "${answers.override}". Skipping ${collection.name} ( ${collection['$id']} )`);
+                    continue;
+                }
             }
 
             log(`Updating attributes ... `);
@@ -425,7 +467,7 @@ const deployCollection = async ({ all } = {}) => {
             const { indexes: remoteIndexes } = await databasesListIndexes({
                 databaseId,
                 collectionId: collection['$id'],
-                limit: 100,
+                queries: [ 'limit(100)' ],
                 parseOutput: false
             });
 
@@ -447,7 +489,7 @@ const deployCollection = async ({ all } = {}) => {
             const { attributes: remoteAttributes } = await databasesListAttributes({
                 databaseId,
                 collectionId: collection['$id'],
-                limit: 100,
+                queries: [ 'limit(100)' ],
                 parseOutput: false
             });
 
@@ -556,12 +598,14 @@ deploy
     .description("Deploy functions in the current directory.")
     .option(`--functionId <functionId>`, `Function ID`)
     .option(`--all`, `Flag to deploy all functions`)
+    .option(`--yes`, `Flag to confirm all warnings`)
     .action(actionRunner(deployFunction));
 
 deploy
     .command("collection")
     .description("Deploy collections in the current project.")
     .option(`--all`, `Flag to deploy all functions`)
+    .option(`--yes`, `Flag to confirm all warnings`)
     .action(actionRunner(deployCollection));
 
 module.exports = {

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

@@ -170,7 +170,7 @@ const initCollection = async ({ all, databaseId } = {}) => {
     // TODO: Pagination?
     let response = await databasesListCollections({
       databaseId,
-      limit: 100,
+      queries: [ 'limit(100)' ],
       parseOutput: false
     })
 

templates/cli/lib/questions.js.twig

@@ -113,7 +113,7 @@ const questionsInitProject = [
     type: "input",
     name: "id",
     message: "What ID would you like to have for your project?",
-    default: "myAwesomeProject",
+    default: "unique()",
     when(answers) {
       return answers.start == "new";
     },
@@ -251,7 +251,12 @@ const questionsDeployFunctions = [
       })
       return choices;
     }
-  }
+  },
+  {
+    type: "input",
+    name: "override",
+    message: 'Are you sure you want to override this function's variables? This can lead to loss of secrets! Type "YES" to confirm.'
+  },
 ]
 
 const questionsDeployCollections = [