Merge pull request #1109 from appwrite/fix-cli-env-not-pushing

fix: CLI env variables not pushing

Author: Meldiron

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

@@ -1,3 +1,6 @@
+const fs = require('fs');
+const path = require('path');
+const { parse: parseDotenv } = require('dotenv');
 const chalk = require('chalk');
 const inquirer = require("inquirer");
 const JSONbig = require("json-bigint")({ storeAsString: false });
@@ -12,7 +15,7 @@ const { proxyCreateFunctionRule, proxyCreateSiteRule, proxyListRules } = require
 const { consoleVariables } = require('./console');
 const { sdkForConsole } = require('../sdks')
 const { functionsGet, functionsCreate, functionsUpdate, functionsCreateDeployment, functionsGetDeployment, functionsListVariables, functionsDeleteVariable, functionsCreateVariable } = require('./functions');
-const { sitesGet, sitesCreate, sitesUpdate, sitesCreateDeployment, sitesGetDeployment, sitesCreateVariable } = require('./sites');
+const { sitesGet, sitesCreate, sitesUpdate, sitesCreateDeployment, sitesGetDeployment, sitesCreateVariable, sitesListVariables, sitesDeleteVariable } = require('./sites');
 const {
     databasesGet,
     databasesCreate,
@@ -149,37 +152,6 @@ const awaitPools = {
             iteration + 1
         );
     },
-    wipeVariables: async (functionId, iteration = 1) => {
-        if (iteration > pollMaxDebounces) {
-            return false;
-        }
-
-        const { total } = await functionsListVariables({
-            functionId,
-            queries: ['limit(1)'],
-            parseOutput: false
-        });
-
-        if (total === 0) {
-            return true;
-        }
-
-        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')
-            }
-        }
-
-        await new Promise(resolve => setTimeout(resolve, POLL_DEBOUNCE));
-
-        return await awaitPools.wipeVariables(
-            functionId,
-            iteration + 1
-        );
-    },
     deleteAttributes: async (databaseId, collectionId, attributeKeys, iteration = 1) => {
         if (iteration > pollMaxDebounces) {
             return false;
@@ -1047,7 +1019,7 @@ const pushSettings = async () => {
     }
 }
 
-const pushSite = async({ siteId, async, code } = { returnOnZero: false }) => {
+const pushSite = async({ siteId, async, code, withVariables } = { returnOnZero: false }) => {
     process.chdir(localConfig.configDirectoryPath)
 
     const siteIds = [];
@@ -1180,7 +1152,6 @@ const pushSite = async({ siteId, async, code } = { returnOnZero: false }) => {
                     timeout: site.timeout,
                     enabled: site.enabled,
                     logging: site.logging,
-                    vars: JSON.stringify(site.vars),
                     parseOutput: false
                 });
 
@@ -1213,16 +1184,43 @@ const pushSite = async({ siteId, async, code } = { returnOnZero: false }) => {
             }
         }
 
-        updaterRow.update({ status: 'Creating variables' }).replaceSpinner(SPINNER_ARC);
+        if (withVariables) {
+            updaterRow.update({ status: 'Creating variables' }).replaceSpinner(SPINNER_ARC);
 
-        await Promise.all((site['vars'] ?? []).map(async variable => {
-            await sitesCreateVariable({
+            const { variables } = await paginate(sitesListVariables, {
                 siteId: site['$id'],
-                key: variable['key'],
-                value: variable['value'],
                 parseOutput: false
-            });
-        }));
+            }, 100, 'variables');
+
+            await Promise.all(variables.map(async variable => {
+                await sitesDeleteVariable({
+                    siteId: site['$id'],
+                    variableId: variable['$id'],
+                    parseOutput: false
+                });
+            }));
+
+            const envFileLocation = `${site['path']}/.env`;
+            let envVariables = [];
+            try {
+                if (fs.existsSync(envFileLocation)) {
+                    const envObject = parseDotenv(fs.readFileSync(envFileLocation, 'utf8'));
+                    envVariables = Object.entries(envObject || {}).map(([key, value]) => ({ key, value }));
+                }
+            } catch (error) {
+                // Handle parsing errors gracefully
+                envVariables = [];
+            }
+            await Promise.all(envVariables.map(async variable => {
+                await sitesCreateVariable({
+                    siteId: site['$id'],
+                    key: variable.key,
+                    value: variable.value,
+                    parseOutput: false,
+                    secret: false
+                });
+            }));
+        }
 
         if (code === false) {
             successfullyPushed++;
@@ -1475,7 +1473,6 @@ const pushFunction = async ({ functionId, async, code, withVariables } = { retur
                     entrypoint: func.entrypoint,
                     commands: func.commands,
                     scopes: func.scopes,
-                    vars: JSON.stringify(func.vars),
                     parseOutput: false
                 });
 
@@ -1524,19 +1521,25 @@ const pushFunction = async ({ functionId, async, code, withVariables } = { retur
                 });
             }));
 
-            let result = await awaitPools.wipeVariables(func['$id']);
-            if (!result) {
-                updaterRow.fail({ errorMessage: `Variable deletion timed out.` })
-                return;
+            const envFileLocation = `${func['path']}/.env`;
+            let envVariables = [];
+            try {
+                if (fs.existsSync(envFileLocation)) {
+                    const envObject = parseDotenv(fs.readFileSync(envFileLocation, 'utf8'));
+                    envVariables = Object.entries(envObject || {}).map(([key, value]) => ({ key, value }));
+                }
+            } catch (error) {
+                // Handle parsing errors gracefully
+                envVariables = [];
             }
-
-            // Deploy local variables
-            await Promise.all((func['vars'] ?? []).map(async variable => {
+            await Promise.all(envVariables.map(async variable => {
                 await functionsCreateVariable({
                     functionId: func['$id'],
-                    key: variable['key'],
-                    value: variable['value'],
-                    parseOutput: false
+                    variableId: ID.unique(),
+                    key: variable.key,
+                    value: variable.value,
+                    parseOutput: false,
+                    secret: false
                 });
             }));
         }
@@ -2065,6 +2068,7 @@ push
     .option(`-f, --site-id <site-id>`, `ID of site to run`)
     .option(`-A, --async`, `Don't wait for sites deployments status`)
     .option("--no-code", "Don't push the site's code")
+    .option("--with-variables", `Push site variables.`)
     .action(actionRunner(pushSite));
 
 push