@optimizely/ocp-cli 1.0.12 → 1.0.14
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/directory/Unpublish.js +1 -1
- package/dist/commands/directory/Unpublish.js.map +1 -1
- package/dist/commands/directory/Uprade.d.ts +1 -0
- package/dist/commands/directory/Uprade.js +9 -3
- package/dist/commands/directory/Uprade.js.map +1 -1
- package/dist/lib/build.js +8 -2
- package/dist/lib/build.js.map +1 -1
- package/dist/oo-cli.manifest.json +1 -1
- package/package.json +1 -1
- package/src/commands/directory/Unpublish.ts +1 -2
- package/src/commands/directory/Uprade.ts +10 -3
- package/src/lib/build.ts +9 -2
|
@@ -32,7 +32,7 @@ let UnpublishCommand = class UnpublishCommand {
|
|
|
32
32
|
}
|
|
33
33
|
const [appId, version] = this.appVersion.split('@');
|
|
34
34
|
try {
|
|
35
|
-
const primaryAppVersion = await Rivendell_1.Rivendell.fetchAppVersion({ appId, version }, 'us');
|
|
35
|
+
const primaryAppVersion = await Rivendell_1.Rivendell.fetchAppVersion({ appId, version }, this.availability || 'us');
|
|
36
36
|
const primaryShardAppState = primaryAppVersion.state;
|
|
37
37
|
if (!UNPUBLISHABLE_STATES.includes(primaryShardAppState) && AppVersionState.STOPPED !== primaryShardAppState) {
|
|
38
38
|
throw new Error(`AppVersion must be in an unpublishable state in the primary shard. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Unpublish.js","sourceRoot":"","sources":["../../../src/commands/directory/Unpublish.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAqE;AACrE,+CAAsC;AAEtC,uCAAkC;AAClC,qEAAgE;AAChE,+DAA0D;AAC1D,+DAA0D;AAC1D,mDAA8C;AAC9C,IAAO,eAAe,GAAG,qBAAS,CAAC,eAAe,CAAC;AACnD,IAAO,aAAa,GAAG,qBAAS,CAAC,aAAa,CAAC;AAE/C,uDAAkD;AAClD,6CAAkD;AAElD,+DAA0D;AAE1D,MAAM,oBAAoB,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;AAG3G,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAaE,iBAAY,GAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Unpublish.js","sourceRoot":"","sources":["../../../src/commands/directory/Unpublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const Rivendell_1 = require("../../lib/Rivendell");
|
|
|
18
18
|
let UpgradeCommand = class UpgradeCommand {
|
|
19
19
|
constructor() {
|
|
20
20
|
this.availability = '';
|
|
21
|
+
this.STATUS_CHECK_ERROR_THRESHOLD = 5;
|
|
21
22
|
}
|
|
22
23
|
async upgrade() {
|
|
23
24
|
(0, handleInterrupt_1.handleInterrupt)();
|
|
@@ -43,6 +44,7 @@ let UpgradeCommand = class UpgradeCommand {
|
|
|
43
44
|
console.log(chalk.gray(`Upgrade was scheduled in ${shard}, watching for completion... CTRL+C to stop checking.`));
|
|
44
45
|
return new Promise((resolve, reject) => {
|
|
45
46
|
let attempts = 0;
|
|
47
|
+
let errorCount = 0;
|
|
46
48
|
const spinner = new TerminalSpinner_1.TerminalSpinner().start('');
|
|
47
49
|
const checkUpgrade = () => {
|
|
48
50
|
attempts++;
|
|
@@ -60,11 +62,15 @@ let UpgradeCommand = class UpgradeCommand {
|
|
|
60
62
|
(0, die_1.die)('Timed out waiting for completion');
|
|
61
63
|
}
|
|
62
64
|
}
|
|
65
|
+
errorCount = 0;
|
|
63
66
|
})
|
|
64
67
|
.catch((e) => {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
+
errorCount++;
|
|
69
|
+
if (errorCount >= this.STATUS_CHECK_ERROR_THRESHOLD) {
|
|
70
|
+
clearInterval(interval);
|
|
71
|
+
spinner.stop();
|
|
72
|
+
reject(e);
|
|
73
|
+
}
|
|
68
74
|
});
|
|
69
75
|
};
|
|
70
76
|
const interval = setInterval(checkUpgrade, 2000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Uprade.js","sourceRoot":"","sources":["../../../src/commands/directory/Uprade.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,mCAAyE;AACzE,uCAAkC;AAClC,uDAAkD;AAClD,+DAA0D;AAC1D,+DAA0D;AAC1D,+CAAsC;AACtC,mDAA8C;AAGvC,IAAM,cAAc,GAApB,MAAM,cAAc;IAApB;QAgBG,iBAAY,GAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Uprade.js","sourceRoot":"","sources":["../../../src/commands/directory/Uprade.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/build.js
CHANGED
|
@@ -4,8 +4,10 @@ exports.watchBuild = void 0;
|
|
|
4
4
|
const Rivendell_1 = require("./Rivendell");
|
|
5
5
|
var BuildState = Rivendell_1.Rivendell.BuildState;
|
|
6
6
|
var BuildStatus = Rivendell_1.Rivendell.BuildStatus;
|
|
7
|
+
const STATUS_CHECK_ERROR_THRESHOLD = 5;
|
|
7
8
|
async function watchBuild(id, progressCallback, pollInterval = 2000) {
|
|
8
9
|
return new Promise((resolve, reject) => {
|
|
10
|
+
let errorCount = 0;
|
|
9
11
|
const interval = setInterval(() => {
|
|
10
12
|
Rivendell_1.Rivendell.fetchBuild(id)
|
|
11
13
|
.then((build) => {
|
|
@@ -23,10 +25,14 @@ async function watchBuild(id, progressCallback, pollInterval = 2000) {
|
|
|
23
25
|
else {
|
|
24
26
|
progressCallback(state);
|
|
25
27
|
}
|
|
28
|
+
errorCount = 0;
|
|
26
29
|
})
|
|
27
30
|
.catch((error) => {
|
|
28
|
-
|
|
29
|
-
|
|
31
|
+
errorCount++;
|
|
32
|
+
if (errorCount >= STATUS_CHECK_ERROR_THRESHOLD) {
|
|
33
|
+
clearInterval(interval);
|
|
34
|
+
reject(error);
|
|
35
|
+
}
|
|
30
36
|
});
|
|
31
37
|
}, pollInterval);
|
|
32
38
|
});
|
package/dist/lib/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/lib/build.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AACtC,IAAO,UAAU,GAAG,qBAAS,CAAC,UAAU,CAAC;AACzC,IAAO,WAAW,GAAG,qBAAS,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/lib/build.ts"],"names":[],"mappings":";;;AAAA,2CAAsC;AACtC,IAAO,UAAU,GAAG,qBAAS,CAAC,UAAU,CAAC;AACzC,IAAO,WAAW,GAAG,qBAAS,CAAC,WAAW,CAAC;AAK3C,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAEhC,KAAK,UAAU,UAAU,CAC9B,EAAU,EACV,gBAAkC,EAClC,eAAuB,IAAI;IAE3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAChC,qBAAS,CAAC,UAAU,CAAC,EAAE,CAAC;iBACrB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;gBACd,MAAM,KAAK,GAAG,KAAK,CAAC,KAAmB,CAAC;gBACxC,IAAI,KAAK,KAAK,UAAU,CAAC,QAAQ,EAAE;oBACjC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACxB,IAAI,KAAK,CAAC,MAAqB,KAAK,WAAW,CAAC,OAAO,EAAE;wBACvD,OAAO,CAAC,EAAE,CAAC,CAAC;qBACb;yBAAM;wBACL,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;wBAClC,OAAO,CAAC,MAAM,CAAC,CAAC;qBACjB;iBACF;qBAAM;oBACL,gBAAgB,CAAC,KAAK,CAAC,CAAC;iBACzB;gBACD,UAAU,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,UAAU,EAAE,CAAC;gBACb,IAAI,UAAU,IAAI,4BAA4B,EAAE;oBAC9C,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACxB,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;QACP,CAAC,EAAE,YAAY,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC;AAjCD,gCAiCC"}
|
package/package.json
CHANGED
|
@@ -45,8 +45,7 @@ export class UnpublishCommand {
|
|
|
45
45
|
const [appId, version] = this.appVersion.split('@');
|
|
46
46
|
|
|
47
47
|
try {
|
|
48
|
-
const primaryAppVersion = await Rivendell.fetchAppVersion({appId, version}, 'us');
|
|
49
|
-
|
|
48
|
+
const primaryAppVersion = await Rivendell.fetchAppVersion({appId, version}, this.availability || 'us');
|
|
50
49
|
const primaryShardAppState = primaryAppVersion.state as AppVersionState;
|
|
51
50
|
if (!UNPUBLISHABLE_STATES.includes(primaryShardAppState) && AppVersionState.STOPPED !== primaryShardAppState) {
|
|
52
51
|
throw new Error(`AppVersion must be in an unpublishable state in the primary shard. ` +
|
|
@@ -26,6 +26,8 @@ export class UpgradeCommand {
|
|
|
26
26
|
@help('The availability zone that will be targeted (default: us)')
|
|
27
27
|
private availability: string = '';
|
|
28
28
|
|
|
29
|
+
private STATUS_CHECK_ERROR_THRESHOLD = 5;
|
|
30
|
+
|
|
29
31
|
@command
|
|
30
32
|
@help('Upgrade the Install to a specific app version')
|
|
31
33
|
public async upgrade() {
|
|
@@ -54,6 +56,7 @@ export class UpgradeCommand {
|
|
|
54
56
|
console.log(chalk.gray(`Upgrade was scheduled in ${shard}, watching for completion... CTRL+C to stop checking.`));
|
|
55
57
|
return new Promise<void>((resolve, reject) => {
|
|
56
58
|
let attempts = 0;
|
|
59
|
+
let errorCount = 0;
|
|
57
60
|
const spinner = new TerminalSpinner().start('');
|
|
58
61
|
const checkUpgrade = () => {
|
|
59
62
|
attempts++;
|
|
@@ -70,11 +73,15 @@ export class UpgradeCommand {
|
|
|
70
73
|
die('Timed out waiting for completion');
|
|
71
74
|
}
|
|
72
75
|
}
|
|
76
|
+
errorCount = 0;
|
|
73
77
|
})
|
|
74
78
|
.catch((e) => {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
79
|
+
errorCount++;
|
|
80
|
+
if (errorCount >= this.STATUS_CHECK_ERROR_THRESHOLD) {
|
|
81
|
+
clearInterval(interval);
|
|
82
|
+
spinner.stop();
|
|
83
|
+
reject(e);
|
|
84
|
+
}
|
|
78
85
|
});
|
|
79
86
|
};
|
|
80
87
|
|
package/src/lib/build.ts
CHANGED
|
@@ -5,12 +5,15 @@ import BuildStatus = Rivendell.BuildStatus;
|
|
|
5
5
|
export type ProgressCallback = (state: BuildState) => any;
|
|
6
6
|
export type ErrorList = string[];
|
|
7
7
|
|
|
8
|
+
const STATUS_CHECK_ERROR_THRESHOLD = 5;
|
|
9
|
+
|
|
8
10
|
export async function watchBuild(
|
|
9
11
|
id: number,
|
|
10
12
|
progressCallback: ProgressCallback,
|
|
11
13
|
pollInterval: number = 2000
|
|
12
14
|
): Promise<ErrorList> {
|
|
13
15
|
return new Promise((resolve, reject) => {
|
|
16
|
+
let errorCount = 0;
|
|
14
17
|
const interval = setInterval(() => {
|
|
15
18
|
Rivendell.fetchBuild(id)
|
|
16
19
|
.then((build) => {
|
|
@@ -26,10 +29,14 @@ export async function watchBuild(
|
|
|
26
29
|
} else {
|
|
27
30
|
progressCallback(state);
|
|
28
31
|
}
|
|
32
|
+
errorCount = 0;
|
|
29
33
|
})
|
|
30
34
|
.catch((error) => {
|
|
31
|
-
|
|
32
|
-
|
|
35
|
+
errorCount++;
|
|
36
|
+
if (errorCount >= STATUS_CHECK_ERROR_THRESHOLD) {
|
|
37
|
+
clearInterval(interval);
|
|
38
|
+
reject(error);
|
|
39
|
+
}
|
|
33
40
|
});
|
|
34
41
|
}, pollInterval);
|
|
35
42
|
});
|