@optimizely/ocp-cli 1.0.4 → 1.0.6

package/dist/commands/env/SetEnvironment.js

@@ -13,6 +13,8 @@ const path = require("path");
 const chalk = require("chalk");
 const oo_cli_1 = require("oo-cli");
 const Config_1 = require("../../lib/Config");
+const die_1 = require("../../lib/die");
+const formatError_1 = require("../../lib/formatError");
 const STAGING_ENV = {
     'OCP_ENV': 'staging',
     'RIVENDELL': 'https://rivendell.staging.zaius.com',
@@ -22,29 +24,34 @@ const STAGING_ENV = {
 const ENV_WHITELIST = ['staging', 'production'];
 let SetEnvironmentCommand = class SetEnvironmentCommand {
     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}`;
-            if (fs.existsSync(envFile)) {
-                fs.renameSync(envFile, `${envFile}.${(0, Config_1.getEnv)()}`);
-            }
-            if (fs.existsSync(setEnvFile)) {
-                fs.renameSync(setEnvFile, envFile);
-            }
-            else if (this.env === 'staging') {
-                try {
-                    fs.statSync(envPath);
+        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}.${(0, Config_1.getEnv)()}`);
                 }
-                catch (_a) {
-                    fs.mkdirSync(envPath);
+                if (fs.existsSync(setEnvFile)) {
+                    fs.renameSync(setEnvFile, envFile);
                 }
-                fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
+                else if (this.env === 'staging') {
+                    try {
+                        fs.statSync(envPath);
+                    }
+                    catch (_a) {
+                        fs.mkdirSync(envPath);
+                    }
+                    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) {
+            (0, die_1.die)((0, formatError_1.formatError)(e));
         }
     }
 };

package/dist/commands/env/SetEnvironment.js.map

