@forge/cli 12.5.0-next.4 → 12.5.0
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/CHANGELOG.md +121 -0
- package/npm-shrinkwrap.json +36 -35
- package/out/analytics-client/analytics-client.d.ts +12 -0
- package/out/analytics-client/analytics-client.d.ts.map +1 -1
- package/out/analytics-client/analytics-client.js +31 -0
- package/out/analytics-client/analytics-client.js.map +1 -1
- package/out/autocomplete/autocomplete-config.json +11 -0
- package/out/command-line/command.d.ts +4 -1
- package/out/command-line/command.d.ts.map +1 -1
- package/out/command-line/command.js +25 -8
- package/out/command-line/command.js.map +1 -1
- package/out/command-line/controller/assistant-controller.d.ts +11 -0
- package/out/command-line/controller/assistant-controller.d.ts.map +1 -0
- package/out/command-line/controller/assistant-controller.js +75 -0
- package/out/command-line/controller/assistant-controller.js.map +1 -0
- package/out/command-line/controller/install-controller.d.ts +3 -1
- package/out/command-line/controller/install-controller.d.ts.map +1 -1
- package/out/command-line/controller/install-controller.js +35 -8
- package/out/command-line/controller/install-controller.js.map +1 -1
- package/out/command-line/controller/tunnel-controller.d.ts +3 -1
- package/out/command-line/controller/tunnel-controller.d.ts.map +1 -1
- package/out/command-line/controller/tunnel-controller.js +9 -2
- package/out/command-line/controller/tunnel-controller.js.map +1 -1
- package/out/command-line/dependency-injection.d.ts +2 -0
- package/out/command-line/dependency-injection.d.ts.map +1 -1
- package/out/command-line/dependency-injection.js +8 -5
- package/out/command-line/dependency-injection.js.map +1 -1
- package/out/command-line/index.d.ts.map +1 -1
- package/out/command-line/index.js +2 -0
- package/out/command-line/index.js.map +1 -1
- package/out/command-line/register-app-commands.js +2 -2
- package/out/command-line/register-assistant-commands.d.ts +3 -0
- package/out/command-line/register-assistant-commands.d.ts.map +1 -0
- package/out/command-line/register-assistant-commands.js +34 -0
- package/out/command-line/register-assistant-commands.js.map +1 -0
- package/out/command-line/register-containers-commands.js +2 -2
- package/out/command-line/register-containers-commands.js.map +1 -1
- package/out/command-line/register-installation-commands.d.ts.map +1 -1
- package/out/command-line/register-installation-commands.js +4 -2
- package/out/command-line/register-installation-commands.js.map +1 -1
- package/out/command-line/register-show-commands.js +3 -3
- package/out/command-line/register-show-commands.js.map +1 -1
- package/out/command-line/view/install-view.d.ts +1 -1
- package/out/command-line/view/install-view.d.ts.map +1 -1
- package/out/command-line/view/install-view.js +2 -2
- package/out/command-line/view/install-view.js.map +1 -1
- package/out/deploy/packager/packager.d.ts.map +1 -1
- package/out/deploy/packager/packager.js +3 -1
- package/out/deploy/packager/packager.js.map +1 -1
- package/out/devspace/devspace-service.d.ts +3 -1
- package/out/devspace/devspace-service.d.ts.map +1 -1
- package/out/devspace/devspace-service.js +27 -17
- package/out/devspace/devspace-service.js.map +1 -1
- package/out/installations/graphql-client.d.ts +7 -3
- package/out/installations/graphql-client.d.ts.map +1 -1
- package/out/installations/graphql-client.js +69 -11
- package/out/installations/graphql-client.js.map +1 -1
- package/out/installations/install-app-site.d.ts +4 -2
- package/out/installations/install-app-site.d.ts.map +1 -1
- package/out/installations/install-app-site.js +4 -2
- package/out/installations/install-app-site.js.map +1 -1
- package/out/service/cached-config-service.d.ts +2 -0
- package/out/service/cached-config-service.d.ts.map +1 -1
- package/out/service/cached-config-service.js +12 -0
- package/out/service/cached-config-service.js.map +1 -1
- package/out/service/installation-service.d.ts +9 -1
- package/out/service/installation-service.d.ts.map +1 -1
- package/out/service/installation-service.js +26 -1
- package/out/service/installation-service.js.map +1 -1
- package/package.json +6 -6
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registerCommands = void 0;
|
|
4
|
+
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
|
+
const COMMAND_NAME = 'assistant';
|
|
6
|
+
const ON_COMMAND_NAME = 'on';
|
|
7
|
+
const OFF_COMMAND_NAME = 'off';
|
|
8
|
+
const registerAssistantOnCommand = ({ cmd, controllers: { assistantController } }) => {
|
|
9
|
+
cmd
|
|
10
|
+
.command(`${ON_COMMAND_NAME} <name>`)
|
|
11
|
+
.description(`${cli_shared_1.Text.assistant.on.description}`)
|
|
12
|
+
.requireNoAuthentication()
|
|
13
|
+
.action(async (name) => {
|
|
14
|
+
await assistantController.enableAssistant(name);
|
|
15
|
+
return { analytics: {} };
|
|
16
|
+
});
|
|
17
|
+
};
|
|
18
|
+
const registerAssistantOffCommand = ({ cmd, controllers: { assistantController } }) => {
|
|
19
|
+
cmd
|
|
20
|
+
.command(OFF_COMMAND_NAME)
|
|
21
|
+
.description(cli_shared_1.Text.assistant.off.description)
|
|
22
|
+
.requireNoAuthentication()
|
|
23
|
+
.action(async () => {
|
|
24
|
+
await assistantController.disableAssistant();
|
|
25
|
+
return { analytics: {} };
|
|
26
|
+
});
|
|
27
|
+
};
|
|
28
|
+
const registerCommands = ({ cmd, ...deps }) => {
|
|
29
|
+
const assistant = cmd.command(COMMAND_NAME).requireNoAuthentication().description(cli_shared_1.Text.assistant.description);
|
|
30
|
+
registerAssistantOnCommand({ cmd: assistant, ...deps });
|
|
31
|
+
registerAssistantOffCommand({ cmd: assistant, ...deps });
|
|
32
|
+
};
|
|
33
|
+
exports.registerCommands = registerCommands;
|
|
34
|
+
//# sourceMappingURL=register-assistant-commands.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"register-assistant-commands.js","sourceRoot":"","sources":["../../src/command-line/register-assistant-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAGzC,MAAM,YAAY,GAAG,WAAW,CAAC;AACjC,MAAM,eAAe,GAAG,IAAI,CAAC;AAC7B,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B,MAAM,0BAA0B,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,mBAAmB,EAAE,EAAgB,EAAE,EAAE;IACjG,GAAG;SACA,OAAO,CAAC,GAAG,eAAe,SAAS,CAAC;SACpC,WAAW,CAAC,GAAG,iBAAI,CAAC,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;SAC/C,uBAAuB,EAAE;SACzB,MAAM,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE;QAC7B,MAAM,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAChD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,mBAAmB,EAAE,EAAgB,EAAE,EAAE;IAClG,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,iBAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC;SAC3C,uBAAuB,EAAE;SACzB,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,mBAAmB,CAAC,gBAAgB,EAAE,CAAC;QAC7C,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,EAAgB,EAAQ,EAAE;IACvE,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,uBAAuB,EAAE,CAAC,WAAW,CAAC,iBAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAE9G,0BAA0B,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;IACxD,2BAA2B,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;AAC3D,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}
|
|
@@ -78,8 +78,8 @@ const registerListImagesCommand = (parent, { ui, commands: { containerCommand }
|
|
|
78
78
|
break;
|
|
79
79
|
}
|
|
80
80
|
ui.emptyLine();
|
|
81
|
-
const result = await ui.
|
|
82
|
-
if (result
|
|
81
|
+
const result = await ui.confirm(cli_shared_1.Text.containers.images.list.promptNextPage);
|
|
82
|
+
if (!result) {
|
|
83
83
|
break;
|
|
84
84
|
}
|
|
85
85
|
} while (true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-containers-commands.js","sourceRoot":"","sources":["../../src/command-line/register-containers-commands.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"register-containers-commands.js","sourceRoot":"","sources":["../../src/command-line/register-containers-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyC;AAKzC,MAAM,8BAA8B,GAAG,CACrC,MAAe,EACf,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAC9C,EAAE;IACR,MAAM;SACH,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SAC5C,MAAM,CAAC,iBAAiB,EAAE,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;SAC/D,YAAY,EAAE;SACd,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,IAAI,CAAC,GAAG,EAAE;YACR,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChD,EAAE,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAClE,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QACD,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QACpB,EAAE,CAAC,SAAS,EAAE,CAAC;QAEf,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,eAAe,CACxC,GAAG,EAAE,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAa,CAAC,EACrD,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAC5B,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAC/B,CAAC;QAEF,EAAE,CAAC,SAAS,EAAE,CAAC;QACf,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,CACtC,MAAe,EACf,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAC9C,EAAE;IACR,MAAM;SACH,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;SAClD,YAAY,EAAE;SACd,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAC1D,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QACpB,EAAE,CAAC,SAAS,EAAE,CAAC;QAEf,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,eAAe,EAAE,CAAC;QAC5D,EAAE,CAAC,KAAK,CACN;YACE,CAAC,KAAK,EAAE,eAAe,CAAC;YACxB,CAAC,eAAe,EAAE,gBAAgB,CAAC;SACpC,EACD,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,EACpE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,iBAAI,CAAC,UAAU,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAC9E,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,MAAe,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAAQ,EAAE;IAChH,MAAM;SACH,OAAO,CAAC,QAAQ,CAAC;SACjB,YAAY,EAAE;SACd,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SAC5C,OAAO,CAAC,MAAM,CAAC;SACf,MAAM,CAAC,iBAAiB,EAAE,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;SACpE,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;SACjD,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,IAAI,CAAC,GAAG,EAAE;YACR,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACrD,EAAE,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QACD,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QACpB,EAAE,CAAC,SAAS,EAAE,CAAC;QAEf,IAAI,WAA+B,CAAC;QACpC,GAAG;YACD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAChG,EAAE,CAAC,KAAK,CACN;gBACE,CAAC,MAAM,EAAE,YAAY,CAAC;gBACtB,CAAC,UAAU,EAAE,WAAW,CAAC;gBACzB,CAAC,cAAc,EAAE,gBAAgB,CAAC;gBAClC,CAAC,aAAa,EAAE,cAAc,CAAC;gBAC/B,CAAC,QAAQ,EAAE,QAAQ,CAAC;aACrB,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACrB,QAAQ;gBACR,MAAM;gBACN,YAAY,EAAE,YAAY,IAAI,GAAG;gBACjC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;aACpC,CAAC,CAAC,EACH,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CACzE,CAAC;YACF,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClD,IAAI,CAAC,WAAW,EAAE;gBAChB,MAAM;aACP;YAED,EAAE,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC5E,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM;aACP;SACF,QAAQ,IAAI,EAAE;IACjB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,iCAAiC,GAAG,CACxC,MAAe,EACf,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAC9C,EAAE;IACR,MAAM;SACH,OAAO,CAAC,WAAW,CAAC;SACpB,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;SAC3C,YAAY,EAAE;SACd,MAAM,CAAC,iBAAiB,EAAE,iBAAI,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC;SACjE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;QACzD,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACzB;aAAM;YACL,EAAE,CAAC,KAAK,CACN;gBACE,CAAC,UAAU,EAAE,UAAU,CAAC;gBACxB,CAAC,UAAU,EAAE,UAAU,CAAC;gBACxB,CAAC,UAAU,EAAE,UAAU,CAAC;aACzB,EACD;gBACE;oBACE,GAAG,KAAK;oBACR,QAAQ,EAAE,iBAAI,CAAC,UAAU,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC;iBAClE;aACF,CACF,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,CACrC,MAAe,EACf,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAC9C,EAAE;IACR,MAAM;SACH,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;SAC5C,MAAM,CAAC,iBAAiB,EAAE,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC;SAC/D,YAAY,EAAE;SACd,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;QACxB,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBACtB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;gBAC9D,OAAO;aACR;YACD,MAAM,sBAAsB,GAAG,MAAM,EAAE,CAAC,0BAA0B,CAChE,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EACvC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,EAC/C,CAAC,eAAe,EAAE,gBAAgB,CAAC,EACnC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1C,KAAK,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC;gBAC3B,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,GAAG;aACb,CAAC,CAAC,CACJ,CAAC;YACF,GAAG,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC;YAC7C,EAAE,CAAC,SAAS,EAAE,CAAC;SAChB;QACD,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,EAAE,CAAC,SAAS,EAAE,CAAC;QACf,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAExC,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,YAAY,KAAK,GAAG,EAAE;YACxB,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAChD,OAAO;SACR;QAED,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,KAAK,CAAC,CAAC;QACpB,EAAE,CAAC,SAAS,EAAE,CAAC;QAEf,MAAM,EAAE,CAAC,eAAe,CACtB,GAAG,EAAE,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAa,CAAC,EACrD,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAC5B,iBAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAC/B,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAAC,MAAe,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,gBAAgB,EAAE,EAAgB,EAAQ,EAAE;IACjH,MAAM;SACH,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC;SACjD,YAAY,EAAE;SACd,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,gBAAgB,CAAC,kBAAkB,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAkB,EAAQ,EAAE;IAC3D,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,iBAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE7G,8BAA8B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACpD,+BAA+B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACrD,yBAAyB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/C,iCAAiC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACvD,8BAA8B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IACpD,0BAA0B,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"register-installation-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAmC7G,CAAC;AAoFF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
|
|
@@ -16,9 +16,10 @@ const registerInstallAppCommand = ({ cmd, controllers: { installController } })
|
|
|
16
16
|
.option('-l, --license [license]', cli_shared_1.Text.install.optionLicense)
|
|
17
17
|
.option('--license-modes [licenseModes...]', cli_shared_1.Text.install.optionLicenseModes)
|
|
18
18
|
.option('--users-with-access [user...]', cli_shared_1.Text.install.optionUsersWithAccess)
|
|
19
|
+
.option('--major-version <majorVersion>', cli_shared_1.Text.install.optionMajorVersion)
|
|
19
20
|
.nonInteractiveOption('--site', '--product', '--environment')
|
|
20
21
|
.description(cli_shared_1.Text.install.cmd.description)
|
|
21
|
-
.action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive }) => {
|
|
22
|
+
.action(async ({ environment, site, product, upgrade, confirmScopes, license, licenseModes, usersWithAccess, nonInteractive, majorVersion }) => {
|
|
22
23
|
await installController.run({
|
|
23
24
|
environment,
|
|
24
25
|
site,
|
|
@@ -28,7 +29,8 @@ const registerInstallAppCommand = ({ cmd, controllers: { installController } })
|
|
|
28
29
|
license,
|
|
29
30
|
licenseModes,
|
|
30
31
|
usersWithAccess,
|
|
31
|
-
nonInteractive
|
|
32
|
+
nonInteractive,
|
|
33
|
+
majorVersion
|
|
32
34
|
});
|
|
33
35
|
});
|
|
34
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-installation-commands.js","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAmF;AAGnF,oDAAkF;AAClF,2EAKqC;AACrC,mCAA+B;AAE/B,MAAM,YAAY,GAAG,SAAS,CAAC;AAE/B,MAAM,yBAAyB,GAAG,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,iBAAiB,EAAE,EAAgB,EAAE,EAAE;IAC9F,GAAG;SACA,YAAY,EAAE;SACd,iBAAiB,EAAE;SACnB,aAAa,EAAE;SACf,MAAM,CAAC,WAAW,EAAE,iBAAI,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC;SACtD,MAAM,CAAC,kBAAkB,EAAE,iBAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,KAAK,CAAC;SACnE,MAAM,CAAC,yBAAyB,EAAE,iBAAI,CAAC,OAAO,CAAC,aAAa,CAAC;SAC7D,MAAM,CAAC,mCAAmC,EAAE,iBAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;SAC5E,MAAM,CAAC,+BAA+B,EAAE,iBAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC;SAC3E,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,eAAe,CAAC;SAC5D,WAAW,CAAC,iBAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;SACzC,MAAM,CACL,KAAK,EAAE,EACL,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,OAAO,EACP,YAAY,EACZ,eAAe,EACf,cAAc,
|
|
1
|
+
{"version":3,"file":"register-installation-commands.js","sourceRoot":"","sources":["../../src/command-line/register-installation-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function showCommandError(ui, message) {
|
|
|
15
15
|
ui.emptyLine();
|
|
16
16
|
}
|
|
17
17
|
function specifiedContainerExists(allServiceContainers, containerKey) {
|
|
18
|
-
return
|
|
18
|
+
return allServiceContainers.some((ct) => ct.key === containerKey && ct.instances && ct.instances.length > 0);
|
|
19
19
|
}
|
|
20
20
|
const SHOW_SERVICES_COMMAND_NAME = 'services';
|
|
21
21
|
const registerShowServiceCommand = (parent, { ui, commands: { containerCommand }, configFile }) => {
|
|
@@ -27,7 +27,7 @@ const registerShowServiceCommand = (parent, { ui, commands: { containerCommand }
|
|
|
27
27
|
.requireAppId()
|
|
28
28
|
.action(async ({ service, environment }) => {
|
|
29
29
|
ui.info(cli_shared_1.Text.show.services.overview);
|
|
30
|
-
environment = (0, cli_shared_1.
|
|
30
|
+
environment = (0, cli_shared_1.optionToEnvironment)(environment);
|
|
31
31
|
const serviceNames = service ? [service] : readServicesFromConfig(await configFile.readConfig());
|
|
32
32
|
const { services } = await containerCommand.getContainerServiceDetails(environment, serviceNames);
|
|
33
33
|
if (!services || !services.length) {
|
|
@@ -78,7 +78,7 @@ const registerShowContainerCommand = (parent, { ui, commands: { containerCommand
|
|
|
78
78
|
.requireAppId()
|
|
79
79
|
.action(async ({ environment, service, container }) => {
|
|
80
80
|
ui.info(cli_shared_1.Text.show.containers.overview);
|
|
81
|
-
environment = (0, cli_shared_1.
|
|
81
|
+
environment = (0, cli_shared_1.optionToEnvironment)(environment);
|
|
82
82
|
if (!service) {
|
|
83
83
|
ui.emptyLine();
|
|
84
84
|
const serviceNames = readServicesFromConfig(await configFile.readConfig());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-show-commands.js","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":";;;AAAA,kDAAyF;AAKzF,SAAS,sBAAsB,CAAC,QAAwB;IACtD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IACD,OAAO,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,gBAAiB,SAAQ,KAAK;CAAG;AAEvC,SAAS,gBAAgB,CAAC,EAAM,EAAE,OAAe;IAC/C,EAAE,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,EAAE,CAAC,SAAS,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,wBAAwB,CAAC,oBAA6C,EAAE,YAAqB;IACpG,OAAO,
|
|
1
|
+
{"version":3,"file":"register-show-commands.js","sourceRoot":"","sources":["../../src/command-line/register-show-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ interface InstallOrUpgradeCommandText {
|
|
|
9
9
|
export declare class InstallView {
|
|
10
10
|
private readonly ui;
|
|
11
11
|
constructor(ui: UI);
|
|
12
|
-
promptForPermissionsConfirmation({ scopes, egressAddresses }: AppEnvironmentPermissions, listScopes: ListScope[], manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText): Promise<boolean>;
|
|
12
|
+
promptForPermissionsConfirmation({ scopes, egressAddresses }: AppEnvironmentPermissions, listScopes: ListScope[], manifestScopes: string[], manifestEgressAddresses: string[], environment: string, confirmScopes: boolean, nonInteractive: boolean, text: InstallOrUpgradeCommandText, isPreviousVersion: boolean): Promise<boolean>;
|
|
13
13
|
promptForUpgrade(installations: Installation[]): Promise<Installation>;
|
|
14
14
|
displayUIKit1DeprecationMessage(modules: string[]): void;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,EAAE,EAA8B,SAAS,EAAa,MAAM,mBAAmB,CAAC;AAKpH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,MAAM,CAAC;IAC5C,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,yBAAyB,EACtD,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,
|
|
1
|
+
{"version":3,"file":"install-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,EAAE,EAA8B,SAAS,EAAa,MAAM,mBAAmB,CAAC;AAKpH,OAAO,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAE7F,UAAU,2BAA2B;IACnC,UAAU,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,MAAM,CAAC;IAC5C,mBAAmB,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,MAAM,CAAC;IAC3D,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,gCAAgC,EAAE,CAAC,gCAAgC,EAAE,OAAO,KAAK,MAAM,CAAC;CACzF;AAED,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,yBAAyB,EACtD,UAAU,EAAE,SAAS,EAAE,EACvB,cAAc,EAAE,MAAM,EAAE,EACxB,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,2BAA2B,EACjC,iBAAiB,EAAE,OAAO,GACzB,OAAO,CAAC,OAAO,CAAC;IAgCN,gBAAgB,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAc5E,+BAA+B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;CAKhE"}
|
|
@@ -10,14 +10,14 @@ class InstallView {
|
|
|
10
10
|
constructor(ui) {
|
|
11
11
|
this.ui = ui;
|
|
12
12
|
}
|
|
13
|
-
async promptForPermissionsConfirmation({ scopes, egressAddresses }, listScopes, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text) {
|
|
13
|
+
async promptForPermissionsConfirmation({ scopes, egressAddresses }, listScopes, manifestScopes, manifestEgressAddresses, environment, confirmScopes, nonInteractive, text, isPreviousVersion) {
|
|
14
14
|
if (listScopes.length)
|
|
15
15
|
this.ui.info(text.listScopes(listScopes));
|
|
16
16
|
if (egressAddresses.length)
|
|
17
17
|
this.ui.info(text.listEgressAddresses(egressAddresses));
|
|
18
18
|
const groupedManifestEgressAddresses = (0, egress_1.sortAndGroupEgressPermissionsByDomain)(manifestEgressAddresses);
|
|
19
19
|
let permissionsMismatchWithManifest = false;
|
|
20
|
-
if ((0, cli_shared_1.environmentToOption)(environment) === cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
|
|
20
|
+
if ((0, cli_shared_1.environmentToOption)(environment) === cli_shared_1.DEFAULT_ENVIRONMENT_OPTION && !isPreviousVersion) {
|
|
21
21
|
const scopesMismatch = !(0, lodash_1.isEqual)([...manifestScopes].sort(), [...scopes].sort());
|
|
22
22
|
const egressAddressesMismatch = !(0, lodash_1.isEqual)([...groupedManifestEgressAddresses].sort(), [...egressAddresses].sort());
|
|
23
23
|
permissionsMismatchWithManifest = scopesMismatch || egressAddressesMismatch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-view.js","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":";;;AAAA,kDAAoH;AACpH,0CAAsE;AAEtE,mCAAiC;AACjC,iFAAmF;AAUnF,MAAa,WAAW;IACO;IAA7B,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;IAAG,CAAC;IAEhC,KAAK,CAAC,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAA6B,EACtD,UAAuB,EACvB,cAAwB,EACxB,uBAAiC,EACjC,WAAmB,EACnB,aAAsB,EACtB,cAAuB,EACvB,IAAiC;
|
|
1
|
+
{"version":3,"file":"install-view.js","sourceRoot":"","sources":["../../../src/command-line/view/install-view.ts"],"names":[],"mappings":";;;AAAA,kDAAoH;AACpH,0CAAsE;AAEtE,mCAAiC;AACjC,iFAAmF;AAUnF,MAAa,WAAW;IACO;IAA7B,YAA6B,EAAM;QAAN,OAAE,GAAF,EAAE,CAAI;IAAG,CAAC;IAEhC,KAAK,CAAC,gCAAgC,CAC3C,EAAE,MAAM,EAAE,eAAe,EAA6B,EACtD,UAAuB,EACvB,cAAwB,EACxB,uBAAiC,EACjC,WAAmB,EACnB,aAAsB,EACtB,cAAuB,EACvB,IAAiC,EACjC,iBAA0B;QAE1B,IAAI,UAAU,CAAC,MAAM;YAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;QAEjE,IAAI,eAAe,CAAC,MAAM;YAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;QAEpF,MAAM,8BAA8B,GAAG,IAAA,8CAAqC,EAAC,uBAAuB,CAAC,CAAC;QAEtG,IAAI,+BAA+B,GAAG,KAAK,CAAC;QAC5C,IAAI,IAAA,gCAAmB,EAAC,WAAW,CAAC,KAAK,uCAA0B,IAAI,CAAC,iBAAiB,EAAE;YAEzF,MAAM,cAAc,GAAG,CAAC,IAAA,gBAAO,EAAC,CAAC,GAAG,cAAc,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAEhF,MAAM,uBAAuB,GAAG,CAAC,IAAA,gBAAO,EAAC,CAAC,GAAG,8BAA8B,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAElH,+BAA+B,GAAG,cAAc,IAAI,uBAAuB,CAAC;YAE5E,IAAI,+BAA+B,EAAE;gBACnC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;aACrD;SACF;QAED,IAAI,CAAC,aAAa,IAAI,CAAC,cAAc,EAAE;YACrC,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CACpD,IAAI,CAAC,gCAAgC,CAAC,+BAA+B,CAAC,CACvE,CAAC;YACF,IAAI,wBAAwB;gBAAE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;YAClD,OAAO,wBAAwB,CAAC;SACjC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,aAA6B;QACzD,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YACzB,MAAM,IAAI,sBAAS,CAAC,iBAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SACvD;QACD,MAAM,YAAY,GAAG,IAAA,8CAAwB,EAC3C,IAAI,CAAC,EAAE,EACP,aAAa,EACb,iBAAI,CAAC,cAAc,CAAC,kBAAkB,EACtC,iBAAI,CAAC,cAAc,CAAC,QAAQ,CAC7B,CAAC;QAEF,OAAO,YAAY,CAAC;IACtB,CAAC;IAEM,+BAA+B,CAAC,OAAiB;QACtD,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;IACtB,CAAC;CACF;AAhED,kCAgEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAQ,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAkC,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAyB,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEzG,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,eAAe,EAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CACL,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC,CAAC;CAC3B;AAED,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAHf,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,uBAAuB;IAG9C,OAAO,CAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC;IAiBzB,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"packager.d.ts","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,EAAE,eAAe,EAAQ,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAkC,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAyB,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAEzG,MAAM,WAAW,aAAa;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,eAAe,EAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,OAAO,CACL,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC,CAAC;CAC3B;AAED,qBAAa,WAAY,YAAW,QAAQ;IAExC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBAHf,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,uBAAuB;IAG9C,OAAO,CAClB,QAAQ,EAAE,OAAO,EAAE,EACnB,SAAS,EAAE,eAAe,EAAE,EAC5B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,CAAC,EAAE,YAAY,GACxB,OAAO,CAAC,aAAa,CAAC;IAiBzB,OAAO,CAAC,cAAc;CAYvB"}
|
|
@@ -33,7 +33,9 @@ class AppPackager {
|
|
|
33
33
|
esm: bundleMetadata.esm,
|
|
34
34
|
dependencies: Array.from(bundleMetadata.dependencies),
|
|
35
35
|
sdkImports: Array.from(bundleMetadata.sdkImports),
|
|
36
|
-
|
|
36
|
+
errors: bundleMetadata.errors,
|
|
37
|
+
isCI: process.env.CI === 'true',
|
|
38
|
+
bundler: bundleMetadata.bundler
|
|
37
39
|
};
|
|
38
40
|
}
|
|
39
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packager.js","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AACpG,4CAAiF;AAsBjF,MAAa,WAAW;IAEH;IACA;IACA;IACA;IAJnB,YACmB,cAA8B,EAC9B,eAAgC,EAChC,MAAc,EACd,eAAwC;QAHxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAyB;IACxD,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,QAAmB,EACnB,SAA4B,EAC5B,aAA6B,EAC7B,kBAAsC,EACtC,UAAyB;QAEzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACpG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEzF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAErG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEvD,OAAO;YACL,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;YACpD,UAAU,EAAE,aAAa,CAAC,QAAQ,CAAC,OAAO;YAC1C,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,cAA+B;QACpD,OAAO;YACL,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,GAAG,EAAE,cAAc,CAAC,GAAG;YACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;YACrD,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;YACjD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;SAChC,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"packager.js","sourceRoot":"","sources":["../../../src/deploy/packager/packager.ts"],"names":[],"mappings":";;;AAAA,kDAAoG;AACpG,4CAAiF;AAsBjF,MAAa,WAAW;IAEH;IACA;IACA;IACA;IAJnB,YACmB,cAA8B,EAC9B,eAAgC,EAChC,MAAc,EACd,eAAwC;QAHxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAyB;IACxD,CAAC;IAEG,KAAK,CAAC,OAAO,CAClB,QAAmB,EACnB,SAA4B,EAC5B,aAA6B,EAC7B,kBAAsC,EACtC,UAAyB;QAEzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,EAAE,aAAa,CAAC,CAAC;QACpG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAEzF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;QAErG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEvD,OAAO;YACL,kBAAkB,EAAE,aAAa,CAAC,kBAAkB;YACpD,UAAU,EAAE,aAAa,CAAC,QAAQ,CAAC,OAAO;YAC1C,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,cAA+B;QACpD,OAAO;YACL,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,OAAO,EAAE,cAAc,CAAC,OAAO;YAC/B,GAAG,EAAE,cAAc,CAAC,GAAG;YACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;YACrD,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;YACjD,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;YAC/B,OAAO,EAAE,cAAc,CAAC,OAAO;SAChC,CAAC;IACJ,CAAC;CACF;AA3CD,kCA2CC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { CommandLineUI } from '@forge/cli-shared';
|
|
2
2
|
import { DevSpaceClient, DevSpaceDetails, DevSpaceCreateResult } from './graphql-client';
|
|
3
|
+
import { AnalyticsClientReporter } from '../analytics-client/analytics-client';
|
|
3
4
|
export declare class DevSpaceService {
|
|
4
5
|
private readonly devSpaceClient;
|
|
5
|
-
|
|
6
|
+
private readonly analyticsClient;
|
|
7
|
+
constructor(devSpaceClient: DevSpaceClient, analyticsClient: AnalyticsClientReporter);
|
|
6
8
|
private fetchAllDevSpaces;
|
|
7
9
|
private doesDevSpaceAlreadyExists;
|
|
8
10
|
getDevSpaces(ui: CommandLineUI): Promise<DevSpaceDetails[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devspace-service.d.ts","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"devspace-service.d.ts","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAQ,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAM/E,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,cAAc,EAAE,cAAc,EAC9B,eAAe,EAAE,uBAAuB;YAG7C,iBAAiB;IAU/B,OAAO,CAAC,yBAAyB;IAKpB,YAAY,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3D,cAAc,CACzB,EAAE,EAAE,aAAa,EACjB,SAAS,EAAE,eAAe,EAAE,EAC5B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,QAAQ,EAAE,eAAe,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IA2C5D,kBAAkB,CAAC,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;YAI1E,sBAAsB;CAkDrC"}
|
|
@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DevSpaceService = void 0;
|
|
4
4
|
const cli_shared_1 = require("@forge/cli-shared");
|
|
5
5
|
const DEV_SPACE_ERROR_MESSAGES = {
|
|
6
|
-
NAME_ALREADY_EXISTS: 'Developer
|
|
6
|
+
NAME_ALREADY_EXISTS: 'Developer Space with this name already exists'
|
|
7
7
|
};
|
|
8
8
|
class DevSpaceService {
|
|
9
9
|
devSpaceClient;
|
|
10
|
-
|
|
10
|
+
analyticsClient;
|
|
11
|
+
constructor(devSpaceClient, analyticsClient) {
|
|
11
12
|
this.devSpaceClient = devSpaceClient;
|
|
13
|
+
this.analyticsClient = analyticsClient;
|
|
12
14
|
}
|
|
13
15
|
async fetchAllDevSpaces() {
|
|
14
16
|
const devSpaceIds = await this.devSpaceClient.getDevSpacesWithLinkingAccess();
|
|
@@ -66,33 +68,41 @@ class DevSpaceService {
|
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
70
|
async createDevSpaceFlow(ui) {
|
|
69
|
-
const cont = await ui.confirm(cli_shared_1.Text.devSpace.createContinuePrompt);
|
|
70
|
-
if (!cont) {
|
|
71
|
-
return null;
|
|
72
|
-
}
|
|
73
71
|
return await this.promptForNameAndCreate(ui);
|
|
74
72
|
}
|
|
75
73
|
async promptForNameAndCreate(ui, isRetry = false) {
|
|
76
|
-
if (isRetry) {
|
|
77
|
-
ui.info(cli_shared_1.Text.devSpace.error.nameAlreadyExists);
|
|
78
|
-
ui.emptyLine();
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
74
|
+
if (!isRetry) {
|
|
81
75
|
ui.info(cli_shared_1.Text.devSpace.createMessage);
|
|
82
76
|
}
|
|
83
77
|
const name = await ui.promptForText(cli_shared_1.Text.devSpace.createPrompt);
|
|
84
|
-
if (!name || !name.trim()) {
|
|
85
|
-
ui.info(cli_shared_1.Text.devSpace.nameRequired);
|
|
86
|
-
return null;
|
|
87
|
-
}
|
|
88
78
|
ui.emptyLine();
|
|
89
79
|
ui.clearSpinner();
|
|
90
80
|
try {
|
|
91
|
-
const result = await ui.displayProgress(() => this.devSpaceClient.createDevSpace({ name
|
|
81
|
+
const result = await ui.displayProgress(() => this.devSpaceClient.createDevSpace({ name }), cli_shared_1.Text.devSpace.createInProgress, (result) => cli_shared_1.Text.devSpace.createdAndContributing(result.name));
|
|
82
|
+
await this.analyticsClient.reportDevSpaceCreated({
|
|
83
|
+
developerSpaceId: result.id,
|
|
84
|
+
developerSpaceName: result.name,
|
|
85
|
+
isRetryAttempt: isRetry
|
|
86
|
+
});
|
|
92
87
|
return result;
|
|
93
88
|
}
|
|
94
89
|
catch (error) {
|
|
95
|
-
if (
|
|
90
|
+
if (error.statusCode === 400) {
|
|
91
|
+
if (this.doesDevSpaceAlreadyExists(error)) {
|
|
92
|
+
ui.info(cli_shared_1.Text.devSpace.error.nameAlreadyExists);
|
|
93
|
+
ui.emptyLine();
|
|
94
|
+
await this.analyticsClient.reportDevSpaceRetryAttempt({
|
|
95
|
+
triedDeveloperSpaceName: name,
|
|
96
|
+
reason: 'nameAlreadyExists'
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
await this.analyticsClient.reportDevSpaceRetryAttempt({
|
|
101
|
+
triedDeveloperSpaceName: name,
|
|
102
|
+
reason: 'validationError'
|
|
103
|
+
});
|
|
104
|
+
ui.error(new Error(cli_shared_1.Text.devSpace.error.create(error.message)));
|
|
105
|
+
}
|
|
96
106
|
return await this.promptForNameAndCreate(ui, true);
|
|
97
107
|
}
|
|
98
108
|
throw error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devspace-service.js","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":";;;AAAA,kDAAwD;
|
|
1
|
+
{"version":3,"file":"devspace-service.js","sourceRoot":"","sources":["../../src/devspace/devspace-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,10 @@ export declare class PermissionDeniedError extends GraphQlMutationError {
|
|
|
11
11
|
constructor(requestId: string | undefined, appId: string | undefined, statusCode: number | undefined);
|
|
12
12
|
}
|
|
13
13
|
export declare class AlreadyInstalledError extends GraphQlMutationError {
|
|
14
|
-
|
|
14
|
+
readonly hasMajorVersion?: boolean | undefined;
|
|
15
|
+
readonly environment?: string | undefined;
|
|
16
|
+
readonly environmentType?: AppEnvironmentType | undefined;
|
|
17
|
+
constructor(requestId: string | undefined, statusCode: number | undefined, hasMajorVersion?: boolean | undefined, environment?: string | undefined, environmentType?: AppEnvironmentType | undefined);
|
|
15
18
|
}
|
|
16
19
|
export declare class InstallationError extends GraphQlMutationError {
|
|
17
20
|
constructor(message: string, { requestId, code, statusCode }: {
|
|
@@ -57,10 +60,10 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
|
|
|
57
60
|
constructor(graphqlClient: GraphQLClient, sitedProductTranslator: SiteTranslator, bitbucketTranslator: SiteTranslator, pause: Pause);
|
|
58
61
|
private buildInstallationContext;
|
|
59
62
|
private getProductTranslation;
|
|
60
|
-
installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides }: AppInstallSiteDetails): Promise<void>;
|
|
63
|
+
installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides, majorVersionId, environmentType }: AppInstallSiteDetails): Promise<void>;
|
|
61
64
|
getEntitlementOffering(site: URL, product: SupportedProduct): Promise<Maybe<CcpEntitlement | HamsEntitlement | undefined>>;
|
|
62
65
|
getHamsProductKeys(product: SupportedProduct): string[];
|
|
63
|
-
upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
|
|
66
|
+
upgradeInstallation({ site, product, environmentKey, appId, majorVersionId }: AppInstallSiteDetails): Promise<void>;
|
|
64
67
|
private monitorAppInstallOrUpgrade;
|
|
65
68
|
private handleFailedInstallOrUpgrade;
|
|
66
69
|
uninstallApp(input: AppUninstallationInput): Promise<boolean>;
|
|
@@ -77,5 +80,6 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
|
|
|
77
80
|
private getAllInstallations;
|
|
78
81
|
static buildInstallationsFilter(appId: string, installationFilterOptions: InstallationFilterOptions | undefined, buildInstallationContext: (product: string, site: URL) => Promise<string>): Promise<AppInstallationsByAppFilter>;
|
|
79
82
|
getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironmentVersionData>;
|
|
83
|
+
getVersionByMajorVersionId(id: string, environmentKey: string, majorVersion?: number): Promise<AppEnvironmentVersionData | undefined>;
|
|
80
84
|
}
|
|
81
85
|
//# sourceMappingURL=graphql-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAK1B,OAAO,EACL,kBAAkB,EAIlB,sBAAsB,EAKtB,aAAa,EACb,oBAAoB,EAGpB,KAAK,EAIL,KAAK,EAGL,SAAS,EACT,SAAS,EAET,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,2BAA2B,
|
|
1
|
+
{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,17 @@ class PermissionDeniedError extends cli_shared_1.GraphQlMutationError {
|
|
|
20
20
|
}
|
|
21
21
|
exports.PermissionDeniedError = PermissionDeniedError;
|
|
22
22
|
class AlreadyInstalledError extends cli_shared_1.GraphQlMutationError {
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
hasMajorVersion;
|
|
24
|
+
environment;
|
|
25
|
+
environmentType;
|
|
26
|
+
constructor(requestId, statusCode, hasMajorVersion, environment, environmentType) {
|
|
27
|
+
const message = hasMajorVersion && environment && environmentType
|
|
28
|
+
? cli_shared_1.Text.install.error.alreadyInstalledErrorWithMajorVersion(environment, environmentType)
|
|
29
|
+
: cli_shared_1.Text.install.error.alreadyInstalledError;
|
|
30
|
+
super(message, { requestId, code: ALREADY_INSTALLED_CODE, statusCode });
|
|
31
|
+
this.hasMajorVersion = hasMajorVersion;
|
|
32
|
+
this.environment = environment;
|
|
33
|
+
this.environmentType = environmentType;
|
|
25
34
|
}
|
|
26
35
|
}
|
|
27
36
|
exports.AlreadyInstalledError = AlreadyInstalledError;
|
|
@@ -102,7 +111,7 @@ class InstallationsGraphqlClient {
|
|
|
102
111
|
}
|
|
103
112
|
return this.sitedProductTranslator;
|
|
104
113
|
}
|
|
105
|
-
async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides }) {
|
|
114
|
+
async installAppIntoSite({ environmentKey, site, product, appId, licenseOverride, overrides, majorVersionId, environmentType }) {
|
|
106
115
|
const workspaceAri = await this.buildInstallationContext(product, site);
|
|
107
116
|
const query = `
|
|
108
117
|
mutation forge_cli_installApplication($input: AppInstallationInput!) {
|
|
@@ -126,7 +135,8 @@ class InstallationsGraphqlClient {
|
|
|
126
135
|
environmentKey,
|
|
127
136
|
async: true,
|
|
128
137
|
licenseOverride,
|
|
129
|
-
overrides
|
|
138
|
+
overrides,
|
|
139
|
+
...(majorVersionId ? { versionId: majorVersionId } : {})
|
|
130
140
|
}
|
|
131
141
|
};
|
|
132
142
|
const { response: { installApp: { success, taskId, errors } }, requestId } = await this.graphqlClient.mutate(query, variables);
|
|
@@ -144,7 +154,7 @@ class InstallationsGraphqlClient {
|
|
|
144
154
|
if (!taskId) {
|
|
145
155
|
throw new MissingTaskIdError(error.message);
|
|
146
156
|
}
|
|
147
|
-
await this.monitorAppInstallOrUpgrade(taskId);
|
|
157
|
+
await this.monitorAppInstallOrUpgrade(taskId, !!majorVersionId, environmentKey, environmentType);
|
|
148
158
|
}
|
|
149
159
|
async getEntitlementOffering(site, product) {
|
|
150
160
|
try {
|
|
@@ -203,7 +213,7 @@ class InstallationsGraphqlClient {
|
|
|
203
213
|
throw new Error('Unsupported product');
|
|
204
214
|
}
|
|
205
215
|
}
|
|
206
|
-
async upgradeInstallation({ site, product, environmentKey, appId }) {
|
|
216
|
+
async upgradeInstallation({ site, product, environmentKey, appId, majorVersionId }) {
|
|
207
217
|
const workspaceAri = await this.buildInstallationContext(product, site);
|
|
208
218
|
const query = `
|
|
209
219
|
mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
|
|
@@ -240,28 +250,28 @@ class InstallationsGraphqlClient {
|
|
|
240
250
|
if (!taskId) {
|
|
241
251
|
throw new MissingTaskIdError(error.message);
|
|
242
252
|
}
|
|
243
|
-
await this.monitorAppInstallOrUpgrade(taskId);
|
|
253
|
+
await this.monitorAppInstallOrUpgrade(taskId, !!majorVersionId, environmentKey);
|
|
244
254
|
}
|
|
245
|
-
async monitorAppInstallOrUpgrade(taskId) {
|
|
255
|
+
async monitorAppInstallOrUpgrade(taskId, hasMajorVersion, environment, environmentType) {
|
|
246
256
|
let status = cli_shared_1.AppTaskState.Pending;
|
|
247
257
|
while (status !== cli_shared_1.AppTaskState.Complete) {
|
|
248
258
|
const result = await this.getAppInstallationTaskRetry(taskId);
|
|
249
259
|
status = result.state;
|
|
250
260
|
if (status === cli_shared_1.AppTaskState.Failed) {
|
|
251
|
-
this.handleFailedInstallOrUpgrade(result);
|
|
261
|
+
this.handleFailedInstallOrUpgrade(result, hasMajorVersion, environment, environmentType);
|
|
252
262
|
}
|
|
253
263
|
if (status !== cli_shared_1.AppTaskState.Complete)
|
|
254
264
|
await this.pause(exports.UNINSTALLATION_EVENT_POLL_INTERVAL);
|
|
255
265
|
}
|
|
256
266
|
}
|
|
257
|
-
handleFailedInstallOrUpgrade(result) {
|
|
267
|
+
handleFailedInstallOrUpgrade(result, hasMajorVersion, environment, environmentType) {
|
|
258
268
|
const { errors, requestId } = result;
|
|
259
269
|
const error = errors?.[0];
|
|
260
270
|
const statusCode = error?.extensions?.statusCode;
|
|
261
271
|
const isUserError = statusCode && statusCode >= 400 && statusCode < 500 ? true : false;
|
|
262
272
|
const code = error?.extensions?.errorType ?? undefined;
|
|
263
273
|
if (code === ALREADY_INSTALLED_CODE) {
|
|
264
|
-
throw new AlreadyInstalledError(requestId, statusCode ?? undefined);
|
|
274
|
+
throw new AlreadyInstalledError(requestId, statusCode ?? undefined, hasMajorVersion, environment, environmentType);
|
|
265
275
|
}
|
|
266
276
|
if (error && requestId) {
|
|
267
277
|
error.message = cli_shared_1.Text.install.error.appendRequestIdToErrorMessage(error.message ?? undefined, requestId);
|
|
@@ -570,6 +580,54 @@ class InstallationsGraphqlClient {
|
|
|
570
580
|
environmentType: result.app.environmentByKey.type
|
|
571
581
|
};
|
|
572
582
|
}
|
|
583
|
+
async getVersionByMajorVersionId(id, environmentKey, majorVersion) {
|
|
584
|
+
if (!majorVersion) {
|
|
585
|
+
return undefined;
|
|
586
|
+
}
|
|
587
|
+
const query = `
|
|
588
|
+
query forge_cli_getApplicationVersionList($id: ID!, $environmentKey: String!, $majorVersion: Int!) {
|
|
589
|
+
app(id: $id) {
|
|
590
|
+
environmentByKey(key: $environmentKey) {
|
|
591
|
+
type
|
|
592
|
+
versions(majorVersion: $majorVersion) {
|
|
593
|
+
nodes {
|
|
594
|
+
id
|
|
595
|
+
version
|
|
596
|
+
isLatest
|
|
597
|
+
requiredProducts
|
|
598
|
+
permissions {
|
|
599
|
+
egress {
|
|
600
|
+
addresses
|
|
601
|
+
}
|
|
602
|
+
scopes {
|
|
603
|
+
key
|
|
604
|
+
}
|
|
605
|
+
}
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
}
|
|
609
|
+
}
|
|
610
|
+
}`;
|
|
611
|
+
const variables = {
|
|
612
|
+
id,
|
|
613
|
+
environmentKey,
|
|
614
|
+
majorVersion
|
|
615
|
+
};
|
|
616
|
+
const { app } = await this.graphqlClient.query(query, variables);
|
|
617
|
+
if (!app) {
|
|
618
|
+
throw new MissingAppError();
|
|
619
|
+
}
|
|
620
|
+
if (!app.environmentByKey) {
|
|
621
|
+
throw new EnvironmentNotFoundError(environmentKey);
|
|
622
|
+
}
|
|
623
|
+
if (!app.environmentByKey.versions?.nodes?.length) {
|
|
624
|
+
return undefined;
|
|
625
|
+
}
|
|
626
|
+
return {
|
|
627
|
+
nodes: app.environmentByKey.versions.nodes,
|
|
628
|
+
environmentType: app.environmentByKey.type
|
|
629
|
+
};
|
|
630
|
+
}
|
|
573
631
|
}
|
|
574
632
|
exports.InstallationsGraphqlClient = InstallationsGraphqlClient;
|
|
575
633
|
//# sourceMappingURL=graphql-client.js.map
|