Fetch and create variables for sites

Author: vermakhushboo

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

@@ -428,6 +428,26 @@ const initSite = async () => {
     newReadmeFile[0] = `# ${answers.key}`;
     newReadmeFile.splice(1, 2);
     fs.writeFileSync(readmePath, newReadmeFile.join('\n'));
+
+    let vars = (templateDetails.variables ?? []).map(variable => {
+        let value = variable.value;
+        const replacements = {
+            '{apiEndpoint}': globalConfig.getEndpoint(),
+            '{projectId}': localConfig.getProject().projectId,
+            '{projectName}': localConfig.getProject().projectName,
+        };
+
+        for (const placeholder in replacements) {
+            if (value?.includes(placeholder)) {
+                value = value.replace(placeholder, replacements[placeholder]);
+            }
+        }
+
+        return {
+            key: variable.name,
+            value: value
+        };
+    });
 
     let data = {
         $id: siteId,
@@ -445,6 +465,7 @@ const initSite = async () => {
         logging: true,
         ignore: answers.framework.ignore || null,
         path: `sites/${siteName}`,
+        vars: vars
     };
 
     if (!data.buildRuntime) {

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

@@ -12,7 +12,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, sitesListVariables, sitesCreateVariable } = require('./sites');
+const { sitesGet, sitesCreate, sitesUpdate, sitesCreateDeployment, sitesGetDeployment, sitesCreateVariable } = require('./sites');
 const {
     databasesGet,
     databasesCreate,
@@ -1011,7 +1011,7 @@ const pushSettings = async () => {
     }
 }
 
-const pushSite = async({ siteId, async, code, withVariables } = { returnOnZero: false }) => {
+const pushSite = async({ siteId, async, code } = { returnOnZero: false }) => {
     process.chdir(localConfig.configDirectoryPath)
 
     const siteIds = [];
@@ -1177,38 +1177,16 @@ const pushSite = async({ siteId, async, code, withVariables } = { returnOnZero:
             }
         }
 
-        if (withVariables) {
-            updaterRow.update({ status: 'Updating variables' }).replaceSpinner(SPINNER_ARC);
+        updaterRow.update({ status: 'Creating variables' }).replaceSpinner(SPINNER_ARC);
 
-            const { variables } = await paginate(sitesListVariables, {
+        await Promise.all((site['vars'] ?? []).map(async variable => {
+            await sitesCreateVariable({
                 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
-                });
-            }));
-
-            let result = await awaitPools.wipeVariables(site['$id']);
-            if (!result) {
-                updaterRow.fail({ errorMessage: `Variable deletion timed out.` })
-                return;
-            }
-
-            // Deploy local variables
-            await Promise.all((site['vars'] ?? []).map(async variable => {
-                await sitesCreateVariable({
-                    siteId: site['$id'],
-                    key: variable['key'],
-                    value: variable['value'],
-                    parseOutput: false
-                });
-            }));
-        }
+            });
+        }));
 
         if (code === false) {
             successfullyPushed++;
@@ -2051,7 +2029,6 @@ 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

templates/cli/lib/config.js.twig

@@ -5,7 +5,7 @@ const process = require("process");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 
 const KeysVars = new Set(["key", "value"]);
-const KeysSite = new Set(["path", "$id", "name", "enabled", "logging", "timeout", "framework", "buildRuntime", "adapter", "installCommand", "buildCommand", "outputDirectory", "fallbackFile", "specification"]);
+const KeysSite = new Set(["path", "$id", "name", "enabled", "logging", "timeout", "framework", "buildRuntime", "adapter", "installCommand", "buildCommand", "outputDirectory", "fallbackFile", "specification", "vars"]);
 const KeysFunction = new Set(["path", "$id", "execute", "name", "enabled", "logging", "runtime", "specification", "scopes", "events", "schedule", "timeout", "entrypoint", "commands", "vars"]);
 const KeysDatabase = new Set(["$id", "name", "enabled"]);
 const KeysCollection = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "documentSecurity", "attributes", "indexes"]);