@optimizely/ocp-cli 1.0.4 → 1.0.6

package/src/commands/env/SetEnvironment.ts

@@ -4,6 +4,8 @@ import * as path from 'path';
 import * as chalk from 'chalk';
 import {command, help, namespace, param} from 'oo-cli';
 import { getEnv } from '../../lib/Config';
+import {die} from '../../lib/die';
+import {formatError} from '../../lib/formatError';
 
 const STAGING_ENV = {
   'OCP_ENV': 'staging',
@@ -23,30 +25,34 @@ export class SetEnvironmentCommand {
   @command
   @help('Set the current environment for the CLI')
   public set() {
-    if (ENV_WHITELIST.includes(this.env)) {
-      const envPath = path.join(os.homedir(), '.ocp');
-      const envFile = path.join(envPath, `.env`);
-      const setEnvFile = `${envFile}.${this.env}`;
+    try {
+      if (ENV_WHITELIST.includes(this.env)) {
+        const envPath = path.join(os.homedir(), '.ocp');
+        const envFile = path.join(envPath, `.env`);
+        const setEnvFile = `${envFile}.${this.env}`;
 
-      if (fs.existsSync(envFile)) {
-        fs.renameSync(envFile, `${envFile}.${getEnv()}`);
-      }
+        if (fs.existsSync(envFile)) {
+          fs.renameSync(envFile, `${envFile}.${getEnv()}`);
+        }
 
-      if (fs.existsSync(setEnvFile)) {
-        fs.renameSync(setEnvFile, envFile);
-      } else if (this.env === 'staging') {
-        try {
-          fs.statSync(envPath);
-        } catch {
-          fs.mkdirSync(envPath);
+        if (fs.existsSync(setEnvFile)) {
+          fs.renameSync(setEnvFile, envFile);
+        } else if (this.env === 'staging') {
+          try {
+            fs.statSync(envPath);
+          } catch {
+            fs.mkdirSync(envPath);
+          }
+          fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
         }
-        fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
-      }
 
-      console.log(chalk.yellow(`using ${this.env} environment`));
-    } else {
-      console.log(chalk.red(
-        `Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
+        console.log(chalk.yellow(`using ${this.env} environment`));
+      } else {
+        console.log(chalk.red(
+          `Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
+      }
+    } catch (e: any) {
+      die(formatError(e));
     }
   }
 }

package/src/index.ts

@@ -36,4 +36,6 @@ async function run() {
   new Runner(__dirname, manifest).run();
 }
 
+// catch does not work here sadly for async functions as oo-cli lib does not wait for the promise to resolve
+// use try/catch instead in every command
 run().catch((e) => die(formatError(e)));

package/src/lib/AppContext.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as jsYaml from 'js-yaml';
 import * as path from 'path';
+import {AppManifest} from '@zaiusinc/app-sdk';
 
 export interface AppContext {
   appId?: string;
@@ -38,10 +39,13 @@ export function appContext(appId?: string, vendor?: string, runtime?: string): A
   return {};
 }
 
-export function readAppYaml() {
+export function readAppYaml(): AppManifest {
   const file = path.join(process.cwd(), 'app.yml');
-  if (fs.existsSync(file)) {
-    return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
+  if (!fs.existsSync(file)) {
+    throw new Error(
+      `Can not find app manifest (app.yaml) in working directory. Please run this command from the root of your app.`
+    );
   }
-  return false;
+
+  return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
 }