@optimizely/ocp-cli 1.0.11 → 1.0.13
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.js +2 -1
- package/dist/commands/app/BaseBuildCommand.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/Shards.js +9 -1
- package/dist/lib/Shards.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/app/BaseBuildCommand.ts +2 -1
- package/src/commands/directory/Uprade.ts +10 -3
- package/src/lib/Shards.ts +11 -1
- package/src/lib/build.ts +9 -2
|
@@ -74,7 +74,8 @@ class BaseBuildCommand {
|
|
|
74
74
|
const packageUrl = (version === null || version === void 0 ? void 0 : version.state) === AppVersionState.RUNNING
|
|
75
75
|
? version === null || version === void 0 ? void 0 : version.packageUrl
|
|
76
76
|
: await this.uploadPackage(context);
|
|
77
|
-
|
|
77
|
+
const registrationShards = 'us' in shards ? shards : ['us'].concat(shards);
|
|
78
|
+
for (const shard of registrationShards) {
|
|
78
79
|
let appEnv = (0, gatherAppEnv_1.gatherAppEnv)(shard);
|
|
79
80
|
if (usePreviousAppEnvValues && Object.keys(appEnv).length > 0) {
|
|
80
81
|
console.log(chalk.yellow('\n--use-previous-app-env-values is on. Ignoring values from .env file'));
|
|
@@ -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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"}
|
|
@@ -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/Shards.js
CHANGED
|
@@ -24,6 +24,14 @@ async function resolveShards(manifest) {
|
|
|
24
24
|
if (shards.includes('all')) {
|
|
25
25
|
shards = (await Rivendell_1.Rivendell.shards()).map((s) => s.id);
|
|
26
26
|
}
|
|
27
|
-
return
|
|
27
|
+
return shards.sort((a, b) => {
|
|
28
|
+
if (a === 'us') {
|
|
29
|
+
return 1;
|
|
30
|
+
}
|
|
31
|
+
if (b === 'us') {
|
|
32
|
+
return -1;
|
|
33
|
+
}
|
|
34
|
+
return a.localeCompare(b);
|
|
35
|
+
});
|
|
28
36
|
}
|
|
29
37
|
//# sourceMappingURL=Shards.js.map
|
package/dist/lib/Shards.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Shards.js","sourceRoot":"","sources":["../../src/lib/Shards.ts"],"names":[],"mappings":";;;AACA,6CAA2C;AAC3C,qCAAkC;AAClC,2CAAwC;AAEjC,KAAK,UAAU,gBAAgB,CAAC,YAAY,GAAG,EAAE,EAAE,YAA0B;IAClF,IAAI,IAAA,eAAM,GAAE,KAAK,SAAS,EAAE;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IAED,IAAI,YAAY,EAAE;QAChB,OAAO,CAAC,YAAY,CAAC,CAAC;KACvB;IAED,MAAM,QAAQ,GAAG,YAAY,IAAI,IAAA,wBAAW,GAAE,CAAC;IAC/C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAXD,4CAWC;AAEM,KAAK,UAAU,YAAY;IAChC,OAAO,MAAM,aAAa,CAAC,IAAA,wBAAW,GAAE,CAAC,CAAC;AAC5C,CAAC;AAFD,oCAEC;AAED,KAAK,UAAU,aAAa,CAAC,QAAqB;IAChD,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC1B,MAAM,GAAG,CAAC,MAAM,qBAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KACtD;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Shards.js","sourceRoot":"","sources":["../../src/lib/Shards.ts"],"names":[],"mappings":";;;AACA,6CAA2C;AAC3C,qCAAkC;AAClC,2CAAwC;AAEjC,KAAK,UAAU,gBAAgB,CAAC,YAAY,GAAG,EAAE,EAAE,YAA0B;IAClF,IAAI,IAAA,eAAM,GAAE,KAAK,SAAS,EAAE;QAC1B,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;IAED,IAAI,YAAY,EAAE;QAChB,OAAO,CAAC,YAAY,CAAC,CAAC;KACvB;IAED,MAAM,QAAQ,GAAG,YAAY,IAAI,IAAA,wBAAW,GAAE,CAAC;IAC/C,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC;AAXD,4CAWC;AAEM,KAAK,UAAU,YAAY;IAChC,OAAO,MAAM,aAAa,CAAC,IAAA,wBAAW,GAAE,CAAC,CAAC;AAC5C,CAAC;AAFD,oCAEC;AAED,KAAK,UAAU,aAAa,CAAC,QAAqB;IAChD,IAAI,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC1B,MAAM,GAAG,CAAC,MAAM,qBAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;KACtD;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;YACd,OAAO,CAAC,CAAC;SACV;QAED,IAAI,CAAC,KAAK,IAAI,EAAE;YACd,OAAO,CAAC,CAAC,CAAC;SACX;QAED,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
|
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
|
@@ -95,7 +95,8 @@ export abstract class BaseBuildCommand {
|
|
|
95
95
|
? version?.packageUrl
|
|
96
96
|
: await this.uploadPackage(context);
|
|
97
97
|
|
|
98
|
-
|
|
98
|
+
const registrationShards = 'us' in shards ? shards : ['us'].concat(shards);
|
|
99
|
+
for (const shard of registrationShards) {
|
|
99
100
|
let appEnv = gatherAppEnv(shard);
|
|
100
101
|
if (usePreviousAppEnvValues && Object.keys(appEnv).length > 0) {
|
|
101
102
|
console.log(chalk.yellow('\n--use-previous-app-env-values is on. Ignoring values from .env file'));
|
|
@@ -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/Shards.ts
CHANGED
|
@@ -26,5 +26,15 @@ async function resolveShards(manifest: AppManifest) {
|
|
|
26
26
|
shards = (await Rivendell.shards()).map((s) => s.id);
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
return
|
|
29
|
+
return shards.sort((a, b) => {
|
|
30
|
+
if (a === 'us') {
|
|
31
|
+
return 1;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (b === 'us') {
|
|
35
|
+
return -1;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
return a.localeCompare(b);
|
|
39
|
+
});
|
|
30
40
|
}
|
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
|
});
|