Release/0.0.12 (#6)

Author: gnekich

package.json

@@ -1,7 +1,7 @@
 {
   "name": "hlambda-cli",
   "type": "module",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "CLI for hlambda server.",
   "main": "src/index.js",
   "bin": {

src/commands/metadata.js

@@ -247,3 +247,49 @@ export const metadataExport = async (options, program) => {
     .then(() => {})
     .catch(CLIErrorHandler(program));
 };
+
+export const metadataSync = async (options, program) => {
+  await (async () => {
+    const cwd = path.resolve(process.cwd());
+    console.log('Executing in cwd:'.green, `${cwd}`.yellow);
+
+    // Load yaml configuration
+    const configuration = await loadConfigFromYAML(options);
+
+    const endpoint = configuration?.endpoint ?? 'http://localhost:8081';
+    const adminSecret = options?.adminSecret ?? configuration?.admin_secret ?? '';
+
+    const headers = {
+      'x-hlambda-admin-secret': adminSecret,
+    };
+    const response = await fetch(`${endpoint}/console/api/v1/metadata/sync`, {
+      method: 'GET',
+      // body: formData,
+      headers,
+    });
+
+    if (response.status === 200) {
+      console.log('Metadata synced!'.green);
+    }
+    console.log(response.status);
+
+    if (response.status !== 200) {
+      throw new Error(errors.ERROR_INVALID_HLAMBDA_ADMIN_SECRET);
+    }
+
+    // This is magic from commander, the real flag was --no-auto-reload but we get positive logic transformation to autoReload
+    if (options?.autoReload) {
+      const responseRestart = await fetch(`${endpoint}/console/api/v1/trigger-restart`, {
+        method: 'GET',
+        // body: formData,
+        headers,
+      });
+      if (responseRestart.status === 200) {
+        console.log('Metadata reloaded after clearing!'.green);
+      }
+      console.log(responseRestart.status);
+    }
+  })()
+    .then(() => {})
+    .catch(CLIErrorHandler(program));
+};

src/index.js

@@ -16,7 +16,7 @@ import { config } from './commands/config.js';
 import { save } from './commands/save.js';
 import { requests } from './commands/requests.js';
 import { startConsole } from './commands/console.js';
-import { serverReload, serverClearMetadata, metadataApply, metadataExport } from './commands/metadata.js';
+import { serverReload, serverClearMetadata, metadataApply, metadataExport, metadataSync } from './commands/metadata.js';
 import { checkForNewVersion, checkWhatIsNewInCurrentVersion } from './commands/update.js';
 import {
   serverGetLogs,
@@ -254,6 +254,16 @@ metadata
   .option('-s, --admin-secret <secret>', 'Admin secret used for auth.')
   .action(metadataExport);
 
+metadata
+  .command('sync')
+  .alias('s')
+  .description('Sync metadata from the remote repository.')
+  .option('-e, --env <env_name>', 'Select environment.', '')
+  .option('-c, --config <path>', 'Path to config.yaml file.', '')
+  .option('-s, --admin-secret <secret>', 'Admin secret used for auth.')
+  .option('--no-auto-reload', 'should metadata apply skip auto reload.')
+  .action(metadataSync);
+
 // --- Server sub-program ---
 const serverProgram = program.command('server').alias('s').description('Do basic server request.');
 

src/templates/index.js

@@ -1,6 +1,9 @@
 export const configTemplate = `version: 1
-endpoint: http://localhost:8081
 metadata_directory: metadata
+endpoint: "{{ENV_LOCAL_HLAMBDA_ENDPOINT}}"
+admin_secret: "{{ENV_LOCAL_HLAMBDA_ADMIN_SECRET}}"
+
+# endpoint: "http://localhost:8081"
 # admin_secret: demo
 
 # metadata_post_apply_script:
@@ -16,7 +19,12 @@ metadata_directory: metadata
 
 `;
 
-export const rootDotenvTemplate = `
+export const rootDotenvTemplate = `# Remove "#" to uncomment the env values.
+ENV_LOCAL_HLAMBDA_ENDPOINT="http://localhost:8081"
+ENV_LOCAL_HLAMBDA_ADMIN_SECRET="demo"
+
+# ENV_DEV_HLAMBDA_ENDPOINT="http://dev-server:8081"
+# ENV_DEV_HLAMBDA_ADMIN_SECRET="demo-dev"
 `;
 
 export const rootGitIgnoreTemplate = `.env

src/utils/loadConfigFromYAML.js

@@ -7,17 +7,29 @@ import { errors } from './../errors/index.js';
 
 const replaceValueWithProcessEnv = (_newConf, key) => {
   const strValue = _newConf?.[key] ?? '';
+
   const tSecret = strValue.match(/^{{(.+)}}$/m);
+  const tempOne = {};
   if (tSecret) {
     console.log(`Override value for key: ${key} with value from process.env[${tSecret[1]}]`.yellow);
-    const temp = {};
-    temp[key] = process.env?.[tSecret[1]] ?? '';
-    return {
-      ..._newConf,
-      ...temp,
-    };
+    tempOne[key] = process.env?.[tSecret[1]] ?? '';
   }
-  return _newConf;
+
+  // Idea to have namespacing for replacing values from different scopes.
+  // Example; env.ENV_VARIABLE_VALUE, but for now it is good as is.
+
+  // const tSecretEnv = strValue.match(/^{{env\.(.+)}}$/m);
+  // const tempTwo = {};
+  // if (tSecretEnv) {
+  //   console.log(`Override value for key: env.${key} with value from process.env[${tSecretEnv[1]}]`.yellow);
+  //   tempTwo[key] = process.env?.[tSecretEnv[1]] ?? '';
+  // }
+
+  return {
+    ..._newConf,
+    ...tempOne,
+    // ...tempTwo,
+  };
 };
 
 export const loadConfigFromYAML = async (options) => {