@optimizely/ocp-cli 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/dist/commands/app/Init.js +18 -12
  2. package/dist/commands/app/Init.js.map +1 -1
  3. package/dist/commands/app/Package.js +21 -15
  4. package/dist/commands/app/Package.js.map +1 -1
  5. package/dist/commands/app/Prepare.js +56 -49
  6. package/dist/commands/app/Prepare.js.map +1 -1
  7. package/dist/commands/app/Register.d.ts +0 -1
  8. package/dist/commands/app/Register.js +31 -10
  9. package/dist/commands/app/Register.js.map +1 -1
  10. package/dist/commands/app/Validate.js +9 -2
  11. package/dist/commands/app/Validate.js.map +1 -1
  12. package/dist/commands/env/GetEnvironment.js +10 -3
  13. package/dist/commands/env/GetEnvironment.js.map +1 -1
  14. package/dist/commands/env/SetEnvironment.js +26 -19
  15. package/dist/commands/env/SetEnvironment.js.map +1 -1
  16. package/dist/index.js +2 -0
  17. package/dist/index.js.map +1 -1
  18. package/dist/lib/AppContext.d.ts +2 -1
  19. package/dist/lib/AppContext.js +3 -3
  20. package/dist/lib/AppContext.js.map +1 -1
  21. package/dist/oo-cli.manifest.json +3 -14
  22. package/package.json +1 -1
  23. package/src/commands/app/Init.ts +17 -12
  24. package/src/commands/app/Package.ts +21 -16
  25. package/src/commands/app/Prepare.ts +65 -59
  26. package/src/commands/app/Register.ts +30 -10
  27. package/src/commands/app/Validate.ts +8 -2
  28. package/src/commands/env/GetEnvironment.ts +9 -3
  29. package/src/commands/env/SetEnvironment.ts +26 -20
  30. package/src/index.ts +2 -0
  31. package/src/lib/AppContext.ts +8 -4
package/dist/commands/app/Init.js CHANGED
@@ -29,6 +29,7 @@ const titleCase = require("title-case");
29
29
  const Config_1 = require("../../lib/Config");
30
30
  const Rivendell_1 = require("../../lib/Rivendell");
31
31
  const die_1 = require("../../lib/die");
