appwrite-cli 1.0.0 → 1.1.0

package/README.md

@@ -6,7 +6,7 @@
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
 
-**This SDK is compatible with Appwrite server version 1.0.0. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-cli/releases).**
+**This SDK is compatible with Appwrite server version 1.0.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-cli/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Command Line SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 
@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-1.0.0
+1.1.0
 ```
 
 ### Install using prebuilt binaries
@@ -58,7 +58,7 @@ $ iwr -useb https://appwrite.io/cli/install.ps1 | iex
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-1.0.0
+1.1.0
 ```
 
 ## Getting Started 
@@ -161,7 +161,7 @@ $ appwrite users list
 
 To create a document you can use the following command 
 ```sh
-$ appwrite database createDocument --collectionId <ID> --documentId 'unique()' --data '{ "Name": "Iron Man" }' --read role:all team:abc
+$ appwrite database createDocument --collectionId <ID> --documentId 'unique()' --data '{ "Name": "Iron Man" }' --permissions 'read("any")' 'read("team:abc")'
 ```
 
 ### Some Gotchas

package/install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/1.0.0/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/1.0.0/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/1.1.0/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/1.1.0/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

package/install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="1.0.0"
+    GITHUB_LATEST_VERSION="1.1.0"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

package/lib/client.js

@@ -15,8 +15,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '1.0.0',
-      'user-agent' : `AppwriteCLI/1.0.0 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '1.1.0',
+      'user-agent' : `AppwriteCLI/1.1.0 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.0.0',
     };
   }

package/lib/commands/deploy.js

@@ -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
             });
             
@@ -505,7 +547,7 @@ const deployCollection = async ({ all } = {}) => {
                     collectionId: collection['$id'],
                     name: collection.name,
                     documentSecurity: collection.documentSecurity,
-                    '$permissions': collection['$permissions'],
+                    permissions: collection['$permissions'],
                     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 = {

package/lib/commands/init.js

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

package/lib/questions.js

@@ -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 = [

package/package.json

@@ -2,7 +2,7 @@
   "name": "appwrite-cli",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {

package/appwrite.json

@@ -1,4 +0,0 @@
-{
-    "projectId": "almost-reddit",
-    "projectName": "Almost Reddit"
-}