@@ -1 +1 @@
-{"version":3,"file":"SetEnvironment.js","sourceRoot":"","sources":["../../../src/commands/env/SetEnvironment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,+BAA+B;AAC/B,mCAAuD;AACvD,6CAA0C;AAE1C,MAAM,WAAW,GAAG;IAClB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,qCAAqC;IAClD,YAAY,EAAE,WAAW;IACzB,eAAe,EAAE,oBAAoB;CACtC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AAGzC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAOzB,GAAG;QACR,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,GAAG,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YAE5C,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBAC1B,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,OAAO,IAAI,IAAA,eAAM,GAAE,EAAE,CAAC,CAAC;aAClD;YAED,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC7B,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;aACpC;iBAAM,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;gBACjC,IAAI;oBACF,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;iBACtB;gBAAC,WAAM;oBACN,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;iBACvB;gBACD,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAC3F;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;SAC5D;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CACnB,mCAAmC,IAAI,CAAC,GAAG,gCAAgC,aAAa,EAAE,CAAC,CAAC,CAAC;SAChG;IACH,CAAC;CACF,CAAA;AA/BC;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,sBAAsB,CAAC;kDACT;AAIpB;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,yCAAyC,CAAC;gDA2B/C;AAjCU,qBAAqB;IADjC,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,qBAAqB,CAkCjC;AAlCY,sDAAqB"}
+{"version":3,"file":"SetEnvironment.js","sourceRoot":"","sources":["../../../src/commands/env/SetEnvironment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,+BAA+B;AAC/B,mCAAuD;AACvD,6CAA0C;AAC1C,uCAAkC;AAClC,uDAAkD;AAElD,MAAM,WAAW,GAAG;IAClB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,qCAAqC;IAClD,YAAY,EAAE,WAAW;IACzB,eAAe,EAAE,oBAAoB;CACtC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;AAGzC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAOzB,GAAG;QACR,IAAI;YACF,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG,GAAG,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBAE5C,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;oBAC1B,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,OAAO,IAAI,IAAA,eAAM,GAAE,EAAE,CAAC,CAAC;iBAClD;gBAED,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;oBAC7B,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBACpC;qBAAM,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE;oBACjC,IAAI;wBACF,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;qBACtB;oBAAC,WAAM;wBACN,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;qBACvB;oBACD,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC3F;gBAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CACnB,mCAAmC,IAAI,CAAC,GAAG,gCAAgC,aAAa,EAAE,CAAC,CAAC,CAAC;aAChG;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AAnCC;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,sBAAsB,CAAC;kDACT;AAIpB;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,yCAAyC,CAAC;gDA+B/C;AArCU,qBAAqB;IADjC,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,qBAAqB,CAsCjC;AAtCY,sDAAqB"}

package/dist/index.js

@@ -27,5 +27,7 @@ async function run() {
     await (0, checkForUpdate_1.checkForUpdate)(manifest);
     new oo_cli_1.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) => (0, die_1.die)((0, formatError_1.formatError)(e)));
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6BAA6B;AAC7B,mEAA4D;AAC5D,yDAAsD;AACtD,yBAAyB;AACzB,yBAAyB;AACzB,mDAA8C;AAC9C,yDAAoD;AACpD,mCAA8B;AAC9B,+BAA+B;AAE/B,KAAK,UAAU,GAAG;IAChB,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;QACpD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,SAAS,CAAC,4FAA4F,CAAC,CAC9G,CAAC;KACH;IAED,MAAM,IAAA,+BAAc,GAAE,CAAC;IAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAC9B,IAAA,SAAG,EACD,iCAAiC;YACjC,4BAA4B;YAC5B,2FAA2F;YAC3F,yCAAyC,CAC1C,CAAC;KACL;IAED,IAAA,qCAAe,GAAE,CAAC;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACzE,MAAM,IAAA,+BAAc,EAAC,QAAQ,CAAC,CAAC;IAE/B,IAAI,eAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;AACxC,CAAC;AAED,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6BAA6B;AAC7B,mEAA4D;AAC5D,yDAAsD;AACtD,yBAAyB;AACzB,yBAAyB;AACzB,mDAA8C;AAC9C,yDAAoD;AACpD,mCAA8B;AAC9B,+BAA+B;AAE/B,KAAK,UAAU,GAAG;IAChB,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE;QACpD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,SAAS,CAAC,4FAA4F,CAAC,CAC9G,CAAC;KACH;IAED,MAAM,IAAA,+BAAc,GAAE,CAAC;IAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAC9B,IAAA,SAAG,EACD,iCAAiC;YACjC,4BAA4B;YAC5B,2FAA2F;YAC3F,yCAAyC,CAC1C,CAAC;KACL;IAED,IAAA,qCAAe,GAAE,CAAC;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACzE,MAAM,IAAA,+BAAc,EAAC,QAAQ,CAAC,CAAC;IAE/B,IAAI,eAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;AACxC,CAAC;AAED,4GAA4G;AAC5G,yCAAyC;AACzC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/dist/lib/AppContext.d.ts

@@ -1,3 +1,4 @@
+import { AppManifest } from '@zaiusinc/app-sdk';
 export interface AppContext {
     appId?: string;
     displayName?: string;
@@ -6,4 +7,4 @@ export interface AppContext {
     runtime?: string;
 }
 export declare function appContext(appId?: string, vendor?: string, runtime?: string): AppContext;
-export declare function readAppYaml(): any;
+export declare function readAppYaml(): AppManifest;

package/dist/lib/AppContext.js

@@ -34,10 +34,10 @@ function appContext(appId, vendor, runtime) {
 exports.appContext = appContext;
 function readAppYaml() {
     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'));
 }
 exports.readAppYaml = readAppYaml;
 //# sourceMappingURL=AppContext.js.map

package/dist/lib/AppContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"AppContext.js","sourceRoot":"","sources":["../../src/lib/AppContext.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,kCAAkC;AAClC,6BAA6B;AAU7B,SAAgB,UAAU,CAAC,KAAc,EAAE,MAAe,EAAE,OAAgB;IAC1E,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO;gBACL,KAAK,EAAE,EAAE;gBACT,OAAO;gBACP,MAAM;gBACN,OAAO;aACR,CAAC;SACH;aAAM;YACL,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,CAAC;SACjC;KACF;IAED,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QACrB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACvB,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACnC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;KACH;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AA1BD,gCA0BC;AAED,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;KACvD;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,kCAMC"}
+{"version":3,"file":"AppContext.js","sourceRoot":"","sources":["../../src/lib/AppContext.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,kCAAkC;AAClC,6BAA6B;AAW7B,SAAgB,UAAU,CAAC,KAAc,EAAE,MAAe,EAAE,OAAgB;IAC1E,IAAI,KAAK,EAAE;QACT,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvC,OAAO;gBACL,KAAK,EAAE,EAAE;gBACT,OAAO;gBACP,MAAM;gBACN,OAAO;aACR,CAAC;SACH;aAAM;YACL,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAC,CAAC;SACjC;KACF;IAED,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAC3B,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QACrB,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACvB,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY;YACnC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;KACH;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AA1BD,gCA0BC;AAED,SAAgB,WAAW;IACzB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAC;KACH;IAED,OAAO,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACxD,CAAC;AATD,kCASC"}

package/dist/oo-cli.manifest.json

@@ -324,7 +324,7 @@
           "key": "register",
           "command": "register",
           "aliases": [],
-          "help": "Register an app version",
+          "help": "Register an app in all shards",
           "documentation": "TBD",
           "flags": [
             {
@@ -337,18 +337,7 @@
               "invertible": false
             }
           ],
-          "options": [
-            {
-              "name": "availability",
-              "key": "availability",
-              "aliases": [
-                "a"
-              ],
-              "help": "The availability zone that will be targeted (default: us)",
-              "optional": true,
-              "multiple": false
-            }
-          ],
+          "options": [],
           "params": [
             {
               "name": "id",
@@ -1238,7 +1227,7 @@
   },
   "commands": [],
   "package": {
-    "version": "1.0.4",
+    "version": "1.0.6",
     "name": "@optimizely/ocp-cli",
     "license": "Apache-2.0",
     "executable": "ocp"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely/ocp-cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Optimizely Connect Platform command line interface",
   "repository": "https://github.com/ZaiusInc/ocp-cli",
   "license": "Apache-2.0",

package/src/commands/app/Init.ts

@@ -21,6 +21,7 @@ import titleCase = require('title-case');
 import { getDependencyFileUrl } from '../../lib/Config';
 import {Rivendell} from '../../lib/Rivendell';
 import {die} from '../../lib/die';
+import {formatError} from '../../lib/formatError';
 
 @namespace('app')
 export class CreateCommand {
@@ -38,21 +39,25 @@ export class CreateCommand {
   @command
   @help('Create a new app project')
   public async init() {
-    handleInterrupt();
-    this.manifest = await fetchTemplatesManifest();
+    try {
+      handleInterrupt();
+      this.manifest = await fetchTemplatesManifest();
 
-    // start with base variables
-    this.variables = this.manifest.baseTemplateVariables;
+      // start with base variables
+      this.variables = this.manifest.baseTemplateVariables;
 
-    // setting developer vendor
-    this.variables.find((v) => v.name === 'vendor')!.suggest = (await Rivendell.whoami()).vendor;
+      // setting developer vendor
+      this.variables.find((v) => v.name === 'vendor')!.suggest = (await Rivendell.whoami()).vendor;
 
-    this.variables.push({
-      name: 'template',
-      question: 'Select a template project'
-    });
-    if (!await this.askQuestion()) {
-      process.exit(1);
+      this.variables.push({
+        name: 'template',
+        question: 'Select a template project'
+      });
+      if (!await this.askQuestion()) {
+        process.exit(1);
+      }
+    } catch (e: any) {
+      die(formatError(e));
     }
   }
 

package/src/commands/app/Package.ts

@@ -5,6 +5,7 @@ import {appContext} from '../../lib/AppContext';
 import {AppPackager} from '../../lib/AppPackager';
 import {die} from '../../lib/die';
 import {directoryExists} from '../../lib/directoryExists';
+import {formatError} from '../../lib/formatError';
 
 @namespace('app')
 export class PackageCommand {
@@ -16,24 +17,28 @@ export class PackageCommand {
   @command
   @help('Prepare a package for manual upload')
   public package() {
-    const workingDir = process.cwd();
-    if (!directoryExists(this.path)) {
-      die('Specified path to app does not exist');
-      return;
-    }
-    process.chdir(this.path);
+    try {
+      const workingDir = process.cwd();
+      if (!directoryExists(this.path)) {
+        die('Specified path to app does not exist');
+        return;
+      }
+      process.chdir(this.path);
 
-    const context = appContext();
-    if (!context.appId || !context.version) {
-      die('Unable to read App ID or version info. Ensure you are uploading the right directory.');
-      return;
-    }
+      const context = appContext();
+      if (!context.appId || !context.version) {
+        die('Unable to read App ID or version info. Ensure you are uploading the right directory.');
+        return;
+      }
 
-    if (context) {
-      const packageData = new AppPackager('./').package();
-      const zipFileName = `${context.appId}@${context.version}.zip`;
-      fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
-      console.log(`Created package ${zipFileName}`);
+      if (context) {
+        const packageData = new AppPackager('./').package();
+        const zipFileName = `${context.appId}@${context.version}.zip`;
+        fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
+        console.log(`Created package ${zipFileName}`);
+      }
+    } catch (e: any) {
+      die(formatError(e));
     }
   }
 }

package/src/commands/app/Prepare.ts

@@ -9,6 +9,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import {Rivendell} from '../../lib/Rivendell';
 import AppReview = Rivendell.AppReview;
+import {formatError} from '../../lib/formatError';
+import {die} from '../../lib/die';
 
 @namespace('app')
 export class PrepareCommand extends BaseBuildCommand {
@@ -27,78 +29,82 @@ export class PrepareCommand extends BaseBuildCommand {
   @command
   @help('Validate, package, upload and build an app to prepare for publishing')
   public async prepare() {
-    const context = appContext();
-    if (!context.appId || !context.version) {
-      console.log(chalk.gray('App id or version missing in the manifest\n'));
-      return;
-    }
-    const requiresReview = await this.requiresReview(context.version);
-    if (requiresReview) {
-      const isInReview = await this.isInReview(context.appId, context.version);
-      const reviewMessage = isInReview ?
-        chalk.gray(
-          'The app version is already in review. This will update the review and the app can\'t be published until it is approved. ' +
-          `${chalk.yellow('Are you sure?')}`
-        ) :
-        chalk.gray(
-          'You are uploading a release version of the app. ' +
-          'This will start a review process and the app can\'t be published until it is approved. ' +
-          `${chalk.yellow('Are you sure?')}`
-        );
-
-      const reviewConfirmation = await TerminalConfirm.ask(reviewMessage);
-      if (!reviewConfirmation) {
+    try {
+      const context = appContext();
+      if (!context.appId || !context.version) {
+        console.log(chalk.gray('App id or version missing in the manifest\n'));
         return;
       }
-    }
+      const requiresReview = await this.requiresReview(context.version);
+      if (requiresReview) {
+        const isInReview = await this.isInReview(context.appId, context.version);
+        const reviewMessage = isInReview ?
+          chalk.gray(
+            'The app version is already in review. This will update the review and the app can\'t be published until it is approved. ' +
+            `${chalk.yellow('Are you sure?')}`
+          ) :
+          chalk.gray(
+            'You are uploading a release version of the app. ' +
+            'This will start a review process and the app can\'t be published until it is approved. ' +
+            `${chalk.yellow('Are you sure?')}`
+          );
 
-    if (context.version && this.bumpDevVersion) {
-      if (this.isDevVersion(context.version)) {
-        const bumpedVersion = semver.parse(context.version)?.inc('prerelease', 'dev').format();
-        if (!bumpedVersion) {
-          console.log(chalk.red(`Cannot parse app version: ${context.version}`));
+        const reviewConfirmation = await TerminalConfirm.ask(reviewMessage);
+        if (!reviewConfirmation) {
           return;
         }
+      }
 
-        console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
+      if (context.version && this.bumpDevVersion) {
+        if (this.isDevVersion(context.version)) {
+          const bumpedVersion = semver.parse(context.version)?.inc('prerelease', 'dev').format();
+          if (!bumpedVersion) {
+            console.log(chalk.red(`Cannot parse app version: ${context.version}`));
+            return;
+          }
 
-        this.updateVersionInAppManifest(context.version, bumpedVersion);
-        context.version = bumpedVersion;
-      } else {
-        console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
-      }
-    }
+          console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
 
-    await this.run(true, true, this.usePreviousAppEnvValues);
-    await this.reviewAppVersion(context.appId as string, context.version as string);
+          this.updateVersionInAppManifest(context.version, bumpedVersion);
+          context.version = bumpedVersion;
+        } else {
+          console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
+        }
+      }
 
-    if (this.publish) {
-      const cmd = new PublishCommand();
-      cmd.appVersion = `${context.appId}@${context.version}`;
-      await cmd.publish();
-    } else {
-      if (requiresReview) {
-        const appVersion = `${context.appId}@${context.version}`;
-        const appReview = await Rivendell.getReviewUrl(appVersion);
-        const reviewUrl = (appReview as AppReview).url;
+      await this.run(true, true, this.usePreviousAppEnvValues);
+      await this.reviewAppVersion(context.appId as string, context.version as string);
 
-        console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
-        `and you will receive an invitation from GitHub by email for access.` +
-        `It is important you accept this invitation in order to receive communications about your app from the review team.`));
-        console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
-        console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
-        console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
+      if (this.publish) {
+        const cmd = new PublishCommand();
+        cmd.appVersion = `${context.appId}@${context.version}`;
+        await cmd.publish();
       } else {
-        console.log(chalk.gray(
-          `\nUse ${chalk.white(
-            `ocp directory publish ${context.appId}@${context.version}`
-          )} to publish and release your app\n`
-        ));
+        if (requiresReview) {
+          const appVersion = `${context.appId}@${context.version}`;
+          const appReview = await Rivendell.getReviewUrl(appVersion);
+          const reviewUrl = (appReview as AppReview).url;
+
+          console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
+            `and you will receive an invitation from GitHub by email for access.` +
+            `It is important you accept this invitation in order to receive communications about your app from the review team.`));
+          console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
+          console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
+          console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
+        } else {
+          console.log(chalk.gray(
+            `\nUse ${chalk.white(
+              `ocp directory publish ${context.appId}@${context.version}`
+            )} to publish and release your app\n`
+          ));
+        }
       }
-    }
 
-    // explicitly exit because we're using terminal kit
-    process.exit(0);
+      // explicitly exit because we're using terminal kit
+      process.exit(0);
+    } catch (e: any) {
+      die(formatError(e));
+    }
   }
 
   private updateVersionInAppManifest(oldVersion: string, newVersion: string) {

package/src/commands/app/Register.ts

@@ -1,8 +1,10 @@
-import {command, flag, help, namespace, option, param} from 'oo-cli';
+import {command, flag, help, namespace, param} from 'oo-cli';
 import {die} from '../../lib/die';
 import {formatError} from '../../lib/formatError';
 import {Rivendell} from '../../lib/Rivendell';
-import {applicableShards} from '../../lib/Shards';
+import {RivendellApi} from '../../lib/RivendellApi';
+import ApiError = RivendellApi.ApiError;
+import {constants as httpConstants} from 'http2';
 
 @namespace('app')
 export class RegisterCommand {
@@ -21,18 +23,45 @@ export class RegisterCommand {
   )
   public personal: boolean = false;
 
-  @option('a')
-  @help('The availability zone that will be targeted (default: us)')
-  private availability: string = '';
-
   @command
-  @help('Register an app version')
+  @help('Register an app in all shards')
   public async register() {
     try {
-      const shards = await applicableShards(this.availability);
+      const shards = await Rivendell.shards();
+      shards.sort((first, second) =>  {
+        if (first.id === 'us') {
+          return -1;
+        } else if (second.id === 'us') {
+          return 1;
+        } else {
+          return first.id.localeCompare(second.id);
+        }
+      });
+      console.log(`Registering app ${this.id} in all shards`);
       for (const shard of shards) {
-        const app = await Rivendell.registerApp(this.id, this.name, this.personal, shard);
-        console.log(`Registered app ${app.id} with name "${app.name} in ${shard}`);
+        try {
+          const app = await Rivendell.registerApp(this.id, this.name, this.personal, shard.id);
+          console.log(`Registered app ${app.id} with name "${app.name} in ${shard.id}`);
+        } catch (e: any) {
+          if (e instanceof ApiError && e.response?.status === httpConstants.HTTP_STATUS_CONFLICT) {
+            // check the developer has access to already registered app
+            try {
+              await Rivendell.fetchApp(this.id, shard.id);
+            } catch (fetchError: any) {
+              if (
+                fetchError instanceof ApiError && fetchError.response?.status === httpConstants.HTTP_STATUS_NOT_FOUND
+              ) {
+                throw new Error(`App ${this.id} already registered by another vendor`);
+              } else {
+                throw e;
+              }
+            }
+
+            console.log(`App ${this.id} is already registered in shard ${shard.id}`);
+          } else {
+            throw e;
+          }
+        }
       }
     } catch (e: any) {
       die(formatError(e));

package/src/commands/app/Validate.ts

@@ -1,13 +1,19 @@
 import * as chalk from 'chalk';
 import {command, help, namespace} from 'oo-cli';
 import {BaseBuildCommand} from './BaseBuildCommand';
+import {die} from '../../lib/die';
+import {formatError} from '../../lib/formatError';
 
 @namespace('app')
 export class ValidateCommand extends BaseBuildCommand {
   @command
   @help('Validate an app locally')
   public async validate() {
-    await this.run(false, false, false);
-    console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
+    try {
+      await this.run(false, false, false);
+      console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
+    } catch (e: any) {
+      die(formatError(e));
+    }
   }
 }

package/src/commands/directory/Publish.ts

@@ -150,7 +150,6 @@ export class PublishCommand {
               if (spinner) {
                 spinner.stop();
               }
-              clearInterval(interval);
               if (state === AppVersionState.RUNNING) {
                 console.log(chalk.green(`${context.appId}@${context.version} has been published to ${shard}.`));
               } else {
@@ -164,11 +163,11 @@ export class PublishCommand {
               }
               if (spinner) {
                 spinner.update(`Status: ${formatVersionState(state)}`);
+                setTimeout(checkStatus, 2000);
               }
             }
           })
           .catch((e) => {
-            clearInterval(interval);
             if (spinner) {
               spinner.stop();
             }
@@ -176,7 +175,6 @@ export class PublishCommand {
           });
       };
 
-      const interval = setInterval(checkStatus, 2000);
       checkStatus();
     });
   }

package/src/commands/directory/Unpublish.ts

@@ -166,7 +166,6 @@ export class UnpublishCommand {
               if (spinner) {
                 spinner.stop();
               }
-              clearInterval(interval);
               console.log(chalk.green(`${context.appId}@${context.version} has been unpublished in ${shard}.`));
               resolve();
             } else {
@@ -175,18 +174,17 @@ export class UnpublishCommand {
               }
               if (spinner) {
                 spinner.update(`Status: ${formatVersionState(state)}`);
+                setTimeout(checkStatus, 2000);
               }
             }
           })
           .catch((e) => {
-              clearInterval(interval);
               if (spinner) {
                 spinner.stop();
               }
               reject(e);
           });
       };
-      const interval = setInterval(checkStatus, 2000);
       checkStatus();
     });
   }

package/src/commands/env/GetEnvironment.ts

@@ -1,14 +1,20 @@
 import * as chalk from 'chalk';
 import {command, help, namespace} from 'oo-cli';
 import {getEnv, runtimeConfig} from '../../lib/Config';
+import {die} from '../../lib/die';
+import {formatError} from '../../lib/formatError';
 
 @namespace('env')
 export class GetEnvironmentCommand {
   @command
   @help('Get the current environment of the CLI')
   public get() {
-    console.log(`Using ${chalk.yellow(getEnv())} environment\n`);
-    console.log('Configuration:');
-    console.log(chalk.gray(require('js-yaml').dump(runtimeConfig())));
+    try {
+      console.log(`Using ${chalk.yellow(getEnv())} environment\n`);
+      console.log('Configuration:');
+      console.log(chalk.gray(require('js-yaml').dump(runtimeConfig())));
+    } catch (e: any) {
+      die(formatError(e));
+    }
   }
 }