32
+ const formatError_1 = require("../../lib/formatError");
32
33
  let CreateCommand = class CreateCommand {
33
34
  constructor() {
34
35
  this.variableId = 0;
@@ -131,18 +132,23 @@ let CreateCommand = class CreateCommand {
131
132
  };
132
133
  }
133
134
  async init() {
134
- (0, handleInterrupt_1.handleInterrupt)();
135
- this.manifest = await (0, fetchTemplatesManifest_1.fetchTemplatesManifest)();
136
- // start with base variables
137
- this.variables = this.manifest.baseTemplateVariables;
138
- // setting developer vendor
139
- this.variables.find((v) => v.name === 'vendor').suggest = (await Rivendell_1.Rivendell.whoami()).vendor;
140
- this.variables.push({
141
- name: 'template',
142
- question: 'Select a template project'
143
- });
144
- if (!await this.askQuestion()) {
145
- process.exit(1);
135
+ try {
136
+ (0, handleInterrupt_1.handleInterrupt)();
137
+ this.manifest = await (0, fetchTemplatesManifest_1.fetchTemplatesManifest)();
138
+ // start with base variables
139
+ this.variables = this.manifest.baseTemplateVariables;
140
+ // setting developer vendor
141
+ this.variables.find((v) => v.name === 'vendor').suggest = (await Rivendell_1.Rivendell.whoami()).vendor;
142
+ this.variables.push({
143
+ name: 'template',
144
+ question: 'Select a template project'
145
+ });
146
+ if (!await this.askQuestion()) {
147
+ process.exit(1);
148
+ }
149
+ }
150
+ catch (e) {
151
+ (0, die_1.die)((0, formatError_1.formatError)(e));
146
152
  }
147
153
  }
148
154
  async renderTemplate() {
package/dist/commands/app/Init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Init.js","sourceRoot":"","sources":["../../../src/commands/app/Init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Init.js","sourceRoot":"","sources":["../../../src/commands/app/Init.ts"],"names":[],"mappings":"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"}
package/dist/commands/app/Package.js CHANGED
@@ -14,24 +14,30 @@ const AppContext_1 = require("../../lib/AppContext");
14
14
  const AppPackager_1 = require("../../lib/AppPackager");
15
15
  const die_1 = require("../../lib/die");
16
16
  const directoryExists_1 = require("../../lib/directoryExists");
17
+ const formatError_1 = require("../../lib/formatError");
17
18
  let PackageCommand = class PackageCommand {
18
19
  package() {
19
- const workingDir = process.cwd();
20
- if (!(0, directoryExists_1.directoryExists)(this.path)) {
21
- (0, die_1.die)('Specified path to app does not exist');
22
- return;
20
+ try {
21
+ const workingDir = process.cwd();
22
+ if (!(0, directoryExists_1.directoryExists)(this.path)) {
23
+ (0, die_1.die)('Specified path to app does not exist');
24
+ return;
25
+ }
26
+ process.chdir(this.path);
27
+ const context = (0, AppContext_1.appContext)();
28
+ if (!context.appId || !context.version) {
29
+ (0, die_1.die)('Unable to read App ID or version info. Ensure you are uploading the right directory.');
30
+ return;
31
+ }
32
+ if (context) {
33
+ const packageData = new AppPackager_1.AppPackager('./').package();
34
+ const zipFileName = `${context.appId}@${context.version}.zip`;
35
+ fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
36
+ console.log(`Created package ${zipFileName}`);
37
+ }
23
38
  }
24
- process.chdir(this.path);
25
- const context = (0, AppContext_1.appContext)();
26
- if (!context.appId || !context.version) {
27
- (0, die_1.die)('Unable to read App ID or version info. Ensure you are uploading the right directory.');
28
- return;
29
- }
30
- if (context) {
31
- const packageData = new AppPackager_1.AppPackager('./').package();
32
- const zipFileName = `${context.appId}@${context.version}.zip`;
33
- fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
34
- console.log(`Created package ${zipFileName}`);
39
+ catch (e) {
40
+ (0, die_1.die)((0, formatError_1.formatError)(e));
35
41
  }
36
42
  }
37
43
  };
package/dist/commands/app/Package.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Package.js","sourceRoot":"","sources":["../../../src/commands/app/Package.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yBAAyB;AACzB,mCAAqE;AACrE,6BAA6B;AAC7B,qDAAgD;AAChD,uDAAkD;AAClD,uCAAkC;AAClC,+DAA0D;AAGnD,IAAM,cAAc,GAApB,MAAM,cAAc;IAQlB,OAAO;QACZ,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,IAAA,iCAAe,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC/B,IAAA,SAAG,EAAC,sCAAsC,CAAC,CAAC;YAC5C,OAAO;SACR;QACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACtC,IAAA,SAAG,EAAC,sFAAsF,CAAC,CAAC;YAC5F,OAAO;SACR;QAED,IAAI,OAAO,EAAE;YACX,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACpD,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,MAAM,CAAC;YAC9D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;YAClE,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC;SAC/C;IACH,CAAC;CACF,CAAA;AAzBC;IAHC,cAAK;IACL,IAAA,aAAI,EAAC,+BAA+B,CAAC;IACrC,IAAA,qBAAY,EAAC,IAAI,CAAC;4CACE;AAIrB;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,qCAAqC,CAAC;6CAqB3C;AA5BU,cAAc;IAD1B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,cAAc,CA6B1B;AA7BY,wCAAc"}
1
+ {"version":3,"file":"Package.js","sourceRoot":"","sources":["../../../src/commands/app/Package.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yBAAyB;AACzB,mCAAqE;AACrE,6BAA6B;AAC7B,qDAAgD;AAChD,uDAAkD;AAClD,uCAAkC;AAClC,+DAA0D;AAC1D,uDAAkD;AAG3C,IAAM,cAAc,GAApB,MAAM,cAAc;IAQlB,OAAO;QACZ,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YACjC,IAAI,CAAC,IAAA,iCAAe,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC/B,IAAA,SAAG,EAAC,sCAAsC,CAAC,CAAC;gBAC5C,OAAO;aACR;YACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAAA,uBAAU,GAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACtC,IAAA,SAAG,EAAC,sFAAsF,CAAC,CAAC;gBAC5F,OAAO;aACR;YAED,IAAI,OAAO,EAAE;gBACX,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;gBACpD,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,MAAM,CAAC;gBAC9D,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;gBAClE,OAAO,CAAC,GAAG,CAAC,mBAAmB,WAAW,EAAE,CAAC,CAAC;aAC/C;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AA7BC;IAHC,cAAK;IACL,IAAA,aAAI,EAAC,+BAA+B,CAAC;IACrC,IAAA,qBAAY,EAAC,IAAI,CAAC;4CACE;AAIrB;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,qCAAqC,CAAC;6CAyB3C;AAhCU,cAAc;IAD1B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,cAAc,CAiC1B;AAjCY,wCAAc"}
package/dist/commands/app/Prepare.js CHANGED
@@ -17,6 +17,8 @@ const semver = require("semver");
17
17
  const fs = require("fs");
18
18
  const path = require("path");
19
19
  const Rivendell_1 = require("../../lib/Rivendell");
20
+ const formatError_1 = require("../../lib/formatError");
21
+ const die_1 = require("../../lib/die");
20
22
  let PrepareCommand = class PrepareCommand extends BaseBuildCommand_1.BaseBuildCommand {
21
23
  constructor() {
22
24
  super(...arguments);
@@ -24,65 +26,70 @@ let PrepareCommand = class PrepareCommand extends BaseBuildCommand_1.BaseBuildCo
24
26
  }
25
27
  async prepare() {
26
28
  var _a;
27
- const context = (0, AppContext_1.appContext)();
28
- if (!context.appId || !context.version) {
29
- console.log(chalk.gray('App id or version missing in the manifest\n'));
30
- return;
31
- }
32
- const requiresReview = await this.requiresReview(context.version);
33
- if (requiresReview) {
34
- const isInReview = await this.isInReview(context.appId, context.version);
35
- const reviewMessage = isInReview ?
36
- 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. ' +
37
- `${chalk.yellow('Are you sure?')}`) :
38
- chalk.gray('You are uploading a release version of the app. ' +
39
- 'This will start a review process and the app can\'t be published until it is approved. ' +
40
- `${chalk.yellow('Are you sure?')}`);
41
- const reviewConfirmation = await TerminalConfirm_1.TerminalConfirm.ask(reviewMessage);
42
- if (!reviewConfirmation) {
29
+ try {
30
+ const context = (0, AppContext_1.appContext)();
31
+ if (!context.appId || !context.version) {
32
+ console.log(chalk.gray('App id or version missing in the manifest\n'));
43
33
  return;
44
34
  }
45
- }
46
- if (context.version && this.bumpDevVersion) {
47
- if (this.isDevVersion(context.version)) {
48
- const bumpedVersion = (_a = semver.parse(context.version)) === null || _a === void 0 ? void 0 : _a.inc('prerelease', 'dev').format();
49
- if (!bumpedVersion) {
50
- console.log(chalk.red(`Cannot parse app version: ${context.version}`));
35
+ const requiresReview = await this.requiresReview(context.version);
36
+ if (requiresReview) {
37
+ const isInReview = await this.isInReview(context.appId, context.version);
38
+ const reviewMessage = isInReview ?
39
+ 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. ' +
40
+ `${chalk.yellow('Are you sure?')}`) :
41
+ chalk.gray('You are uploading a release version of the app. ' +
42
+ 'This will start a review process and the app can\'t be published until it is approved. ' +
43
+ `${chalk.yellow('Are you sure?')}`);
44
+ const reviewConfirmation = await TerminalConfirm_1.TerminalConfirm.ask(reviewMessage);
45
+ if (!reviewConfirmation) {
51
46
  return;
52
47
  }
53
- console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
54
- this.updateVersionInAppManifest(context.version, bumpedVersion);
55
- context.version = bumpedVersion;
56
48
  }
57
- else {
58
- console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
49
+ if (context.version && this.bumpDevVersion) {
50
+ if (this.isDevVersion(context.version)) {
51
+ const bumpedVersion = (_a = semver.parse(context.version)) === null || _a === void 0 ? void 0 : _a.inc('prerelease', 'dev').format();
52
+ if (!bumpedVersion) {
53
+ console.log(chalk.red(`Cannot parse app version: ${context.version}`));
54
+ return;
55
+ }
56
+ console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
57
+ this.updateVersionInAppManifest(context.version, bumpedVersion);
58
+ context.version = bumpedVersion;
59
+ }
60
+ else {
61
+ console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
62
+ }
59
63
  }
60
- }
61
- await this.run(true, true, this.usePreviousAppEnvValues);
62
- await this.reviewAppVersion(context.appId, context.version);
63
- if (this.publish) {
64
- const cmd = new Publish_1.PublishCommand();
65
- cmd.appVersion = `${context.appId}@${context.version}`;
66
- await cmd.publish();
67
- }
68
- else {
69
- if (requiresReview) {
70
- const appVersion = `${context.appId}@${context.version}`;
71
- const appReview = await Rivendell_1.Rivendell.getReviewUrl(appVersion);
72
- const reviewUrl = appReview.url;
73
- console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
74
- `and you will receive an invitation from GitHub by email for access.` +
75
- `It is important you accept this invitation in order to receive communications about your app from the review team.`));
76
- console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
77
- console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
78
- console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
64
+ await this.run(true, true, this.usePreviousAppEnvValues);
65
+ await this.reviewAppVersion(context.appId, context.version);
66
+ if (this.publish) {
67
+ const cmd = new Publish_1.PublishCommand();
68
+ cmd.appVersion = `${context.appId}@${context.version}`;
69
+ await cmd.publish();
79
70
  }
80
71
  else {
81
- console.log(chalk.gray(`\nUse ${chalk.white(`ocp directory publish ${context.appId}@${context.version}`)} to publish and release your app\n`));
72
+ if (requiresReview) {
73
+ const appVersion = `${context.appId}@${context.version}`;
74
+ const appReview = await Rivendell_1.Rivendell.getReviewUrl(appVersion);
75
+ const reviewUrl = appReview.url;
76
+ console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
77
+ `and you will receive an invitation from GitHub by email for access.` +
78
+ `It is important you accept this invitation in order to receive communications about your app from the review team.`));
79
+ console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
80
+ console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
81
+ console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
82
+ }
83
+ else {
84
+ console.log(chalk.gray(`\nUse ${chalk.white(`ocp directory publish ${context.appId}@${context.version}`)} to publish and release your app\n`));
85
+ }
82
86
  }
87
+ // explicitly exit because we're using terminal kit
88
+ process.exit(0);
89
+ }
90
+ catch (e) {
91
+ (0, die_1.die)((0, formatError_1.formatError)(e));
83
92
  }
84
- // explicitly exit because we're using terminal kit
85
- process.exit(0);
86
93
  }
87
94
  updateVersionInAppManifest(oldVersion, newVersion) {
88
95
  const file = path.join(process.cwd(), 'app.yml');
package/dist/commands/app/Prepare.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Prepare.js","sourceRoot":"","sources":["../../../src/commands/app/Prepare.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Prepare.js","sourceRoot":"","sources":["../../../src/commands/app/Prepare.ts"],"names":[],"mappings":"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"}
package/dist/commands/app/Register.d.ts CHANGED
@@ -2,6 +2,5 @@ export declare class RegisterCommand {
2
2
  id: string;
3
3
  name: string;
4
4
  personal: boolean;
5
- private availability;
6
5
  register(): Promise<void>;
7
6
  }
package/dist/commands/app/Register.js CHANGED
@@ -11,18 +11,43 @@ const oo_cli_1 = require("oo-cli");
11
11
  const die_1 = require("../../lib/die");
12
12
  const formatError_1 = require("../../lib/formatError");
13
13
  const Rivendell_1 = require("../../lib/Rivendell");
14
- const Shards_1 = require("../../lib/Shards");
14
+ const RivendellApi_1 = require("../../lib/RivendellApi");
15
+ var ApiError = RivendellApi_1.RivendellApi.ApiError;
16
+ const http2_1 = require("http2");
15
17
  let RegisterCommand = class RegisterCommand {
16
18
  constructor() {
17
19
  this.personal = false;
18
- this.availability = '';
19
20
  }
20
21
  async register() {
22
+ var _a, _b;
21
23
  try {
22
- const shards = await (0, Shards_1.applicableShards)(this.availability);
24
+ const shards = await Rivendell_1.Rivendell.shards();
25
+ console.log(`Registering app ${this.id} in all shards`);
23
26
  for (const shard of shards) {
24
- const app = await Rivendell_1.Rivendell.registerApp(this.id, this.name, this.personal, shard);
25
- console.log(`Registered app ${app.id} with name "${app.name} in ${shard}`);
27
+ try {
28
+ const app = await Rivendell_1.Rivendell.registerApp(this.id, this.name, this.personal, shard.id);
29
+ console.log(`Registered app ${app.id} with name "${app.name} in ${shard.id}`);
30
+ }
31
+ catch (e) {
32
+ if (e instanceof ApiError && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === http2_1.constants.HTTP_STATUS_CONFLICT) {
33
+ // check the developer has access to already registered app
34
+ try {
35
+ await Rivendell_1.Rivendell.fetchApp(this.id, shard.id);
36
+ }
37
+ catch (fetchError) {
38
+ if (fetchError instanceof ApiError && ((_b = fetchError.response) === null || _b === void 0 ? void 0 : _b.status) === http2_1.constants.HTTP_STATUS_NOT_FOUND) {
39
+ throw new Error(`App ${this.id} already registered by another vendor`);
40
+ }
41
+ else {
42
+ throw e;
43
+ }
44
+ }
45
+ console.log(`App ${this.id} is already registered in shard ${shard.id}`);
46
+ }
47
+ else {
48
+ throw e;
49
+ }
50
+ }
26
51
  }
27
52
  }
28
53
  catch (e) {
@@ -43,13 +68,9 @@ __decorate([
43
68
  (0, oo_cli_1.help)('Do not share this app with other developers in your organization. ' +
44
69
  'If not set, the app will be shared with all developers in your organization')
45
70
  ], RegisterCommand.prototype, "personal", void 0);
46
- __decorate([
47
- (0, oo_cli_1.option)('a'),
48
- (0, oo_cli_1.help)('The availability zone that will be targeted (default: us)')
49
- ], RegisterCommand.prototype, "availability", void 0);
50
71
  __decorate([
51
72
  oo_cli_1.command,
52
- (0, oo_cli_1.help)('Register an app version')
73
+ (0, oo_cli_1.help)('Register an app in all shards')
53
74
  ], RegisterCommand.prototype, "register", null);
54
75
  RegisterCommand = __decorate([
55
76
  (0, oo_cli_1.namespace)('app')
package/dist/commands/app/Register.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Register.js","sourceRoot":"","sources":["../../../src/commands/app/Register.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAqE;AACrE,uCAAkC;AAClC,uDAAkD;AAClD,mDAA8C;AAC9C,6CAAkD;AAG3C,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QAcE,aAAQ,GAAY,KAAK,CAAC;QAIzB,iBAAY,GAAW,EAAE,CAAC;IAepC,CAAC;IAXc,AAAN,KAAK,CAAC,QAAQ;QACnB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,MAAM,GAAG,GAAG,MAAM,qBAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAClF,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,IAAI,OAAO,KAAK,EAAE,CAAC,CAAC;aAC5E;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AA9BC;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,uBAAuB,CAAC;2CACX;AAInB;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,6BAA6B,CAAC;6CACf;AAOrB;IALC,aAAI;IACJ,IAAA,aAAI,EACH,oEAAoE;QACpE,6EAA6E,CAC9E;iDACgC;AAIjC;IAFC,IAAA,eAAM,EAAC,GAAG,CAAC;IACX,IAAA,aAAI,EAAC,2DAA2D,CAAC;qDAChC;AAIrB;IAFZ,gBAAO;IACP,IAAA,aAAI,EAAC,yBAAyB,CAAC;+CAW/B;AAhCU,eAAe;IAD3B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,eAAe,CAiC3B;AAjCY,0CAAe"}
1
+ {"version":3,"file":"Register.js","sourceRoot":"","sources":["../../../src/commands/app/Register.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAA6D;AAC7D,uCAAkC;AAClC,uDAAkD;AAClD,mDAA8C;AAC9C,yDAAoD;AACpD,IAAO,QAAQ,GAAG,2BAAY,CAAC,QAAQ,CAAC;AACxC,iCAAiD;AAG1C,IAAM,eAAe,GAArB,MAAM,eAAe;IAArB;QAcE,aAAQ,GAAY,KAAK,CAAC;IAqCnC,CAAC;IAjCc,AAAN,KAAK,CAAC,QAAQ;;QACnB,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,qBAAS,CAAC,MAAM,EAAE,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC;YACxD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBAC1B,IAAI;oBACF,MAAM,GAAG,GAAG,MAAM,qBAAS,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBACrF,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,CAAC,EAAE,eAAe,GAAG,CAAC,IAAI,OAAO,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;iBAC/E;gBAAC,OAAO,CAAM,EAAE;oBACf,IAAI,CAAC,YAAY,QAAQ,IAAI,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,MAAK,iBAAa,CAAC,oBAAoB,EAAE;wBACtF,2DAA2D;wBAC3D,IAAI;4BACF,MAAM,qBAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;yBAC7C;wBAAC,OAAO,UAAe,EAAE;4BACxB,IACE,UAAU,YAAY,QAAQ,IAAI,CAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,MAAM,MAAK,iBAAa,CAAC,qBAAqB,EACrG;gCACA,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,EAAE,uCAAuC,CAAC,CAAC;6BACxE;iCAAM;gCACL,MAAM,CAAC,CAAC;6BACT;yBACF;wBAED,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,EAAE,mCAAmC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;qBAC1E;yBAAM;wBACL,MAAM,CAAC,CAAC;qBACT;iBACF;aACF;SACF;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AAhDC;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,uBAAuB,CAAC;2CACX;AAInB;IAFC,cAAK;IACL,IAAA,aAAI,EAAC,6BAA6B,CAAC;6CACf;AAOrB;IALC,aAAI;IACJ,IAAA,aAAI,EACH,oEAAoE;QACpE,6EAA6E,CAC9E;iDACgC;AAIpB;IAFZ,gBAAO;IACP,IAAA,aAAI,EAAC,+BAA+B,CAAC;+CAiCrC;AAlDU,eAAe;IAD3B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,eAAe,CAmD3B;AAnDY,0CAAe"}
package/dist/commands/app/Validate.js CHANGED
@@ -10,10 +10,17 @@ exports.ValidateCommand = void 0;
10
10
  const chalk = require("chalk");
11
11
  const oo_cli_1 = require("oo-cli");
12
12
  const BaseBuildCommand_1 = require("./BaseBuildCommand");
13
+ const die_1 = require("../../lib/die");
14
+ const formatError_1 = require("../../lib/formatError");
13
15
  let ValidateCommand = class ValidateCommand extends BaseBuildCommand_1.BaseBuildCommand {
14
16
  async validate() {
15
- await this.run(false, false, false);
16
- console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
17
+ try {
18
+ await this.run(false, false, false);
19
+ console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
20
+ }
21
+ catch (e) {
22
+ (0, die_1.die)((0, formatError_1.formatError)(e));
23
+ }
17
24
  }
18
25
  };
19
26
  __decorate([
package/dist/commands/app/Validate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Validate.js","sourceRoot":"","sources":["../../../src/commands/app/Validate.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAgD;AAChD,yDAAoD;AAG7C,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,mCAAgB;IAGtC,AAAN,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,CAAC,CAAC;IACpG,CAAC;CACF,CAAA;AAJc;IAFZ,gBAAO;IACP,IAAA,aAAI,EAAC,yBAAyB,CAAC;+CAI/B;AANU,eAAe;IAD3B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,eAAe,CAO3B;AAPY,0CAAe"}
1
+ {"version":3,"file":"Validate.js","sourceRoot":"","sources":["../../../src/commands/app/Validate.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAgD;AAChD,yDAAoD;AACpD,uCAAkC;AAClC,uDAAkD;AAG3C,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,mCAAgB;IAGtC,AAAN,KAAK,CAAC,QAAQ;QACnB,IAAI;YACF,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,iCAAiC,CAAC,CAAC,CAAC;SACnG;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AARc;IAFZ,gBAAO;IACP,IAAA,aAAI,EAAC,yBAAyB,CAAC;+CAQ/B;AAVU,eAAe;IAD3B,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,eAAe,CAW3B;AAXY,0CAAe"}
package/dist/commands/env/GetEnvironment.js CHANGED
@@ -10,11 +10,18 @@ exports.GetEnvironmentCommand = void 0;
10
10
  const chalk = require("chalk");
11
11
  const oo_cli_1 = require("oo-cli");
12
12
  const Config_1 = require("../../lib/Config");
13
+ const die_1 = require("../../lib/die");
14
+ const formatError_1 = require("../../lib/formatError");
13
15
  let GetEnvironmentCommand = class GetEnvironmentCommand {
14
16
  get() {
15
- console.log(`Using ${chalk.yellow((0, Config_1.getEnv)())} environment\n`);
16
- console.log('Configuration:');
17
- console.log(chalk.gray(require('js-yaml').dump((0, Config_1.runtimeConfig)())));
17
+ try {
18
+ console.log(`Using ${chalk.yellow((0, Config_1.getEnv)())} environment\n`);
19
+ console.log('Configuration:');
20
+ console.log(chalk.gray(require('js-yaml').dump((0, Config_1.runtimeConfig)())));
21
+ }
22
+ catch (e) {
23
+ (0, die_1.die)((0, formatError_1.formatError)(e));
24
+ }
18
25
  }
19
26
  };
20
27
  __decorate([
package/dist/commands/env/GetEnvironment.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GetEnvironment.js","sourceRoot":"","sources":["../../../src/commands/env/GetEnvironment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAgD;AAChD,6CAAuD;AAGhD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGzB,GAAG;QACR,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,IAAA,eAAM,GAAE,CAAC,gBAAgB,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AALC;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,wCAAwC,CAAC;gDAK9C;AAPU,qBAAqB;IADjC,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,qBAAqB,CAQjC;AARY,sDAAqB"}
1
+ {"version":3,"file":"GetEnvironment.js","sourceRoot":"","sources":["../../../src/commands/env/GetEnvironment.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAgD;AAChD,6CAAuD;AACvD,uCAAkC;AAClC,uDAAkD;AAG3C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAGzB,GAAG;QACR,IAAI;YACF,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,IAAA,eAAM,GAAE,CAAC,gBAAgB,CAAC,CAAC;YAC7D,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAA,sBAAa,GAAE,CAAC,CAAC,CAAC,CAAC;SACnE;QAAC,OAAO,CAAM,EAAE;YACf,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC;SACrB;IACH,CAAC;CACF,CAAA;AATC;IAFC,gBAAO;IACP,IAAA,aAAI,EAAC,wCAAwC,CAAC;gDAS9C;AAXU,qBAAqB;IADjC,IAAA,kBAAS,EAAC,KAAK,CAAC;GACJ,qBAAqB,CAYjC;AAZY,sDAAqB"}
package/dist/commands/env/SetEnvironment.js CHANGED
@@ -13,6 +13,8 @@ const path = require("path");
13
13
  const chalk = require("chalk");
14
14
  const oo_cli_1 = require("oo-cli");
15
15
  const Config_1 = require("../../lib/Config");
16
+ const die_1 = require("../../lib/die");
17
+ const formatError_1 = require("../../lib/formatError");
16
18
  const STAGING_ENV = {
17
19
  'OCP_ENV': 'staging',
18
20
  'RIVENDELL': 'https://rivendell.staging.zaius.com',
@@ -22,29 +24,34 @@ const STAGING_ENV = {
22
24
  const ENV_WHITELIST = ['staging', 'production'];
23
25
  let SetEnvironmentCommand = class SetEnvironmentCommand {
24
26
  set() {
25
- if (ENV_WHITELIST.includes(this.env)) {
26
- const envPath = path.join(os.homedir(), '.ocp');
27
- const envFile = path.join(envPath, `.env`);
28
- const setEnvFile = `${envFile}.${this.env}`;
29
- if (fs.existsSync(envFile)) {
30
- fs.renameSync(envFile, `${envFile}.${(0, Config_1.getEnv)()}`);
31
- }
32
- if (fs.existsSync(setEnvFile)) {
33
- fs.renameSync(setEnvFile, envFile);
34
- }
35
- else if (this.env === 'staging') {
36
- try {
37
- fs.statSync(envPath);
27
+ try {
28
+ if (ENV_WHITELIST.includes(this.env)) {
29
+ const envPath = path.join(os.homedir(), '.ocp');
30
+ const envFile = path.join(envPath, `.env`);
31
+ const setEnvFile = `${envFile}.${this.env}`;
32
+ if (fs.existsSync(envFile)) {
33
+ fs.renameSync(envFile, `${envFile}.${(0, Config_1.getEnv)()}`);
38
34
  }
39
- catch (_a) {
40
- fs.mkdirSync(envPath);
35
+ if (fs.existsSync(setEnvFile)) {
36
+ fs.renameSync(setEnvFile, envFile);
41
37
  }
42
- fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
38
+ else if (this.env === 'staging') {
39
+ try {
40
+ fs.statSync(envPath);
41
+ }
42
+ catch (_a) {
43
+ fs.mkdirSync(envPath);
44
+ }
45
+ fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
46
+ }
47
+ console.log(chalk.yellow(`using ${this.env} environment`));
48
+ }
49
+ else {
50
+ console.log(chalk.red(`Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
43
51
  }
44
- console.log(chalk.yellow(`using ${this.env} environment`));
45
52
  }
46
- else {
47
- console.log(chalk.red(`Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
53
+ catch (e) {
54
+ (0, die_1.die)((0, formatError_1.formatError)(e));
48
55
  }
49
56
  }
50
57
  };
package/dist/commands/env/SetEnvironment.js.map CHANGED
@@ -1 +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"}
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;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 CHANGED
@@ -27,5 +27,7 @@ async function run() {
27
27
  await (0, checkForUpdate_1.checkForUpdate)(manifest);
28
28
  new oo_cli_1.Runner(__dirname, manifest).run();
29
29
  }
30
+ // catch does not work here sadly for async functions as oo-cli lib does not wait for the promise to resolve
31
+ // use try/catch instead in every command
30
32
  run().catch((e) => (0, die_1.die)((0, formatError_1.formatError)(e)));
31
33
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +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"}
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,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 CHANGED
@@ -1,3 +1,4 @@
1
+ import { AppManifest } from '@zaiusinc/app-sdk';
1
2
  export interface AppContext {
2
3
  appId?: string;
3
4
  displayName?: string;
@@ -6,4 +7,4 @@ export interface AppContext {
6
7
  runtime?: string;
7
8
  }
8
9
  export declare function appContext(appId?: string, vendor?: string, runtime?: string): AppContext;
9
- export declare function readAppYaml(): any;
10
+ export declare function readAppYaml(): AppManifest;
package/dist/lib/AppContext.js CHANGED
@@ -34,10 +34,10 @@ function appContext(appId, vendor, runtime) {
34
34
  exports.appContext = appContext;
35
35
  function readAppYaml() {
36
36
  const file = path.join(process.cwd(), 'app.yml');
37
- if (fs.existsSync(file)) {
38
- return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
37
+ if (!fs.existsSync(file)) {
38
+ throw new Error(`Can not find app manifest (app.yaml) in working directory. Please run this command from the root of your app.`);
39
39
  }
40
- return false;
40
+ return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
41
41
  }
42
42
  exports.readAppYaml = readAppYaml;
43
43
  //# sourceMappingURL=AppContext.js.map
package/dist/lib/AppContext.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -324,7 +324,7 @@
324
324
  "key": "register",
325
325
  "command": "register",
326
326
  "aliases": [],
327
- "help": "Register an app version",
327
+ "help": "Register an app in all shards",
328
328
  "documentation": "TBD",
329
329
  "flags": [
330
330
  {
@@ -337,18 +337,7 @@
337
337
  "invertible": false
338
338
  }
339
339
  ],
340
- "options": [
341
- {
342
- "name": "availability",
343
- "key": "availability",
344
- "aliases": [
345
- "a"
346
- ],
347
- "help": "The availability zone that will be targeted (default: us)",
348
- "optional": true,
349
- "multiple": false
350
- }
351
- ],
340
+ "options": [],
352
341
  "params": [
353
342
  {
354
343
  "name": "id",
@@ -1238,7 +1227,7 @@
1238
1227
  },
1239
1228
  "commands": [],
1240
1229
  "package": {
1241
- "version": "1.0.4",
1230
+ "version": "1.0.5",
1242
1231
  "name": "@optimizely/ocp-cli",
1243
1232
  "license": "Apache-2.0",
1244
1233
  "executable": "ocp"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@optimizely/ocp-cli",
3
- "version": "1.0.4",
3
+ "version": "1.0.5",
4
4
  "description": "Optimizely Connect Platform command line interface",
5
5
  "repository": "https://github.com/ZaiusInc/ocp-cli",
6
6
  "license": "Apache-2.0",
package/src/commands/app/Init.ts CHANGED
@@ -21,6 +21,7 @@ import titleCase = require('title-case');
21
21
  import { getDependencyFileUrl } from '../../lib/Config';
22
22
  import {Rivendell} from '../../lib/Rivendell';
23
23
  import {die} from '../../lib/die';
24
+ import {formatError} from '../../lib/formatError';
24
25
 
25
26
  @namespace('app')
26
27
  export class CreateCommand {
@@ -38,21 +39,25 @@ export class CreateCommand {
38
39
  @command
39
40
  @help('Create a new app project')
40
41
  public async init() {
41
- handleInterrupt();
42
- this.manifest = await fetchTemplatesManifest();
42
+ try {
43
+ handleInterrupt();
44
+ this.manifest = await fetchTemplatesManifest();
43
45
 
44
- // start with base variables
45
- this.variables = this.manifest.baseTemplateVariables;
46
+ // start with base variables
47
+ this.variables = this.manifest.baseTemplateVariables;
46
48
 
47
- // setting developer vendor
48
- this.variables.find((v) => v.name === 'vendor')!.suggest = (await Rivendell.whoami()).vendor;
49
+ // setting developer vendor
50
+ this.variables.find((v) => v.name === 'vendor')!.suggest = (await Rivendell.whoami()).vendor;
49
51
 
50
- this.variables.push({
51
- name: 'template',
52
- question: 'Select a template project'
53
- });
54
- if (!await this.askQuestion()) {
55
- process.exit(1);
52
+ this.variables.push({
53
+ name: 'template',
54
+ question: 'Select a template project'
55
+ });
56
+ if (!await this.askQuestion()) {
57
+ process.exit(1);
58
+ }
59
+ } catch (e: any) {
60
+ die(formatError(e));
56
61
  }
57
62
  }
58
63
 
package/src/commands/app/Package.ts CHANGED
@@ -5,6 +5,7 @@ import {appContext} from '../../lib/AppContext';
5
5
  import {AppPackager} from '../../lib/AppPackager';
6
6
  import {die} from '../../lib/die';
7
7
  import {directoryExists} from '../../lib/directoryExists';
8
+ import {formatError} from '../../lib/formatError';
8
9
 
9
10
  @namespace('app')
10
11
  export class PackageCommand {
@@ -16,24 +17,28 @@ export class PackageCommand {
16
17
  @command
17
18
  @help('Prepare a package for manual upload')
18
19
  public package() {
19
- const workingDir = process.cwd();
20
- if (!directoryExists(this.path)) {
21
- die('Specified path to app does not exist');
22
- return;
23
- }
24
- process.chdir(this.path);
20
+ try {
21
+ const workingDir = process.cwd();
22
+ if (!directoryExists(this.path)) {
23
+ die('Specified path to app does not exist');
24
+ return;
25
+ }
26
+ process.chdir(this.path);
25
27
 
26
- const context = appContext();
27
- if (!context.appId || !context.version) {
28
- die('Unable to read App ID or version info. Ensure you are uploading the right directory.');
29
- return;
30
- }
28
+ const context = appContext();
29
+ if (!context.appId || !context.version) {
30
+ die('Unable to read App ID or version info. Ensure you are uploading the right directory.');
31
+ return;
32
+ }
31
33
 
32
- if (context) {
33
- const packageData = new AppPackager('./').package();
34
- const zipFileName = `${context.appId}@${context.version}.zip`;
35
- fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
36
- console.log(`Created package ${zipFileName}`);
34
+ if (context) {
35
+ const packageData = new AppPackager('./').package();
36
+ const zipFileName = `${context.appId}@${context.version}.zip`;
37
+ fs.writeFileSync(path.join(workingDir, zipFileName), packageData);
38
+ console.log(`Created package ${zipFileName}`);
39
+ }
40
+ } catch (e: any) {
41
+ die(formatError(e));
37
42
  }
38
43
  }
39
44
  }
package/src/commands/app/Prepare.ts CHANGED
@@ -9,6 +9,8 @@ import * as fs from 'fs';
9
9
  import * as path from 'path';
10
10
  import {Rivendell} from '../../lib/Rivendell';
11
11
  import AppReview = Rivendell.AppReview;
12
+ import {formatError} from '../../lib/formatError';
13
+ import {die} from '../../lib/die';
12
14
 
13
15
  @namespace('app')
14
16
  export class PrepareCommand extends BaseBuildCommand {
@@ -27,78 +29,82 @@ export class PrepareCommand extends BaseBuildCommand {
27
29
  @command
28
30
  @help('Validate, package, upload and build an app to prepare for publishing')
29
31
  public async prepare() {
30
- const context = appContext();
31
- if (!context.appId || !context.version) {
32
- console.log(chalk.gray('App id or version missing in the manifest\n'));
33
- return;
34
- }
35
- const requiresReview = await this.requiresReview(context.version);
36
- if (requiresReview) {
37
- const isInReview = await this.isInReview(context.appId, context.version);
38
- const reviewMessage = isInReview ?
39
- chalk.gray(
40
- 'The app version is already in review. This will update the review and the app can\'t be published until it is approved. ' +
41
- `${chalk.yellow('Are you sure?')}`
42
- ) :
43
- chalk.gray(
44
- 'You are uploading a release version of the app. ' +
45
- 'This will start a review process and the app can\'t be published until it is approved. ' +
46
- `${chalk.yellow('Are you sure?')}`
47
- );
48
-
49
- const reviewConfirmation = await TerminalConfirm.ask(reviewMessage);
50
- if (!reviewConfirmation) {
32
+ try {
33
+ const context = appContext();
34
+ if (!context.appId || !context.version) {
35
+ console.log(chalk.gray('App id or version missing in the manifest\n'));
51
36
  return;
52
37
  }
53
- }
38
+ const requiresReview = await this.requiresReview(context.version);
39
+ if (requiresReview) {
40
+ const isInReview = await this.isInReview(context.appId, context.version);
41
+ const reviewMessage = isInReview ?
42
+ chalk.gray(
43
+ 'The app version is already in review. This will update the review and the app can\'t be published until it is approved. ' +
44
+ `${chalk.yellow('Are you sure?')}`
45
+ ) :
46
+ chalk.gray(
47
+ 'You are uploading a release version of the app. ' +
48
+ 'This will start a review process and the app can\'t be published until it is approved. ' +
49
+ `${chalk.yellow('Are you sure?')}`
50
+ );
54
51
 
55
- if (context.version && this.bumpDevVersion) {
56
- if (this.isDevVersion(context.version)) {
57
- const bumpedVersion = semver.parse(context.version)?.inc('prerelease', 'dev').format();
58
- if (!bumpedVersion) {
59
- console.log(chalk.red(`Cannot parse app version: ${context.version}`));
52
+ const reviewConfirmation = await TerminalConfirm.ask(reviewMessage);
53
+ if (!reviewConfirmation) {
60
54
  return;
61
55
  }
56
+ }
62
57
 
63
- console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
58
+ if (context.version && this.bumpDevVersion) {
59
+ if (this.isDevVersion(context.version)) {
60
+ const bumpedVersion = semver.parse(context.version)?.inc('prerelease', 'dev').format();
61
+ if (!bumpedVersion) {
62
+ console.log(chalk.red(`Cannot parse app version: ${context.version}`));
63
+ return;
64
+ }
64
65
 
65
- this.updateVersionInAppManifest(context.version, bumpedVersion);
66
- context.version = bumpedVersion;
67
- } else {
68
- console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
69
- }
70
- }
66
+ console.log(chalk.gray(`Bumping dev version to ${bumpedVersion}`));
71
67
 
72
- await this.run(true, true, this.usePreviousAppEnvValues);
73
- await this.reviewAppVersion(context.appId as string, context.version as string);
68
+ this.updateVersionInAppManifest(context.version, bumpedVersion);
69
+ context.version = bumpedVersion;
70
+ } else {
71
+ console.log(chalk.yellow('Not a dev version. Ignoring --bump-dev-version flag'));
72
+ }
73
+ }
74
74
 
75
- if (this.publish) {
76
- const cmd = new PublishCommand();
77
- cmd.appVersion = `${context.appId}@${context.version}`;
78
- await cmd.publish();
79
- } else {
80
- if (requiresReview) {
81
- const appVersion = `${context.appId}@${context.version}`;
82
- const appReview = await Rivendell.getReviewUrl(appVersion);
83
- const reviewUrl = (appReview as AppReview).url;
75
+ await this.run(true, true, this.usePreviousAppEnvValues);
76
+ await this.reviewAppVersion(context.appId as string, context.version as string);
84
77
 
85
- console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
86
- `and you will receive an invitation from GitHub by email for access.` +
87
- `It is important you accept this invitation in order to receive communications about your app from the review team.`));
88
- console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
89
- console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
90
- console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
78
+ if (this.publish) {
79
+ const cmd = new PublishCommand();
80
+ cmd.appVersion = `${context.appId}@${context.version}`;
81
+ await cmd.publish();
91
82
  } else {
92
- console.log(chalk.gray(
93
- `\nUse ${chalk.white(
94
- `ocp directory publish ${context.appId}@${context.version}`
95
- )} to publish and release your app\n`
96
- ));
83
+ if (requiresReview) {
84
+ const appVersion = `${context.appId}@${context.version}`;
85
+ const appReview = await Rivendell.getReviewUrl(appVersion);
86
+ const reviewUrl = (appReview as AppReview).url;
87
+
88
+ console.log(chalk.gray(`\nYour app has been sent to review. Your code will be available in a private repository on GitHub, ` +
89
+ `and you will receive an invitation from GitHub by email for access.` +
90
+ `It is important you accept this invitation in order to receive communications about your app from the review team.`));
91
+ console.log(chalk.gray(`\nOnce the review is approved, your app can be deployed to app directory.\n`));
92
+ console.log(chalk.gray(`You can run ${chalk.white(`ocp review open ${appVersion}`)} to open the review URL at any time.`));
93
+ console.log(chalk.gray(`The URL for your repo is ${chalk.white(`${reviewUrl}`)}\n`));
94
+ } else {
95
+ console.log(chalk.gray(
96
+ `\nUse ${chalk.white(
97
+ `ocp directory publish ${context.appId}@${context.version}`
98
+ )} to publish and release your app\n`
99
+ ));
100
+ }
97
101
  }
98
- }
99
102
 
100
- // explicitly exit because we're using terminal kit
101
- process.exit(0);
103
+ // explicitly exit because we're using terminal kit
104
+ process.exit(0);
105
+ } catch (e: any) {
106
+ die(formatError(e));
107
+ }
102
108
  }
103
109
 
104
110
  private updateVersionInAppManifest(oldVersion: string, newVersion: string) {
package/src/commands/app/Register.ts CHANGED
@@ -1,8 +1,10 @@
1
- import {command, flag, help, namespace, option, param} from 'oo-cli';
1
+ import {command, flag, help, namespace, param} from 'oo-cli';
2
2
  import {die} from '../../lib/die';
3
3
  import {formatError} from '../../lib/formatError';
4
4
  import {Rivendell} from '../../lib/Rivendell';
5
- import {applicableShards} from '../../lib/Shards';
5
+ import {RivendellApi} from '../../lib/RivendellApi';
6
+ import ApiError = RivendellApi.ApiError;
7
+ import {constants as httpConstants} from 'http2';
6
8
 
7
9
  @namespace('app')
8
10
  export class RegisterCommand {
@@ -21,18 +23,36 @@ export class RegisterCommand {
21
23
  )
22
24
  public personal: boolean = false;
23
25
 
24
- @option('a')
25
- @help('The availability zone that will be targeted (default: us)')
26
- private availability: string = '';
27
-
28
26
  @command
29
- @help('Register an app version')
27
+ @help('Register an app in all shards')
30
28
  public async register() {
31
29
  try {
32
- const shards = await applicableShards(this.availability);
30
+ const shards = await Rivendell.shards();
31
+ console.log(`Registering app ${this.id} in all shards`);
33
32
  for (const shard of shards) {
34
- const app = await Rivendell.registerApp(this.id, this.name, this.personal, shard);
35
- console.log(`Registered app ${app.id} with name "${app.name} in ${shard}`);
33
+ try {
34
+ const app = await Rivendell.registerApp(this.id, this.name, this.personal, shard.id);
35
+ console.log(`Registered app ${app.id} with name "${app.name} in ${shard.id}`);
36
+ } catch (e: any) {
37
+ if (e instanceof ApiError && e.response?.status === httpConstants.HTTP_STATUS_CONFLICT) {
38
+ // check the developer has access to already registered app
39
+ try {
40
+ await Rivendell.fetchApp(this.id, shard.id);
41
+ } catch (fetchError: any) {
42
+ if (
43
+ fetchError instanceof ApiError && fetchError.response?.status === httpConstants.HTTP_STATUS_NOT_FOUND
44
+ ) {
45
+ throw new Error(`App ${this.id} already registered by another vendor`);
46
+ } else {
47
+ throw e;
48
+ }
49
+ }
50
+
51
+ console.log(`App ${this.id} is already registered in shard ${shard.id}`);
52
+ } else {
53
+ throw e;
54
+ }
55
+ }
36
56
  }
37
57
  } catch (e: any) {
38
58
  die(formatError(e));
package/src/commands/app/Validate.ts CHANGED
@@ -1,13 +1,19 @@
1
1
  import * as chalk from 'chalk';
2
2
  import {command, help, namespace} from 'oo-cli';
3
3
  import {BaseBuildCommand} from './BaseBuildCommand';
4
+ import {die} from '../../lib/die';
5
+ import {formatError} from '../../lib/formatError';
4
6
 
5
7
  @namespace('app')
6
8
  export class ValidateCommand extends BaseBuildCommand {
7
9
  @command
8
10
  @help('Validate an app locally')
9
11
  public async validate() {
10
- await this.run(false, false, false);
11
- console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
12
+ try {
13
+ await this.run(false, false, false);
14
+ console.log(chalk.gray(`\nUse ${chalk.white('ocp app prepare')} to upload and build your app\n`));
15
+ } catch (e: any) {
16
+ die(formatError(e));
17
+ }
12
18
  }
13
19
  }
package/src/commands/env/GetEnvironment.ts CHANGED
@@ -1,14 +1,20 @@
1
1
  import * as chalk from 'chalk';
2
2
  import {command, help, namespace} from 'oo-cli';
3
3
  import {getEnv, runtimeConfig} from '../../lib/Config';
4
+ import {die} from '../../lib/die';
5
+ import {formatError} from '../../lib/formatError';
4
6
 
5
7
  @namespace('env')
6
8
  export class GetEnvironmentCommand {
7
9
  @command
8
10
  @help('Get the current environment of the CLI')
9
11
  public get() {
10
- console.log(`Using ${chalk.yellow(getEnv())} environment\n`);
11
- console.log('Configuration:');
12
- console.log(chalk.gray(require('js-yaml').dump(runtimeConfig())));
12
+ try {
13
+ console.log(`Using ${chalk.yellow(getEnv())} environment\n`);
14
+ console.log('Configuration:');
15
+ console.log(chalk.gray(require('js-yaml').dump(runtimeConfig())));
16
+ } catch (e: any) {
17
+ die(formatError(e));
18
+ }
13
19
  }
14
20
  }
package/src/commands/env/SetEnvironment.ts CHANGED
@@ -4,6 +4,8 @@ import * as path from 'path';
4
4
  import * as chalk from 'chalk';
5
5
  import {command, help, namespace, param} from 'oo-cli';
6
6
  import { getEnv } from '../../lib/Config';
7
+ import {die} from '../../lib/die';
8
+ import {formatError} from '../../lib/formatError';
7
9
 
8
10
  const STAGING_ENV = {
9
11
  'OCP_ENV': 'staging',
@@ -23,30 +25,34 @@ export class SetEnvironmentCommand {
23
25
  @command
24
26
  @help('Set the current environment for the CLI')
25
27
  public set() {
26
- if (ENV_WHITELIST.includes(this.env)) {
27
- const envPath = path.join(os.homedir(), '.ocp');
28
- const envFile = path.join(envPath, `.env`);
29
- const setEnvFile = `${envFile}.${this.env}`;
28
+ try {
29
+ if (ENV_WHITELIST.includes(this.env)) {
30
+ const envPath = path.join(os.homedir(), '.ocp');
31
+ const envFile = path.join(envPath, `.env`);
32
+ const setEnvFile = `${envFile}.${this.env}`;
30
33
 
31
- if (fs.existsSync(envFile)) {
32
- fs.renameSync(envFile, `${envFile}.${getEnv()}`);
33
- }
34
+ if (fs.existsSync(envFile)) {
35
+ fs.renameSync(envFile, `${envFile}.${getEnv()}`);
36
+ }
34
37
 
35
- if (fs.existsSync(setEnvFile)) {
36
- fs.renameSync(setEnvFile, envFile);
37
- } else if (this.env === 'staging') {
38
- try {
39
- fs.statSync(envPath);
40
- } catch {
41
- fs.mkdirSync(envPath);
38
+ if (fs.existsSync(setEnvFile)) {
39
+ fs.renameSync(setEnvFile, envFile);
40
+ } else if (this.env === 'staging') {
41
+ try {
42
+ fs.statSync(envPath);
43
+ } catch {
44
+ fs.mkdirSync(envPath);
45
+ }
46
+ fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
42
47
  }
43
- fs.writeFileSync(envFile, Object.entries(STAGING_ENV).map((x) => x.join('=')).join('\n'));
44
- }
45
48
 
46
- console.log(chalk.yellow(`using ${this.env} environment`));
47
- } else {
48
- console.log(chalk.red(
49
- `Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
49
+ console.log(chalk.yellow(`using ${this.env} environment`));
50
+ } else {
51
+ console.log(chalk.red(
52
+ `Could not switch to environment ${this.env}. Permitted environments are ${ENV_WHITELIST}`));
53
+ }
54
+ } catch (e: any) {
55
+ die(formatError(e));
50
56
  }
51
57
  }
52
58
  }
package/src/index.ts CHANGED
@@ -36,4 +36,6 @@ async function run() {
36
36
  new Runner(__dirname, manifest).run();
37
37
  }
38
38
 
39
+ // catch does not work here sadly for async functions as oo-cli lib does not wait for the promise to resolve
40
+ // use try/catch instead in every command
39
41
  run().catch((e) => die(formatError(e)));
package/src/lib/AppContext.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import * as fs from 'fs';
2
2
  import * as jsYaml from 'js-yaml';
3
3
  import * as path from 'path';
4
+ import {AppManifest} from '@zaiusinc/app-sdk';
4
5
 
5
6
  export interface AppContext {
6
7
  appId?: string;
@@ -38,10 +39,13 @@ export function appContext(appId?: string, vendor?: string, runtime?: string): A
38
39
  return {};
39
40
  }
40
41
 
41
- export function readAppYaml() {
42
+ export function readAppYaml(): AppManifest {
42
43
  const file = path.join(process.cwd(), 'app.yml');
43
- if (fs.existsSync(file)) {
44
- return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
44
+ if (!fs.existsSync(file)) {
45
+ throw new Error(
46
+ `Can not find app manifest (app.yaml) in working directory. Please run this command from the root of your app.`
47
+ );
45
48
  }
46
- return false;
49
+
50
+ return jsYaml.safeLoad(fs.readFileSync(file, 'utf8'));
47
51
  }