@optimizely/ocp-cli 1.0.15 → 1.1.1
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.
- package/dist/commands/app/BaseBuildCommand.d.ts +1 -0
- package/dist/commands/app/BaseBuildCommand.js +6 -1
- package/dist/commands/app/BaseBuildCommand.js.map +1 -1
- package/dist/commands/app/Prepare.js +1 -1
- package/dist/commands/app/Prepare.js.map +1 -1
- package/dist/commands/directory/Publish.d.ts +1 -0
- package/dist/commands/directory/Publish.js +17 -3
- package/dist/commands/directory/Publish.js.map +1 -1
- package/dist/commands/directory/Unpublish.d.ts +1 -0
- package/dist/commands/directory/Unpublish.js +12 -15
- package/dist/commands/directory/Unpublish.js.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/AppUpdater.d.ts +1 -1
- package/dist/lib/AppUpdater.js +2 -2
- package/dist/lib/AppUpdater.js.map +1 -1
- package/dist/lib/TerminalConfirm.d.ts +1 -1
- package/dist/lib/TerminalConfirm.js +6 -1
- package/dist/lib/TerminalConfirm.js.map +1 -1
- package/dist/lib/checkForUpdate.d.ts +1 -1
- package/dist/lib/checkForUpdate.js +2 -2
- package/dist/lib/checkForUpdate.js.map +1 -1
- package/dist/lib/migrateOptiCli.d.ts +1 -1
- package/dist/lib/migrateOptiCli.js +2 -2
- package/dist/lib/migrateOptiCli.js.map +1 -1
- package/dist/oo-cli.manifest.json +45 -1
- package/package.json +1 -1
- package/src/commands/app/BaseBuildCommand.ts +5 -1
- package/src/commands/app/Prepare.ts +1 -1
- package/src/commands/directory/Publish.ts +17 -3
- package/src/commands/directory/Unpublish.ts +12 -14
- package/src/index.ts +4 -2
- package/src/lib/AppUpdater.ts +2 -2
- package/src/lib/TerminalConfirm.ts +8 -1
- package/src/lib/checkForUpdate.ts +3 -2
- package/src/lib/migrateOptiCli.ts +2 -2
|
@@ -6,6 +6,7 @@ export declare abstract class BaseBuildCommand {
|
|
|
6
6
|
upgradeDeps: boolean;
|
|
7
7
|
path: string;
|
|
8
8
|
rcDependencies: boolean;
|
|
9
|
+
noPrompt: boolean;
|
|
9
10
|
protected run(upload: boolean, publish: boolean, usePreviousAppEnvValues: boolean): Promise<void>;
|
|
10
11
|
protected fetchAppVersion(context: AppContext, shard: string): Promise<AppVersion | null>;
|
|
11
12
|
protected isRelease(appVersionId: string): boolean;
|
|
@@ -32,6 +32,7 @@ var ReviewStatus = Rivendell_1.Rivendell.ReviewStatus;
|
|
|
32
32
|
class BaseBuildCommand {
|
|
33
33
|
constructor() {
|
|
34
34
|
this.rcDependencies = false;
|
|
35
|
+
this.noPrompt = false;
|
|
35
36
|
}
|
|
36
37
|
async run(upload, publish, usePreviousAppEnvValues) {
|
|
37
38
|
(0, handleInterrupt_1.handleInterrupt)();
|
|
@@ -52,7 +53,7 @@ class BaseBuildCommand {
|
|
|
52
53
|
(0, gatherAppEnv_1.validateAppEnvs)(await (0, Shards_1.targetShards)());
|
|
53
54
|
}
|
|
54
55
|
const shards = await (0, Shards_1.applicableShards)();
|
|
55
|
-
await AppUpdater_1.AppUpdater.ensureDependencies(upload, this.upgradeDeps, context.runtime, true, this.rcDependencies ? 'rc' : 'stable');
|
|
56
|
+
await AppUpdater_1.AppUpdater.ensureDependencies(upload, this.noPrompt || this.upgradeDeps, context.runtime, true, this.rcDependencies ? 'rc' : 'stable');
|
|
56
57
|
console.log(chalk.gray('Performing local validation...'));
|
|
57
58
|
try {
|
|
58
59
|
(0, child_process_1.execSync)('yarn --silent validate', { stdio: 'inherit' });
|
|
@@ -232,5 +233,9 @@ __decorate([
|
|
|
232
233
|
(0, oo_cli_1.flag)('rc-dependencies'),
|
|
233
234
|
(0, oo_cli_1.help)('Use unstable OCP dependencies. Only allowed for dev builds.')
|
|
234
235
|
], BaseBuildCommand.prototype, "rcDependencies", void 0);
|
|
236
|
+
__decorate([
|
|
237
|
+
(0, oo_cli_1.flag)('no-prompt'),
|
|
238
|
+
(0, oo_cli_1.help)('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
239
|
+
], BaseBuildCommand.prototype, "noPrompt", void 0);
|
|
235
240
|
exports.BaseBuildCommand = BaseBuildCommand;
|
|
236
241
|
//# sourceMappingURL=BaseBuildCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseBuildCommand.js","sourceRoot":"","sources":["../../../src/commands/app/BaseBuildCommand.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,iDAAuC;AAEvC,mCAAuD;AACvD,qDAA4D;AAC5D,uDAAkD;AAClD,qDAAgD;AAChD,uDAAkD;AAClD,uCAAkC;AAClC,+DAA0D;AAC1D,iEAA4D;AAC5D,yDAAqE;AACrE,+DAA0D;AAC1D,+DAA0D;AAC1D,2CAAsD;AACtD,mDAA8C;AAC9C,uDAAkD;AAClD,yDAAoD;AACpD,6CAAgE;AAChE,IAAO,QAAQ,GAAG,2BAAY,CAAC,QAAQ,CAAC;AAExC,IAAO,UAAU,GAAG,qBAAS,CAAC,UAAU,CAAC;AAEzC,IAAO,eAAe,GAAG,qBAAS,CAAC,eAAe,CAAC;AACnD,IAAO,YAAY,GAAG,qBAAS,CAAC,YAAY,CAAC;AAE7C,MAAsB,gBAAgB;IAAtC;QAgBS,mBAAc,GAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseBuildCommand.js","sourceRoot":"","sources":["../../../src/commands/app/BaseBuildCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ let PrepareCommand = class PrepareCommand extends BaseBuildCommand_1.BaseBuildCo
|
|
|
41
41
|
chalk.gray('You are uploading a release version of the app. ' +
|
|
42
42
|
'This will start a review process and the app can\'t be published until it is approved. ' +
|
|
43
43
|
`${chalk.yellow('Are you sure?')}`);
|
|
44
|
-
const reviewConfirmation = await TerminalConfirm_1.TerminalConfirm.ask(reviewMessage);
|
|
44
|
+
const reviewConfirmation = await TerminalConfirm_1.TerminalConfirm.ask(reviewMessage, this.noPrompt, true);
|
|
45
45
|
if (!reviewConfirmation) {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Prepare.js","sourceRoot":"","sources":["../../../src/commands/app/Prepare.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAsD;AACtD,qDAAgD;AAChD,kDAAoD;AACpD,yDAAoD;AACpD,+DAA0D;AAC1D,iCAAiC;AACjC,yBAAyB;AACzB,6BAA6B;AAC7B,mDAA8C;AAE9C,uDAAkD;AAClD,uCAAkC;AAG3B,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,mCAAgB;IAA7C;;QAOE,4BAAuB,GAAY,KAAK,CAAC;IA2FlD,CAAC;IAnFc,AAAN,KAAK,CAAC,OAAO;;QAClB,IAAI;YACF,MAAM,OAAO,GAAG,IAAA,uBAAU,GAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACtC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC,CAAC;gBACvE,OAAO;aACR;YACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,cAAc,EAAE;gBAClB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;gBACzE,MAAM,aAAa,GAAG,UAAU,CAAC,CAAC;oBAChC,KAAK,CAAC,IAAI,CACR,0HAA0H;wBAC1H,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CACnC,CAAC,CAAC;oBACH,KAAK,CAAC,IAAI,CACR,kDAAkD;wBAClD,yFAAyF;wBACzF,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CACnC,CAAC;gBAEJ,MAAM,kBAAkB,GAAG,MAAM,iCAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Prepare.js","sourceRoot":"","sources":["../../../src/commands/app/Prepare.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,13 +29,17 @@ const PUBLISHABLE_STATES = [
|
|
|
29
29
|
AppVersionState.START_FAILED
|
|
30
30
|
];
|
|
31
31
|
let PublishCommand = class PublishCommand {
|
|
32
|
+
constructor() {
|
|
33
|
+
this.noPompt = false;
|
|
34
|
+
}
|
|
32
35
|
async publish() {
|
|
33
36
|
(0, handleInterrupt_1.handleInterrupt)();
|
|
34
37
|
if (!/[\w-]+@\d+\.\d+\.\d+(?:-\w+\.\d+)?/.test(this.appVersion)) {
|
|
35
|
-
|
|
38
|
+
(0, die_1.die)('appVersion is required in the format of app@1.0.0');
|
|
36
39
|
}
|
|
37
40
|
const [appId, version] = this.appVersion.split('@');
|
|
38
41
|
console.log(chalk.gray(`Publishing ${this.appVersion} to the directory...`));
|
|
42
|
+
let success = true;
|
|
39
43
|
try {
|
|
40
44
|
const primaryAppVersion = await Rivendell_1.Rivendell.fetchAppVersion({ appId, version }, 'us');
|
|
41
45
|
const manifest = JSON.parse(primaryAppVersion.manifestJson);
|
|
@@ -59,8 +63,10 @@ let PublishCommand = class PublishCommand {
|
|
|
59
63
|
terminal_kit_1.terminal.removeAllListeners('key');
|
|
60
64
|
}
|
|
61
65
|
catch (error) {
|
|
66
|
+
success = false;
|
|
62
67
|
console.error(chalk.red(`Error publishing in shard ${shard}: ${(0, formatError_1.formatError)(error)}`));
|
|
63
|
-
if (shards[shards.length - 1] !== shard &&
|
|
68
|
+
if (shards[shards.length - 1] !== shard &&
|
|
69
|
+
!await TerminalConfirm_1.TerminalConfirm.ask('Continue with other shards?', this.noPompt, true)) {
|
|
64
70
|
break;
|
|
65
71
|
}
|
|
66
72
|
}
|
|
@@ -73,6 +79,9 @@ let PublishCommand = class PublishCommand {
|
|
|
73
79
|
catch (e) {
|
|
74
80
|
(0, die_1.die)((0, formatError_1.formatError)(e));
|
|
75
81
|
}
|
|
82
|
+
if (!success) {
|
|
83
|
+
(0, die_1.die)(chalk.red(`Failed to publish ${this.appVersion} to all shards.`));
|
|
84
|
+
}
|
|
76
85
|
}
|
|
77
86
|
async checkOrphanedDeploys(appId, currentShards) {
|
|
78
87
|
const criteria = {
|
|
@@ -98,7 +107,8 @@ let PublishCommand = class PublishCommand {
|
|
|
98
107
|
`do you want to unpublish the following apps:`);
|
|
99
108
|
console.log(Object.entries(undeployVersions)
|
|
100
109
|
.map((x) => x[1].map((y) => `* ${y.id.appId}@${y.id.version} in ${x[0]}`).join('\n')).join('\n'));
|
|
101
|
-
|
|
110
|
+
// when noPrompt flag is enabled, default answer is no for destructive operation
|
|
111
|
+
if (await TerminalConfirm_1.TerminalConfirm.ask(chalk.red('Do you want to unpublish the listed AppVersions now?'), this.noPompt, false)) {
|
|
102
112
|
for (const [shard, toUndeploy] of Object.entries(undeployVersions)) {
|
|
103
113
|
for (const version of toUndeploy) {
|
|
104
114
|
const unpublish = new Unpublish_1.UnpublishCommand();
|
|
@@ -170,6 +180,10 @@ __decorate([
|
|
|
170
180
|
oo_cli_1.param,
|
|
171
181
|
(0, oo_cli_1.help)('The App ID and version (e.g. my_app@1.0.0)')
|
|
172
182
|
], PublishCommand.prototype, "appVersion", void 0);
|
|
183
|
+
__decorate([
|
|
184
|
+
(0, oo_cli_1.flag)('no-prompt'),
|
|
185
|
+
(0, oo_cli_1.help)('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
186
|
+
], PublishCommand.prototype, "noPompt", void 0);
|
|
173
187
|
__decorate([
|
|
174
188
|
oo_cli_1.command,
|
|
175
189
|
(0, oo_cli_1.help)('Publish (make available) a specific app version that has been reviewed and approved')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Publish.js","sourceRoot":"","sources":["../../../src/commands/directory/Publish.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAA6D;AAC7D,+CAAsC;AAEtC,uCAAkC;AAClC,qEAAgE;AAChE,+DAA0D;AAC1D,+DAA0D;AAC1D,mDAA8C;AAC9C,uDAAkD;AAClD,IAAO,eAAe,GAAG,qBAAS,CAAC,eAAe,CAAC;AACnD,6CAAkD;AAElD,mCAA8C;AAC9C,2CAA+C;AAC/C,+DAA4D;AAE5D,MAAM,cAAc,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;AAC5G,MAAM,oBAAoB,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;AAClH,MAAM,kBAAkB,GAAG;IACzB,eAAe,CAAC,GAAG;IACnB,eAAe,CAAC,SAAS;IACzB,eAAe,CAAC,YAAY;CAC7B,CAAC;AAGK,IAAM,cAAc,GAApB,MAAM,cAAc;
|
|
1
|
+
{"version":3,"file":"Publish.js","sourceRoot":"","sources":["../../../src/commands/directory/Publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.UnpublishCommand = void 0;
|
|
10
10
|
const chalk = require("chalk");
|
|
11
11
|
const oo_cli_1 = require("oo-cli");
|
|
12
|
-
const terminal_kit_1 = require("terminal-kit");
|
|
13
12
|
const die_1 = require("../../lib/die");
|
|
14
13
|
const formatVersionState_1 = require("../../lib/formatVersionState");
|
|
15
14
|
const handleInterrupt_1 = require("../../lib/handleInterrupt");
|
|
@@ -24,6 +23,7 @@ const UNPUBLISHABLE_STATES = [AppVersionState.RUNNING, AppVersionState.START_FAI
|
|
|
24
23
|
let UnpublishCommand = class UnpublishCommand {
|
|
25
24
|
constructor() {
|
|
26
25
|
this.availability = '';
|
|
26
|
+
this.noPrompt = false;
|
|
27
27
|
}
|
|
28
28
|
async unpublish() {
|
|
29
29
|
(0, handleInterrupt_1.handleInterrupt)();
|
|
@@ -40,7 +40,7 @@ let UnpublishCommand = class UnpublishCommand {
|
|
|
40
40
|
}
|
|
41
41
|
const manifest = JSON.parse(primaryAppVersion.manifestJson);
|
|
42
42
|
const shards = await (0, Shards_1.applicableShards)(this.availability, manifest);
|
|
43
|
-
if (!
|
|
43
|
+
if (!await TerminalConfirm_1.TerminalConfirm.ask(chalk.red('Unpublishing is not reversible. Are you sure you want to unpublish? [y/n]'), this.noPrompt, true)) {
|
|
44
44
|
(0, die_1.die)('Operation cancelled.');
|
|
45
45
|
}
|
|
46
46
|
for (const shard of shards) {
|
|
@@ -65,7 +65,8 @@ let UnpublishCommand = class UnpublishCommand {
|
|
|
65
65
|
}
|
|
66
66
|
catch (error) {
|
|
67
67
|
console.error(chalk.red(`Error unpublishing in shard ${shard}: ${(0, formatError_1.formatError)(error)}`));
|
|
68
|
-
if (shards[shards.length - 1] !== shard &&
|
|
68
|
+
if (shards[shards.length - 1] !== shard &&
|
|
69
|
+
!await TerminalConfirm_1.TerminalConfirm.ask('Continue with other shards?', this.noPrompt, true)) {
|
|
69
70
|
break;
|
|
70
71
|
}
|
|
71
72
|
}
|
|
@@ -109,18 +110,10 @@ let UnpublishCommand = class UnpublishCommand {
|
|
|
109
110
|
console.log(`${this.appVersion} is currently installed in ${trackers.length} account(s) in ${shard}:`);
|
|
110
111
|
console.log(` (${trackers.join(', ')})\n`);
|
|
111
112
|
console.log(chalk.red('Are you sure you want to uninstall from all these accounts? [y/n]'));
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
else if (yes) {
|
|
117
|
-
await doIt();
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
console.log(`Aborted. No changes made to ${this.appVersion}.`);
|
|
121
|
-
resolve(false);
|
|
122
|
-
}
|
|
123
|
-
});
|
|
113
|
+
// when noPrompt flag is enabled, default answer is no for destructive operation
|
|
114
|
+
if (await TerminalConfirm_1.TerminalConfirm.ask(chalk.red('Are you sure you want to uninstall from all these accounts?'), this.noPrompt, false)) {
|
|
115
|
+
await doIt();
|
|
116
|
+
}
|
|
124
117
|
}
|
|
125
118
|
}
|
|
126
119
|
})
|
|
@@ -183,6 +176,10 @@ __decorate([
|
|
|
183
176
|
(0, oo_cli_1.option)('a'),
|
|
184
177
|
(0, oo_cli_1.help)('The availability zone that will be targeted (default: us)')
|
|
185
178
|
], UnpublishCommand.prototype, "availability", void 0);
|
|
179
|
+
__decorate([
|
|
180
|
+
(0, oo_cli_1.flag)('no-prompt'),
|
|
181
|
+
(0, oo_cli_1.help)('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
182
|
+
], UnpublishCommand.prototype, "noPrompt", void 0);
|
|
186
183
|
__decorate([
|
|
187
184
|
oo_cli_1.command,
|
|
188
185
|
(0, oo_cli_1.help)('Unpublish an app version (uninstall everywhere and undeploy)')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Unpublish.js","sourceRoot":"","sources":["../../../src/commands/directory/Unpublish.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAqE;
|
|
1
|
+
{"version":3,"file":"Unpublish.js","sourceRoot":"","sources":["../../../src/commands/directory/Unpublish.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -11,10 +11,12 @@ const migrateOptiCli_1 = require("./lib/migrateOptiCli");
|
|
|
11
11
|
const die_1 = require("./lib/die");
|
|
12
12
|
const chalk = require("chalk");
|
|
13
13
|
async function run() {
|
|
14
|
+
const args = process.argv.slice(2);
|
|
15
|
+
const noPrompt = args.includes('--noPrompt');
|
|
14
16
|
if (Number(process.versions.node.split('.')[0]) < 18) {
|
|
15
17
|
console.log(chalk.redBright('Node version 18 or higher is recommended. OCP CLI is not tested on versions lower than 18.'));
|
|
16
18
|
}
|
|
17
|
-
await (0, migrateOptiCli_1.migrateOptiCli)();
|
|
19
|
+
await (0, migrateOptiCli_1.migrateOptiCli)(noPrompt);
|
|
18
20
|
const configFolder = path.join(os.homedir(), '.ocp');
|
|
19
21
|
if (!fs.existsSync(configFolder)) {
|
|
20
22
|
(0, die_1.die)('No ~/.ocp config folder found. ' +
|
|
@@ -24,7 +26,7 @@ async function run() {
|
|
|
24
26
|
}
|
|
25
27
|
(0, EnvironmentalOutput_1.showEnvironment)();
|
|
26
28
|
const manifest = require(path.join(__dirname, './oo-cli.manifest.json'));
|
|
27
|
-
await (0, checkForUpdate_1.checkForUpdate)(manifest);
|
|
29
|
+
await (0, checkForUpdate_1.checkForUpdate)(manifest, noPrompt);
|
|
28
30
|
new oo_cli_1.Runner(__dirname, manifest).run();
|
|
29
31
|
}
|
|
30
32
|
// catch does not work here sadly for async functions as oo-cli lib does not wait for the promise to resolve
|
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,
|
|
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,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC7C,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,EAAC,QAAQ,CAAC,CAAC;IAE/B,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,EAAE,QAAQ,CAAC,CAAC;IAEzC,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/AppUpdater.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export declare namespace AppUpdater {
|
|
|
3
3
|
/**
|
|
4
4
|
* Assumes working dir is app dir
|
|
5
5
|
*/
|
|
6
|
-
function ensureDependencies(requireUpToDate: boolean,
|
|
6
|
+
function ensureDependencies(requireUpToDate: boolean, prompt: boolean, runtime: string, ignoreDevUpdates?: boolean, stage?: DependencyStage): Promise<void>;
|
|
7
7
|
function getPackageDependencies(prod?: boolean): {
|
|
8
8
|
[name: string]: string;
|
|
9
9
|
};
|
package/dist/lib/AppUpdater.js
CHANGED
|
@@ -15,7 +15,7 @@ var AppUpdater;
|
|
|
15
15
|
/**
|
|
16
16
|
* Assumes working dir is app dir
|
|
17
17
|
*/
|
|
18
|
-
async function ensureDependencies(requireUpToDate,
|
|
18
|
+
async function ensureDependencies(requireUpToDate, prompt, runtime, ignoreDevUpdates = true, stage = 'stable') {
|
|
19
19
|
ensurePublicPackageUsage();
|
|
20
20
|
const response = await (0, node_fetch_1.default)((0, Config_1.getDependencyFileUrl)(runtime));
|
|
21
21
|
const zipModules = await response.json();
|
|
@@ -83,7 +83,7 @@ var AppUpdater;
|
|
|
83
83
|
stringLength: StringUtils_1.styledStringLength
|
|
84
84
|
});
|
|
85
85
|
console.log(`\n${t}\n`);
|
|
86
|
-
if (
|
|
86
|
+
if (await TerminalConfirm_1.TerminalConfirm.ask('Do you want to update now?', prompt, true)) {
|
|
87
87
|
const updateCommand = `yarn add ${prodUpdates.join(' ')}`;
|
|
88
88
|
if (prodUpdates.length > 0 && !TeminalPassthru_1.TerminalPassthru.exec(updateCommand)) {
|
|
89
89
|
console.log(chalk.red(`Failed to update dependencies. Run \`${chalk.white(updateCommand)}\` to update manually.`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppUpdater.js","sourceRoot":"","sources":["../../src/lib/AppUpdater.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,+CAA+C;AAC/C,2CAA+B;AAC/B,mCAAsC;AACtC,qCAA8C;AAC9C,+CAAiD;AACjD,uDAAmD;AACnD,uDAAkD;AAClD,oCAAqC;AAGrC,IAAiB,UAAU,CAyK1B;AAzKD,WAAiB,UAAU;IACzB;;OAEG;IACI,KAAK,UAAU,kBAAkB,CACtC,eAAwB,EACxB,
|
|
1
|
+
{"version":3,"file":"AppUpdater.js","sourceRoot":"","sources":["../../src/lib/AppUpdater.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,12 @@ const getHint = (value) => {
|
|
|
13
13
|
};
|
|
14
14
|
var TerminalConfirm;
|
|
15
15
|
(function (TerminalConfirm) {
|
|
16
|
-
async function ask(question, hint = '') {
|
|
16
|
+
async function ask(question, noPrompt, answer, hint = '') {
|
|
17
|
+
if (noPrompt) {
|
|
18
|
+
const yesOrNo = answer ? 'yes' : 'no';
|
|
19
|
+
console.info(`${question}: ${yesOrNo}`);
|
|
20
|
+
return answer;
|
|
21
|
+
}
|
|
17
22
|
const result = await TerminalInput_1.TerminalInput.ask(question, {
|
|
18
23
|
getHint: (value) => getHint(value) || hint,
|
|
19
24
|
validate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerminalConfirm.js","sourceRoot":"","sources":["../../src/lib/TerminalConfirm.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAE9C,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACzB,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAEvB,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAClC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CACtE,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE;IAChC,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC7B,OAAO,uBAAuB,CAAC;KAChC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"TerminalConfirm.js","sourceRoot":"","sources":["../../src/lib/TerminalConfirm.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAE9C,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AACzB,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAEvB,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,CAClC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CACtE,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,KAAa,EAAE,EAAE;IAChC,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC7B,OAAO,uBAAuB,CAAC;KAChC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,IAAiB,eAAe,CAiB/B;AAjBD,WAAiB,eAAe;IACvB,KAAK,UAAU,GAAG,CAAC,QAAgB,EAAE,QAAkB,EAAE,MAAgB,EAAE,OAAe,EAAE;QAEjG,IAAI,QAAQ,EAAE;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,KAAK,OAAO,EAAE,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;SACf;QAED,MAAM,MAAM,GAAG,MAAM,6BAAa,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC/C,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI;YAC1C,QAAQ;YACR,mBAAmB,EAAE,IAAI;SAC1B,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5C,CAAC;IAfqB,mBAAG,MAexB,CAAA;AACH,CAAC,EAjBgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAiB/B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { ManifestDefinition } from 'oo-cli/dist/types/manifest';
|
|
2
|
-
export declare function checkForUpdate(manifest: ManifestDefinition): Promise<void>;
|
|
2
|
+
export declare function checkForUpdate(manifest: ManifestDefinition, noPrompt: boolean): Promise<void>;
|
|
@@ -11,7 +11,7 @@ const TerminalConfirm_1 = require("./TerminalConfirm");
|
|
|
11
11
|
const TeminalPassthru_1 = require("./TeminalPassthru");
|
|
12
12
|
const LAST_VERSION_CHECK_FILE = '.lastcheck';
|
|
13
13
|
const _24hours = 24 * 60 * 60 * 1000;
|
|
14
|
-
async function checkForUpdate(manifest) {
|
|
14
|
+
async function checkForUpdate(manifest, noPrompt) {
|
|
15
15
|
var _a;
|
|
16
16
|
const installed = (_a = manifest.package) === null || _a === void 0 ? void 0 : _a.version;
|
|
17
17
|
const prerelease = semver.prerelease(installed);
|
|
@@ -34,7 +34,7 @@ async function checkForUpdate(manifest) {
|
|
|
34
34
|
if (latest) {
|
|
35
35
|
if (semver.gt(latest, installed)) {
|
|
36
36
|
upToDate = false;
|
|
37
|
-
if (await TerminalConfirm_1.TerminalConfirm.ask(chalk.yellow('A new version of OCP CLI is available. Update now?'))) {
|
|
37
|
+
if (await TerminalConfirm_1.TerminalConfirm.ask(chalk.yellow('A new version of OCP CLI is available. Update now?'), noPrompt, true)) {
|
|
38
38
|
TeminalPassthru_1.TerminalPassthru.exec('yarn global upgrade @optimizely/ocp-cli --latest');
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkForUpdate.js","sourceRoot":"","sources":["../../src/lib/checkForUpdate.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,qDAAkD;AAClD,uDAAoD;AACpD,uDAAqD;AAOrD,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAC7C,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,KAAK,UAAU,cAAc,CAAC,QAA4B;;
|
|
1
|
+
{"version":3,"file":"checkForUpdate.js","sourceRoot":"","sources":["../../src/lib/checkForUpdate.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,qDAAkD;AAClD,uDAAoD;AACpD,uDAAqD;AAOrD,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAC7C,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,KAAK,UAAU,cAAc,CAAC,QAA4B,EAAE,QAAiB;;IAClF,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,OAAQ,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC;IAEtD,IAAI,MAAM,EAAE;QACV,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CACR,iCAAiC,SAAS,MAAM;YAChD,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,2CAA2C,CACtH,CACJ,CAAC;QACF,OAAO;KACR;IAED,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,IAAI,SAAS,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE;YAC7E,OAAO;SACR;KACF;IAED,IAAI;QACF,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;QACnC,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;gBAChC,QAAQ,GAAG,KAAK,CAAC;gBACjB,IAAI,MAAM,iCAAe,CAAC,GAAG,CAC3B,KAAK,CAAC,MAAM,CAAC,oDAAoD,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE;oBACrF,kCAAgB,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC3E;aACF;SACF;QACD,YAAY,CAAC,QAAQ,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;AACH,CAAC;AAvCD,wCAuCC;AAED,KAAK,UAAU,WAAW;IACxB,OAAO,+BAAc,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAChG,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,KAAK,MAAM,CAAC;QACvE,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;KACrC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,QAAiB;IACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function migrateOptiCli(): Promise<void>;
|
|
1
|
+
export declare function migrateOptiCli(noPrompt: boolean): Promise<void>;
|
|
@@ -7,14 +7,14 @@ const fs = require("fs");
|
|
|
7
7
|
const chalk = require("chalk");
|
|
8
8
|
const TerminalConfirm_1 = require("./TerminalConfirm");
|
|
9
9
|
const dotenv = require("dotenv");
|
|
10
|
-
async function migrateOptiCli() {
|
|
10
|
+
async function migrateOptiCli(noPrompt) {
|
|
11
11
|
const configFolder = path.join(os.homedir(), '.ocp');
|
|
12
12
|
if (fs.existsSync(configFolder) || !fs.existsSync(path.join(os.homedir(), '.opti'))) {
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
15
|
const question = chalk.yellow('No ~/.ocp config folder found, but the config folder for legacy opti CLI exists. ' +
|
|
16
16
|
'Do you want to copy opti CLI configuration? (y/n)');
|
|
17
|
-
const copyConfig = await TerminalConfirm_1.TerminalConfirm.ask(question);
|
|
17
|
+
const copyConfig = await TerminalConfirm_1.TerminalConfirm.ask(question, noPrompt, true);
|
|
18
18
|
if (copyConfig) {
|
|
19
19
|
fs.cpSync(path.join(os.homedir(), '.opti'), path.join(os.homedir(), '.ocp'), { recursive: true });
|
|
20
20
|
['.env', '.env.staging'].forEach((envFile) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateOptiCli.js","sourceRoot":"","sources":["../../src/lib/migrateOptiCli.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AACzB,+BAA+B;AAC/B,uDAAkD;AAClD,iCAAiC;AAE1B,KAAK,UAAU,cAAc;
|
|
1
|
+
{"version":3,"file":"migrateOptiCli.js","sourceRoot":"","sources":["../../src/lib/migrateOptiCli.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AACzB,+BAA+B;AAC/B,uDAAkD;AAClD,iCAAiC;AAE1B,KAAK,UAAU,cAAc,CAAC,QAAiB;IACpD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE;QACnF,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAC3B,mFAAmF;QACnF,mDAAmD,CACpD,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,iCAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IACvE,IAAI,UAAU,EAAE;QACd,EAAE,CAAC,MAAM,CACP,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,EAChC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,EAC/B,EAAC,SAAS,EAAE,IAAI,EAAC,CAClB,CAAC;QACF,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC9B,EAAE,CAAC,aAAa,CACd,WAAW,EACX,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CACpE,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,EAAC,CAAC,CAAC;KAC7D;AACH,CAAC;AA9BD,wCA8BC"}
|
|
@@ -285,6 +285,17 @@
|
|
|
285
285
|
"defaultValue": false,
|
|
286
286
|
"invertible": false
|
|
287
287
|
},
|
|
288
|
+
{
|
|
289
|
+
"name": "noPrompt",
|
|
290
|
+
"key": "noPrompt",
|
|
291
|
+
"aliases": [
|
|
292
|
+
"no-prompt"
|
|
293
|
+
],
|
|
294
|
+
"invertedAliases": [],
|
|
295
|
+
"help": "Use default answer to any prompt question (default is yes, except for destructive operations)",
|
|
296
|
+
"defaultValue": false,
|
|
297
|
+
"invertible": false
|
|
298
|
+
},
|
|
288
299
|
{
|
|
289
300
|
"name": "publish",
|
|
290
301
|
"key": "publish",
|
|
@@ -468,6 +479,17 @@
|
|
|
468
479
|
"help": "Use unstable OCP dependencies. Only allowed for dev builds.",
|
|
469
480
|
"defaultValue": false,
|
|
470
481
|
"invertible": false
|
|
482
|
+
},
|
|
483
|
+
{
|
|
484
|
+
"name": "noPrompt",
|
|
485
|
+
"key": "noPrompt",
|
|
486
|
+
"aliases": [
|
|
487
|
+
"no-prompt"
|
|
488
|
+
],
|
|
489
|
+
"invertedAliases": [],
|
|
490
|
+
"help": "Use default answer to any prompt question (default is yes, except for destructive operations)",
|
|
491
|
+
"defaultValue": false,
|
|
492
|
+
"invertible": false
|
|
471
493
|
}
|
|
472
494
|
],
|
|
473
495
|
"options": [],
|
|
@@ -517,6 +539,17 @@
|
|
|
517
539
|
"help": "",
|
|
518
540
|
"defaultValue": false,
|
|
519
541
|
"invertible": false
|
|
542
|
+
},
|
|
543
|
+
{
|
|
544
|
+
"name": "noPrompt",
|
|
545
|
+
"key": "noPrompt",
|
|
546
|
+
"aliases": [
|
|
547
|
+
"no-prompt"
|
|
548
|
+
],
|
|
549
|
+
"invertedAliases": [],
|
|
550
|
+
"help": "Use default answer to any prompt question (default is yes, except for destructive operations)",
|
|
551
|
+
"defaultValue": false,
|
|
552
|
+
"invertible": false
|
|
520
553
|
}
|
|
521
554
|
],
|
|
522
555
|
"options": [
|
|
@@ -560,6 +593,17 @@
|
|
|
560
593
|
"help": "",
|
|
561
594
|
"defaultValue": false,
|
|
562
595
|
"invertible": false
|
|
596
|
+
},
|
|
597
|
+
{
|
|
598
|
+
"name": "noPompt",
|
|
599
|
+
"key": "noPompt",
|
|
600
|
+
"aliases": [
|
|
601
|
+
"no-prompt"
|
|
602
|
+
],
|
|
603
|
+
"invertedAliases": [],
|
|
604
|
+
"help": "Use default answer to any prompt question (default is yes, except for destructive operations)",
|
|
605
|
+
"defaultValue": false,
|
|
606
|
+
"invertible": false
|
|
563
607
|
}
|
|
564
608
|
],
|
|
565
609
|
"options": [],
|
|
@@ -1249,7 +1293,7 @@
|
|
|
1249
1293
|
},
|
|
1250
1294
|
"commands": [],
|
|
1251
1295
|
"package": {
|
|
1252
|
-
"version": "1.
|
|
1296
|
+
"version": "1.1.1",
|
|
1253
1297
|
"name": "@optimizely/ocp-cli",
|
|
1254
1298
|
"license": "Apache-2.0",
|
|
1255
1299
|
"executable": "ocp"
|
package/package.json
CHANGED
|
@@ -42,6 +42,10 @@ export abstract class BaseBuildCommand {
|
|
|
42
42
|
@help('Use unstable OCP dependencies. Only allowed for dev builds.')
|
|
43
43
|
public rcDependencies: boolean = false;
|
|
44
44
|
|
|
45
|
+
@flag('no-prompt')
|
|
46
|
+
@help('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
47
|
+
public noPrompt: boolean = false;
|
|
48
|
+
|
|
45
49
|
protected async run(upload: boolean, publish: boolean, usePreviousAppEnvValues: boolean) {
|
|
46
50
|
handleInterrupt();
|
|
47
51
|
|
|
@@ -68,7 +72,7 @@ export abstract class BaseBuildCommand {
|
|
|
68
72
|
|
|
69
73
|
await AppUpdater.ensureDependencies(
|
|
70
74
|
upload,
|
|
71
|
-
this.upgradeDeps,
|
|
75
|
+
this.noPrompt || this.upgradeDeps,
|
|
72
76
|
context.runtime,
|
|
73
77
|
true,
|
|
74
78
|
this.rcDependencies ? 'rc' : 'stable'
|
|
@@ -49,7 +49,7 @@ export class PrepareCommand extends BaseBuildCommand {
|
|
|
49
49
|
`${chalk.yellow('Are you sure?')}`
|
|
50
50
|
);
|
|
51
51
|
|
|
52
|
-
const reviewConfirmation = await TerminalConfirm.ask(reviewMessage);
|
|
52
|
+
const reviewConfirmation = await TerminalConfirm.ask(reviewMessage, this.noPrompt, true);
|
|
53
53
|
if (!reviewConfirmation) {
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
@@ -32,17 +32,22 @@ export class PublishCommand {
|
|
|
32
32
|
@help('The App ID and version (e.g. my_app@1.0.0)')
|
|
33
33
|
public appVersion!: string;
|
|
34
34
|
|
|
35
|
+
@flag('no-prompt')
|
|
36
|
+
@help('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
37
|
+
public noPompt: boolean = false;
|
|
38
|
+
|
|
35
39
|
@command
|
|
36
40
|
@help('Publish (make available) a specific app version that has been reviewed and approved')
|
|
37
41
|
public async publish() {
|
|
38
42
|
handleInterrupt();
|
|
39
43
|
|
|
40
44
|
if (!/[\w-]+@\d+\.\d+\.\d+(?:-\w+\.\d+)?/.test(this.appVersion)) {
|
|
41
|
-
|
|
45
|
+
die('appVersion is required in the format of app@1.0.0');
|
|
42
46
|
}
|
|
43
47
|
|
|
44
48
|
const [appId, version] = this.appVersion.split('@');
|
|
45
49
|
console.log(chalk.gray(`Publishing ${this.appVersion} to the directory...`));
|
|
50
|
+
let success = true;
|
|
46
51
|
|
|
47
52
|
try {
|
|
48
53
|
const primaryAppVersion = await Rivendell.fetchAppVersion({appId, version}, 'us');
|
|
@@ -70,8 +75,10 @@ export class PublishCommand {
|
|
|
70
75
|
// since we are handling the interrupt, disable the handler so we can exit
|
|
71
76
|
terminal.removeAllListeners('key');
|
|
72
77
|
} catch (error: any) {
|
|
78
|
+
success = false;
|
|
73
79
|
console.error(chalk.red(`Error publishing in shard ${shard}: ${formatError(error)}`));
|
|
74
|
-
if (shards[shards.length - 1] !== shard &&
|
|
80
|
+
if (shards[shards.length - 1] !== shard &&
|
|
81
|
+
!await TerminalConfirm.ask('Continue with other shards?', this.noPompt, true)) {
|
|
75
82
|
break;
|
|
76
83
|
}
|
|
77
84
|
}
|
|
@@ -84,6 +91,10 @@ export class PublishCommand {
|
|
|
84
91
|
} catch (e: any) {
|
|
85
92
|
die(formatError(e));
|
|
86
93
|
}
|
|
94
|
+
|
|
95
|
+
if (!success) {
|
|
96
|
+
die(chalk.red(`Failed to publish ${this.appVersion} to all shards.`));
|
|
97
|
+
}
|
|
87
98
|
}
|
|
88
99
|
|
|
89
100
|
private async checkOrphanedDeploys(appId: string, currentShards: string[]) {
|
|
@@ -113,7 +124,10 @@ export class PublishCommand {
|
|
|
113
124
|
`do you want to unpublish the following apps:`);
|
|
114
125
|
console.log(Object.entries(undeployVersions)
|
|
115
126
|
.map((x) => x[1].map((y) => `* ${y.id.appId}@${y.id.version} in ${x[0]}`).join('\n')).join('\n'));
|
|
116
|
-
|
|
127
|
+
|
|
128
|
+
// when noPrompt flag is enabled, default answer is no for destructive operation
|
|
129
|
+
if (await TerminalConfirm.ask(
|
|
130
|
+
chalk.red('Do you want to unpublish the listed AppVersions now?'), this.noPompt, false)) {
|
|
117
131
|
for (const [shard, toUndeploy] of Object.entries(undeployVersions)) {
|
|
118
132
|
for (const version of toUndeploy) {
|
|
119
133
|
const unpublish = new UnpublishCommand();
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as chalk from 'chalk';
|
|
2
2
|
import {command, flag, help, namespace, option, param} from 'oo-cli';
|
|
3
|
-
import {terminal} from 'terminal-kit';
|
|
4
3
|
import {AppContext} from '../../lib/AppContext';
|
|
5
4
|
import {die} from '../../lib/die';
|
|
6
5
|
import {formatVersionState} from '../../lib/formatVersionState';
|
|
@@ -33,6 +32,10 @@ export class UnpublishCommand {
|
|
|
33
32
|
@help('The availability zone that will be targeted (default: us)')
|
|
34
33
|
public availability: string = '';
|
|
35
34
|
|
|
35
|
+
@flag('no-prompt')
|
|
36
|
+
@help('Use default answer to any prompt question (default is yes, except for destructive operations)')
|
|
37
|
+
public noPrompt: boolean = false;
|
|
38
|
+
|
|
36
39
|
@command
|
|
37
40
|
@help('Unpublish an app version (uninstall everywhere and undeploy)')
|
|
38
41
|
public async unpublish() {
|
|
@@ -55,9 +58,8 @@ export class UnpublishCommand {
|
|
|
55
58
|
const manifest = JSON.parse(primaryAppVersion.manifestJson) as AppManifest;
|
|
56
59
|
const shards = await applicableShards(this.availability, manifest);
|
|
57
60
|
|
|
58
|
-
if (!
|
|
59
|
-
chalk.red('Unpublishing is not reversible. Are you sure you want to unpublish? [y/n]'))
|
|
60
|
-
)) {
|
|
61
|
+
if (!await TerminalConfirm.ask(
|
|
62
|
+
chalk.red('Unpublishing is not reversible. Are you sure you want to unpublish? [y/n]'), this.noPrompt, true)) {
|
|
61
63
|
die('Operation cancelled.');
|
|
62
64
|
}
|
|
63
65
|
|
|
@@ -86,7 +88,8 @@ export class UnpublishCommand {
|
|
|
86
88
|
await this.watchForCompletion({appId, version}, shard);
|
|
87
89
|
} catch (error: any) {
|
|
88
90
|
console.error(chalk.red(`Error unpublishing in shard ${shard}: ${formatError(error)}`));
|
|
89
|
-
if (shards[shards.length - 1] !== shard &&
|
|
91
|
+
if (shards[shards.length - 1] !== shard &&
|
|
92
|
+
!await TerminalConfirm.ask('Continue with other shards?', this.noPrompt, true)) {
|
|
90
93
|
break;
|
|
91
94
|
}
|
|
92
95
|
}
|
|
@@ -129,16 +132,11 @@ export class UnpublishCommand {
|
|
|
129
132
|
console.log(`${this.appVersion} is currently installed in ${trackers.length} account(s) in ${shard}:`);
|
|
130
133
|
console.log(` (${trackers.join(', ')})\n`);
|
|
131
134
|
console.log(chalk.red('Are you sure you want to uninstall from all these accounts? [y/n]'));
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
} else if (yes) {
|
|
135
|
+
// when noPrompt flag is enabled, default answer is no for destructive operation
|
|
136
|
+
if (await TerminalConfirm.ask(
|
|
137
|
+
chalk.red('Are you sure you want to uninstall from all these accounts?'), this.noPrompt, false)) {
|
|
136
138
|
await doIt();
|
|
137
|
-
|
|
138
|
-
console.log(`Aborted. No changes made to ${this.appVersion}.`);
|
|
139
|
-
resolve(false);
|
|
140
|
-
}
|
|
141
|
-
});
|
|
139
|
+
}
|
|
142
140
|
}
|
|
143
141
|
}
|
|
144
142
|
})
|
package/src/index.ts
CHANGED
|
@@ -10,13 +10,15 @@ import {die} from './lib/die';
|
|
|
10
10
|
import * as chalk from 'chalk';
|
|
11
11
|
|
|
12
12
|
async function run() {
|
|
13
|
+
const args = process.argv.slice(2);
|
|
14
|
+
const noPrompt = args.includes('--noPrompt');
|
|
13
15
|
if (Number(process.versions.node.split('.')[0]) < 18) {
|
|
14
16
|
console.log(
|
|
15
17
|
chalk.redBright('Node version 18 or higher is recommended. OCP CLI is not tested on versions lower than 18.')
|
|
16
18
|
);
|
|
17
19
|
}
|
|
18
20
|
|
|
19
|
-
await migrateOptiCli();
|
|
21
|
+
await migrateOptiCli(noPrompt);
|
|
20
22
|
|
|
21
23
|
const configFolder = path.join(os.homedir(), '.ocp');
|
|
22
24
|
if (!fs.existsSync(configFolder)) {
|
|
@@ -31,7 +33,7 @@ async function run() {
|
|
|
31
33
|
showEnvironment();
|
|
32
34
|
|
|
33
35
|
const manifest = require(path.join(__dirname, './oo-cli.manifest.json'));
|
|
34
|
-
await checkForUpdate(manifest);
|
|
36
|
+
await checkForUpdate(manifest, noPrompt);
|
|
35
37
|
|
|
36
38
|
new Runner(__dirname, manifest).run();
|
|
37
39
|
}
|
package/src/lib/AppUpdater.ts
CHANGED
|
@@ -15,7 +15,7 @@ export namespace AppUpdater {
|
|
|
15
15
|
*/
|
|
16
16
|
export async function ensureDependencies(
|
|
17
17
|
requireUpToDate: boolean,
|
|
18
|
-
|
|
18
|
+
prompt: boolean,
|
|
19
19
|
runtime: string,
|
|
20
20
|
ignoreDevUpdates: boolean = true,
|
|
21
21
|
stage: DependencyStage = 'stable'
|
|
@@ -95,7 +95,7 @@ export namespace AppUpdater {
|
|
|
95
95
|
}
|
|
96
96
|
);
|
|
97
97
|
console.log(`\n${t}\n`);
|
|
98
|
-
if (
|
|
98
|
+
if (await TerminalConfirm.ask('Do you want to update now?', prompt, true)) {
|
|
99
99
|
const updateCommand = `yarn add ${prodUpdates.join(' ')}`;
|
|
100
100
|
if (prodUpdates.length > 0 && !TerminalPassthru.exec(updateCommand)) {
|
|
101
101
|
console.log(chalk.red(
|
|
@@ -15,7 +15,14 @@ const getHint = (value: string) => {
|
|
|
15
15
|
};
|
|
16
16
|
|
|
17
17
|
export namespace TerminalConfirm {
|
|
18
|
-
export async function ask(question: string, hint: string = '') {
|
|
18
|
+
export async function ask(question: string, noPrompt?: boolean, answer?: boolean, hint: string = '') {
|
|
19
|
+
|
|
20
|
+
if (noPrompt) {
|
|
21
|
+
const yesOrNo = answer ? 'yes' : 'no';
|
|
22
|
+
console.info(`${question}: ${yesOrNo}`);
|
|
23
|
+
return answer;
|
|
24
|
+
}
|
|
25
|
+
|
|
19
26
|
const result = await TerminalInput.ask(question, {
|
|
20
27
|
getHint: (value) => getHint(value) || hint,
|
|
21
28
|
validate,
|
|
@@ -16,7 +16,7 @@ interface LastCheck {
|
|
|
16
16
|
const LAST_VERSION_CHECK_FILE = '.lastcheck';
|
|
17
17
|
const _24hours = 24 * 60 * 60 * 1000;
|
|
18
18
|
|
|
19
|
-
export async function checkForUpdate(manifest: ManifestDefinition): Promise<void> {
|
|
19
|
+
export async function checkForUpdate(manifest: ManifestDefinition, noPrompt: boolean): Promise<void> {
|
|
20
20
|
const installed = manifest.package?.version!;
|
|
21
21
|
const prerelease = semver.prerelease(installed);
|
|
22
22
|
const isBeta = prerelease && prerelease[0] === 'beta';
|
|
@@ -45,7 +45,8 @@ export async function checkForUpdate(manifest: ManifestDefinition): Promise<void
|
|
|
45
45
|
if (latest) {
|
|
46
46
|
if (semver.gt(latest, installed)) {
|
|
47
47
|
upToDate = false;
|
|
48
|
-
if (await TerminalConfirm.ask(
|
|
48
|
+
if (await TerminalConfirm.ask(
|
|
49
|
+
chalk.yellow('A new version of OCP CLI is available. Update now?'), noPrompt, true)) {
|
|
49
50
|
TerminalPassthru.exec('yarn global upgrade @optimizely/ocp-cli --latest');
|
|
50
51
|
}
|
|
51
52
|
}
|
|
@@ -5,7 +5,7 @@ import * as chalk from 'chalk';
|
|
|
5
5
|
import {TerminalConfirm} from './TerminalConfirm';
|
|
6
6
|
import * as dotenv from 'dotenv';
|
|
7
7
|
|
|
8
|
-
export async function migrateOptiCli() {
|
|
8
|
+
export async function migrateOptiCli(noPrompt: boolean) {
|
|
9
9
|
const configFolder = path.join(os.homedir(), '.ocp');
|
|
10
10
|
if (fs.existsSync(configFolder) || !fs.existsSync(path.join(os.homedir(), '.opti'))) {
|
|
11
11
|
return;
|
|
@@ -16,7 +16,7 @@ export async function migrateOptiCli() {
|
|
|
16
16
|
'Do you want to copy opti CLI configuration? (y/n)'
|
|
17
17
|
);
|
|
18
18
|
|
|
19
|
-
const copyConfig = await TerminalConfirm.ask(question);
|
|
19
|
+
const copyConfig = await TerminalConfirm.ask(question, noPrompt, true);
|
|
20
20
|
if (copyConfig) {
|
|
21
21
|
fs.cpSync(
|
|
22
22
|
path.join(os.homedir(), '.opti'),
|