@forge/cli 11.3.0-next.5-experimental-c9be087 → 11.3.0

package/out/command-line/controller/install-controller.js

@@ -83,7 +83,7 @@ class InstallController {
         ];
     }
     async promptForSite(products) {
-        const isWorkspaceBased = products.length > 0 && this.supportedProductsService.isWorkspaceProduct(products[0]);
+        const isWorkspaceBased = products.length > 0 && this.supportedProductsService.isWorkspaceProduct((0, cli_shared_1.productDisplayName)(products[0]));
         const overviewText = isWorkspaceBased
             ? cli_shared_1.Text.installationContext.overviewWorkspace
             : cli_shared_1.Text.installationContext.overviewSite;
@@ -96,21 +96,36 @@ class InstallController {
         if (!trySite) {
             throw new cli_shared_1.ValidationError(invalidText);
         }
-        return this.supportedProductsService.validateSite(trySite, products[0]);
+        return this.supportedProductsService.validateSite(trySite, products[0] && (0, cli_shared_1.productDisplayName)(products[0]));
     }
-    async promptForUpgrade(siteOption, productOption, environmentOption) {
+    async getAppInstallations(siteOption, productOption, environmentOption) {
         const { installations } = await this.installationService.listNonTechnicalAppInstallations({
             site: siteOption,
             product: productOption,
             environment: environmentOption
         });
-        const { site, product, environmentKey, environmentType } = await this.installView.promptForUpgrade(installations);
+        return installations;
+    }
+    async getInstallationToUpgrade(siteOption, productOption, environmentOption) {
+        const matchingInstallations = await this.getAppInstallations(siteOption, productOption, environmentOption);
+        let selectedInstallationToUpgrade;
+        if (siteOption && productOption?.length) {
+            if (!matchingInstallations.length) {
+                throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidInstallationContext);
+            }
+            selectedInstallationToUpgrade = matchingInstallations[0];
+        }
+        else {
+            selectedInstallationToUpgrade = await this.installView.promptForUpgrade(matchingInstallations);
+        }
+        const { site, product, environmentKey, environmentType, version } = selectedInstallationToUpgrade;
         const productName = (0, cli_shared_1.productDisplayName)(product);
         return {
             site: this.supportedProductsService.validateSite(site, productName),
-            product: productName,
+            product: this.supportedProductsService.validateSupportedProduct(productName),
             environment: environmentKey,
-            environmentType
+            environmentType,
+            scopes: version.scopes
         };
     }
     getUniqueInstallationProductsFromScopes(scopes) {
@@ -146,6 +161,8 @@ class InstallController {
         return upperCaseLicense;
     }
     checkForUIKit1Modules = (modules) => {
+        if (!modules)
+            return;
         const uiKit1Modules = (0, cli_shared_1.findUIKit1Modules)(modules);
         if (uiKit1Modules.length > 0) {
             this.installView.displayUIKit1DeprecationMessage(uiKit1Modules);
@@ -158,19 +175,19 @@ class InstallController {
         const overrides = await this.validateEcosystemAppInstallationOverridesInput(licenseModes, usersWithAccess, environment);
         const environmentPermissions = await this.installationService.getAppEnvironmentPermissions(id, environment);
         const requiredProducts = environmentPermissions?.requiredProducts;
-        if (upgrade && (!site || !products?.length)) {
-            const upgradeResult = await this.promptForUpgrade(site, products?.[0], environment);
+        let scopesFromLastInstallation = new Set();
+        if (upgrade) {
+            const upgradeResult = await this.getInstallationToUpgrade(site, products?.[0], environment);
             environment = upgradeResult.environment;
             site = upgradeResult.site;
             products = [upgradeResult.product];
+            scopesFromLastInstallation = new Set(upgradeResult.scopes);
+            this.ui.info(this.supportedProductsService.isWorkspaceProduct(products[0]) ? text.bannerWorkspace : text.bannerSite);
         }
-        if (!requiredProducts?.length) {
+        else if (!requiredProducts?.length) {
             products = products?.length ? products : await this.promptForProducts();
             site = site ? site : await this.promptForSite(products);
-            const bannerText = (await this.supportedProductsService.isWorkspaceProduct(products[0]))
-                ? text.bannerWorkspace
-                : text.bannerSite;
-            this.ui.info(bannerText);
+            this.ui.info(this.supportedProductsService.isWorkspaceProduct(products[0]) ? text.bannerWorkspace : text.bannerSite);
         }
         else {
             const result = await this.getXPAProductsAndSite(requiredProducts.map(cli_shared_1.productDisplayName), products, site);
@@ -185,21 +202,16 @@ class InstallController {
             this.ui.error(new NoDeploymentError(environment), { pad: false });
             return;
         }
-        if (environmentPermissions.scopes === undefined) {
-            environmentPermissions.scopes = [];
-        }
+        environmentPermissions.scopes = environmentPermissions.scopes ?? [];
         const { scopes: environmentScopes, environmentType } = environmentPermissions;
         const [{ permissions, modules }, manifestEgressEntries] = await Promise.all([
             this.configFile.readConfig(),
             this.configFile.getEgressPermissions()
         ]);
-        if (modules) {
-            this.checkForUIKit1Modules(modules);
-        }
-        const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
-        const manifestScopes = new Set(permissions?.scopes ?? []);
-        const listScopesString = upgrade ? environmentPermissions.addedScopes : environmentPermissions.scopes;
-        const listScopes = await this.convertListScope(listScopesString);
+        this.checkForUIKit1Modules(modules);
+        const { manifestEgressAddresses, manifestScopes } = this.extractManifestData(manifestEgressEntries, permissions);
+        const differenceInScopes = environmentScopes.filter((x) => !scopesFromLastInstallation.has(x));
+        const listScopes = await this.convertListScope(differenceInScopes);
         const scopesConfirmationResult = await this.installView.promptForPermissionsConfirmation(environmentPermissions, listScopes, [...manifestScopes], manifestEgressAddresses, environment, confirmScopes, !!nonInteractive, text);
         if (!scopesConfirmationResult)
             return;
@@ -227,13 +239,18 @@ class InstallController {
         if (successfulProducts.length) {
             this.ui.info(text.success.banner(environment, environmentType, (0, cli_shared_1.productDisplayName)(successfulProducts.join(', ')), site.host));
         }
-        else {
+        else if (!upgrade) {
             this.ui.info(cli_shared_1.Text.install.failedAll(site, environment));
         }
         if (failedProducts.length) {
             throw new cli_shared_1.PartialInstallationError(cli_shared_1.Text.error.partialInstallation(failedProducts));
         }
     }
+    extractManifestData = (manifestEgressEntries, permissions) => {
+        const manifestEgressAddresses = (0, cli_shared_1.flatMap)(manifestEgressEntries, ({ domains }) => domains ?? []);
+        const manifestScopes = new Set(permissions?.scopes ?? []);
+        return { manifestEgressAddresses, manifestScopes };
+    };
     getXPAProductsAndSite = async (requiredProducts, products, site) => {
         const { installations } = (await this.installationService.listAppInstallations()) ?? [];
         site = site ? site : await this.promptForSite([]);
@@ -245,7 +262,7 @@ class InstallController {
             }
             else {
                 this.ui.info(cli_shared_1.Text.install.installingToRequiredProduct(requiredProducts[0]));
-                products = requiredProducts;
+                products = requiredProducts.map((product) => (0, cli_shared_1.productDisplayName)(product));
             }
         }
         else {
@@ -309,11 +326,11 @@ class InstallController {
         }
         const ecosystemLicenseModes = new Set();
         for (const licenseMode of licenseModes) {
-            const upperCaseLicenseMode = licenseMode.toUpperCase();
-            if (!this.isValidLicenseMode(upperCaseLicenseMode)) {
+            const formattedLicenseMode = licenseMode.toUpperCase().replace('-', '_');
+            if (!this.isValidLicenseMode(formattedLicenseMode)) {
                 throw new cli_shared_1.UserError(cli_shared_1.Text.error.licenseModesOverrideErrors.invalid);
             }
-            ecosystemLicenseModes.add(upperCaseLicenseMode);
+            ecosystemLicenseModes.add(formattedLicenseMode);
         }
         return Array.from(ecosystemLicenseModes);
     }

package/out/command-line/controller/version-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/version-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAkB,MAAM,+BAA+B,CAAC;AAI/E,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAsBD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBADJ,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,WAAW;IAGvB,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAerG,oBAAoB,CAAC,EAChC,WAAW,EACX,YAAY,EACZ,IAAY,EACZ,OAAO,EACP,cAAc,EACf,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBpC,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,eAAe;IAWV,cAAc,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBlH"}
+{"version":3,"file":"version-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/version-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAkB,MAAM,+BAA+B,CAAC;AAI/E,UAAU,iBAAiB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAsBD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI;gBADJ,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,WAAW;IAGvB,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAerG,oBAAoB,CAAC,EAChC,WAAW,EACX,YAAY,EACZ,IAAY,EACZ,OAAO,EACP,cAAc,EACf,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBpC,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,iBAAiB;IAgCzB,OAAO,CAAC,eAAe;IAWV,cAAc,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBlH"}

package/out/command-line/controller/version-controller.js

@@ -78,6 +78,10 @@ class VersionController {
                 key: 'egress',
                 diff: diff.diffJson(version1.egresses, version2.egresses)
             },
+            {
+                key: 'analytics',
+                diff: diff.diffJson(version1.analytics, version2.analytics)
+            },
             { key: 'policies', diff: diff.diffJson(version1.policies, version2.policies) },
             { key: 'connect keys', diff: diff.diffJson(version1.connectKeys, version2.connectKeys) },
             {

package/out/command-line/dependency-injection.d.ts

@@ -30,6 +30,7 @@ import { PrerequisitesController } from './controller/prerequisites-controller';
 import { DefaultEnvironmentController } from './controller/default-environment-controller';
 import { EligibilityController } from './controller/eligibility-controller';
 import { VersionController } from './controller/version-controller';
+import { ContainerCommand } from '../containers';
 export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Promise<{
     ui: CommandLineUI;
     cmd: Command<[], import("./command").DefaultOpts>;
@@ -58,6 +59,7 @@ export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Pr
         viewAppLogsCommand: ViewAppLogsCommand;
         getWebTriggerURLCommand: GetWebTriggerURLCommand;
         listEntitiesIndexesCommand: ListEntitiesIndexesCommand;
+        containerCommand: ContainerCommand;
     };
     services: {
         installationsService: InstallationService;

package/out/command-line/dependency-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAKhB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAKpE,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsYvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dependency-injection.d.ts","sourceRoot":"","sources":["../../src/command-line/dependency-injection.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAKhB,gBAAgB,EAQhB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EAElB,kBAAkB,EAKlB,wBAAwB,EACzB,MAAM,mBAAmB,CAAC;AAc3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,OAAO,EAML,0BAA0B,EAG3B,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gCAAgC,EAAE,MAAM,sDAAsD,CAAC;AAExG,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AACtG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAIlG,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAM7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAQtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAI3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAG3E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAUlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAGhF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAG3F,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAE5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiZvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAC7D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

package/out/command-line/dependency-injection.js

@@ -73,6 +73,7 @@ const version_controller_1 = require("./controller/version-controller");
 const version_service_1 = require("../service/version-service");
 const version_view_1 = require("./view/version-view");
 const graphql_client_9 = require("../version/graphql-client");
+const containers_1 = require("../containers");
 const getDependencies = async (cliDetails) => {
     let cmd;
     const ui = new cli_shared_1.CommandLineUI(() => cmd.verbose);
@@ -184,7 +185,7 @@ const getDependencies = async (cliDetails) => {
     const createSandbox = async (cfg) => new tunnel_2.NodeSandbox(cfg, statsigService);
     const functionHost = new tunnel_1.LocalFunctionHost(configFile, ui, null, createSandbox);
     const localInvocationService = new tunnel_1.LocalInvocationService(configFile, ui, runtime_1.notImplementedInspector);
-    const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
+    const startTunnelCommand = new tunnel_1.StartTunnelCommand(assertiveAppConfigReader, new tunnel_1.LocalDevelopmentServer(localInvocationService, ui, configFile, fileReader, statsigService, i18nResourceBundlingService), new tunnel_1.CloudflareCreateTunnelService(ui), new tunnel_1.RegisterTunnelServiceImpl(new tunnel_1.TunnelGraphqlClient(graphQLClient)), functionHost, runtime_1.notImplementedInspector, ui, configFile);
     const tunnelInteractor = new tunnel_1.TunnelInteractor(ui);
     const configFilePortFindingService = new port_finding_service_1.ConfigFilePortFindingService(configFile);
     const tunnelAnalyticsService = new tunnel_analytics_service_1.TunnelAnalyticsService(analyticsClientReporter, cliDetails);
@@ -198,6 +199,7 @@ const getDependencies = async (cliDetails) => {
     const prerequisitesController = new prerequisites_controller_1.PrerequisitesController(ui, cliDetails);
     const defaultEnvironmentController = new default_environment_controller_1.DefaultEnvironmentController(ui, credentialStore, cachedConfigService, assertiveAppConfigReader, userRepository, createEnvironmentCommand, listEnvironmentCommand, getAppOwnerQuery);
     cmd = command_1.Command.program(ui, analyticsClientReporter, preCommandController, cliDetails, credentialStore, defaultEnvironmentController, supportedProductsService);
+    const containerCommand = new containers_1.ContainerCommand(graphQLClient, assertiveAppConfigReader);
     await supportedProductsService.initializeWithSupportedProducts(statsigService);
     return {
         ui,
@@ -226,7 +228,8 @@ const getDependencies = async (cliDetails) => {
             deleteEnvironmentCommand,
             viewAppLogsCommand,
             getWebTriggerURLCommand,
-            listEntitiesIndexesCommand
+            listEntitiesIndexesCommand,
+            containerCommand
         },
         services: {
             installationsService,

package/out/command-line/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAqBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAkBlD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/command-line/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAsBvE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAmBlD;AAQD,eAAO,MAAM,IAAI,QAAa,QAAQ,IAAI,CAUzC,CAAC"}

package/out/command-line/index.js

@@ -21,6 +21,7 @@ const register_environments_commands_1 = require("./register-environments-comman
 const register_storage_commands_1 = require("./register-storage-commands");
 const register_eligibility_commands_1 = require("./register-eligibility-commands");
 const register_version_commands_1 = require("./register-version-commands");
+const register_containers_commands_1 = require("./register-containers-commands");
 function registerCommands(deps) {
     (0, register_autocomplete_commands_1.registerCommands)(deps);
     (0, register_authentication_command_1.registerCommands)(deps);
@@ -39,6 +40,7 @@ function registerCommands(deps) {
     (0, register_storage_commands_1.registerCommands)(deps);
     (0, register_eligibility_commands_1.registerCommands)(deps);
     (0, register_version_commands_1.registerCommands)(deps);
+    (0, register_containers_commands_1.registerCommands)(deps);
 }
 exports.registerCommands = registerCommands;
 const registerEvents = ({ ui }) => {

package/out/command-line/register-app-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,oBAAY,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,IAAI,0BAA0B;IAC9B,QAAQ,WAAW;IACnB,SAAS,cAAc;IACvB,OAAO,4BAA4B;CACpC;AAED,oBAAY,eAAe;IACzB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,uBAAuB,4BAA4B;IACnD,cAAc,mBAAmB;IACjC,IAAI,SAAS;IACb,aAAa,kBAAkB;CAChC;AAOD,aAAK,0BAA0B,GAAG,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,EAAE,CAAC;AAoBlF,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAG5E,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,0BAUjC,CAAC;AAKF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAmDD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC,EAAE,GAC5C,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CA+BjC;AAqKD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}
+{"version":3,"file":"register-app-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-app-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EAEtB,aAAa,EACb,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,oBAAY,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,IAAI,0BAA0B;IAC9B,QAAQ,WAAW;IACnB,SAAS,cAAc;IACvB,OAAO,4BAA4B;CACpC;AAED,oBAAY,eAAe;IACzB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,IAAI,SAAS;IACb,uBAAuB,4BAA4B;IACnD,cAAc,mBAAmB;IACjC,IAAI,SAAS;IACb,aAAa,kBAAkB;CAChC;AAOD,aAAK,0BAA0B,GAAG,CAAC,gBAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,EAAE,CAAC;AAoBlF,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,CAG5E,CAAC;AAGF,eAAO,MAAM,mBAAmB,EAAE,0BAUjC,CAAC;AAKF,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAmDD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,CAAC,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC,EAAE,GAC5C,OAAO,CAQT;AAED,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW7E;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,aAAa,EACjB,gBAAgB,EAAE,gBAAgB,EAClC,IAAI,EAAE,MAAM,EACZ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,2BAA2B,GACnD,OAAO,CAAC,sBAAsB,CAAC,CA+BjC;AA0KD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAGlD"}

package/out/command-line/register-app-commands.js

@@ -169,7 +169,7 @@ async function promptAndSelectTemplate(ui, createAppCommand, template, directory
         const productOptions = await createAppCommand.filterAvailableProducts(Object.values(TemplateContext), TemplateContext.TEAMWORK_GRAPH, TemplateContext.CROSS_CONTEXT);
         const productName = await ui.promptForList(cli_shared_1.Text.create.promptProduct, productOptions, {
             format: formatProduct
-        });
+        }, productOptions.length);
         const filteredTemplates = (PRODUCT_OPTIONS[productName] ?? [productName])
             .map((p) => filterTemplatesByProduct(templatesWithoutCsuik, p, productOptions))
             .flat();

package/out/command-line/register-containers-commands.d.ts

@@ -0,0 +1,3 @@
+import { Dependencies } from './dependency-injection';
+export declare const registerCommands: (deps: Dependencies) => void;
+//# sourceMappingURL=register-containers-commands.d.ts.map

package/out/command-line/register-containers-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-containers-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-containers-commands.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAwMtD,eAAO,MAAM,gBAAgB,SAAU,YAAY,KAAG,IAQrD,CAAC"}

package/out/command-line/register-containers-commands.js

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCommands = void 0;
+const cli_shared_1 = require("@forge/cli-shared");
+function parseContainersWithLatestTags(containers) {
+    return containers.map(({ key, repositoryURI, images }) => ({
+        key,
+        repositoryURI,
+        latestTags: images?.edges[0]?.node.tags.join(', ') || '-'
+    }));
+}
+const registerCreateContainerCommand = (parent, { ui, commands: { containerCommand } }) => {
+    parent
+        .command('create')
+        .description(cli_shared_1.Text.containers.create.cmd.desc)
+        .option('-k, --key [key]', cli_shared_1.Text.containers.create.cmd.keyOption)
+        .requireAppId()
+        .action(async ({ key }) => {
+        if (!key) {
+            ui.info(cli_shared_1.Text.containers.create.prompt.overview);
+            ui.emptyLine();
+            key = await ui.promptForText(cli_shared_1.Text.containers.create.prompt.entry);
+            ui.emptyLine();
+        }
+        ui.info(cli_shared_1.Text.containers.create.creatingNewContainer(key));
+        ui.info(cli_shared_1.Text.ctrlC);
+        ui.emptyLine();
+        const container = await ui.displayProgress(() => containerCommand.createContainer(key), cli_shared_1.Text.containers.create.start, cli_shared_1.Text.containers.create.success);
+        ui.emptyLine();
+        ui.info(cli_shared_1.Text.containers.create.createdRepositoryURI(container.repositoryURI));
+    });
+};
+const registerListContainersCommand = (parent, { ui, commands: { containerCommand } }) => {
+    parent
+        .command('list')
+        .description(cli_shared_1.Text.containers.list.cmd.desc)
+        .requireAppId()
+        .action(async () => {
+        ui.info(cli_shared_1.Text.containers.list.listingContainers);
+        ui.info(cli_shared_1.Text.ctrlC);
+        ui.emptyLine();
+        const containers = await containerCommand.fetchContainers();
+        ui.table([
+            ['key', 'Container Key'],
+            ['repositoryURI', 'Repository URI'],
+            ['latestTags', 'Latest Image Tag(s)']
+        ], parseContainersWithLatestTags(containers), { json: false, emptyMessage: cli_shared_1.Text.containers.list.noContainersFound });
+    });
+};
+const registerListImagesCommand = (parent, { ui, commands: { containerCommand } }) => {
+    parent
+        .command('images')
+        .requireAppId()
+        .description(cli_shared_1.Text.containers.images.cmd.desc)
+        .command('list')
+        .option('-k, --key [key]', cli_shared_1.Text.containers.images.list.cmd.keyOption)
+        .description(cli_shared_1.Text.containers.images.list.cmd.desc)
+        .action(async ({ key }) => {
+        if (!key) {
+            ui.info(cli_shared_1.Text.containers.images.list.prompt.overview);
+            ui.emptyLine();
+            key = await ui.promptForText(cli_shared_1.Text.containers.images.list.prompt.entry);
+            ui.emptyLine();
+        }
+        ui.info(cli_shared_1.Text.containers.images.list.listingImages(key));
+        ui.info(cli_shared_1.Text.ctrlC);
+        ui.emptyLine();
+        let startCursor;
+        do {
+            const { images, endCursor, hasNextPage } = await containerCommand.fetchImages(key, startCursor);
+            ui.table([
+                ['tags', 'Image Tags'],
+                ['pushedAt', 'Pushed At'],
+                ['lastPulledAt', 'Last Pulled At'],
+                ['sizeInBytes', 'Size (bytes)'],
+                ['digest', 'Digest']
+            ], images.map(({ digest, tags, pushedAt, lastPulledAt, sizeInBytes }) => ({
+                tags: tags.join(', '),
+                pushedAt,
+                digest,
+                lastPulledAt: lastPulledAt || '-',
+                sizeInBytes: sizeInBytes.toString()
+            })), { json: false, emptyMessage: cli_shared_1.Text.containers.images.list.noImagesFound });
+            startCursor = hasNextPage ? endCursor : undefined;
+            if (!startCursor) {
+                break;
+            }
+            ui.emptyLine();
+            const result = await ui.promptForText(cli_shared_1.Text.containers.images.list.promptNextPage);
+            if (result.toLowerCase() !== cli_shared_1.Text.containers.images.list.confirmationForNextPage) {
+                break;
+            }
+        } while (true);
+    });
+};
+const registerGetRepositoryLoginCommand = (parent, { ui, commands: { containerCommand } }) => {
+    parent
+        .command('get-login')
+        .description(cli_shared_1.Text.containers.login.cmd.desc)
+        .requireAppId()
+        .option('-pw, --password-only', cli_shared_1.Text.containers.login.cmd.onlyPassword)
+        .action(async (opts) => {
+        const login = await containerCommand.fetchLoginDetails();
+        if (opts.passwordOnly) {
+            ui.info(login.password);
+        }
+        else {
+            ui.table([
+                ['username', 'Username'],
+                ['password', 'Password'],
+                ['endpoint', 'Endpoint']
+            ], [
+                {
+                    ...login,
+                    password: cli_shared_1.Text.containers.login.truncatedPassword(login.password)
+                }
+            ]);
+        }
+    });
+};
+const registerDeleteContainerCommand = (parent, { ui, commands: { containerCommand } }) => {
+    parent
+        .command('delete')
+        .description(cli_shared_1.Text.containers.delete.cmd.desc)
+        .option('-k, --key [key]', cli_shared_1.Text.containers.delete.cmd.keyOption)
+        .requireAppId()
+        .action(async ({ key }) => {
+        if (!key) {
+            const containers = await containerCommand.fetchContainers();
+            if (!containers.length) {
+                ui.info(cli_shared_1.Text.containers.delete.interactive.noContainersFound);
+                return;
+            }
+            ui.info(cli_shared_1.Text.containers.delete.interactive.overview);
+            ui.emptyLine();
+            const selectedContainerIndex = await ui.promptForSingleChoiceTable(cli_shared_1.Text.containers.delete.interactive.desc, cli_shared_1.Text.containers.delete.interactive.progressInfo, ['Container Key', 'Repository URI', 'Latest Image Tag(s)'], parseContainersWithLatestTags(containers).map(({ key, repositoryURI, latestTags }) => ({
+                names: [key, repositoryURI, latestTags],
+                value: key,
+                primary: key
+            })));
+            key = containers[selectedContainerIndex].key;
+            ui.emptyLine();
+        }
+        ui.info(cli_shared_1.Text.containers.delete.deletingContainer(key));
+        ui.emptyLine();
+        ui.warn(cli_shared_1.Text.containers.delete.warning);
+        const confirmation = await ui.promptForText(cli_shared_1.Text.containers.delete.confirmation(key));
+        if (confirmation !== key) {
+            ui.info(cli_shared_1.Text.containers.delete.abortedDeletion);
+            return;
+        }
+        ui.info(cli_shared_1.Text.ctrlC);
+        ui.emptyLine();
+        await ui.displayProgress(() => containerCommand.deleteContainer(key), cli_shared_1.Text.containers.delete.start, cli_shared_1.Text.containers.delete.success);
+    });
+};
+const registerCommands = (deps) => {
+    const containersCmd = deps.cmd.command('containers', { hidden: true }).description(cli_shared_1.Text.containers.cmd.desc);
+    registerCreateContainerCommand(containersCmd, deps);
+    registerListContainersCommand(containersCmd, deps);
+    registerListImagesCommand(containersCmd, deps);
+    registerGetRepositoryLoginCommand(containersCmd, deps);
+    registerDeleteContainerCommand(containersCmd, deps);
+};
+exports.registerCommands = registerCommands;

package/out/command-line/register-installation-commands.d.ts.map

@@ -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;AAqDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAiC7G,CAAC;AA2EF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}
+{"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;AAqDtD,eAAO,MAAM,gCAAgC,oDAAqD,YAAY,SAiC7G,CAAC;AAkFF,eAAO,MAAM,gBAAgB,qBAAsB,YAAY,KAAG,IAejE,CAAC"}

package/out/command-line/register-installation-commands.js

@@ -46,7 +46,7 @@ const registerListInstallationsCommand = ({ cmd, ui, services: { installationsSe
             ['id', 'Installation ID'],
             ['environment', 'Environment'],
             ['site', 'Site'],
-            ['product', hasSecondaryInstallations ? 'Product(s)' : 'Product'],
+            ['product', hasSecondaryInstallations ? 'Context(s)' : 'Context'],
             ['majorVersion', 'Major Version']
         ], installations.map(({ id, environmentKey, product, secondaryProducts, site, version: { isLatest, version } }) => ({
             id,
@@ -90,8 +90,14 @@ const registerUninstallCommand = (deps) => {
         else {
             const filteredInstallations = installations.filter((install) => install.product !== 'identity' && install.product !== 'jira-servicedesk');
             const options = (0, uninstall_command_helpers_1.getMultiChoiceOptionsForUninstall)(filteredInstallations);
-            const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Product'], options);
-            const [firstUninstall, secondUninstall] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
+            const selectedSitesIndexes = await ui.promptForTable(cli_shared_1.Text.uninstall.interactive.desc, cli_shared_1.Text.uninstall.interactive.progressInfo, ['Environment', 'Site', 'Context'], options);
+            const [firstUninstall, secondUninstall, hadAutoSelected] = (0, uninstall_command_helpers_1.getInstallationsFromSelection)(options, selectedSitesIndexes, filteredInstallations);
+            if (hadAutoSelected) {
+                const confirmation = await ui.confirm(cli_shared_1.Text.uninstall.interactive.confirmOptionalContexts);
+                if (!confirmation) {
+                    return;
+                }
+            }
             const selectedSites = new Set(firstUninstall.map(({ site }) => site).concat(secondUninstall.map(({ site }) => site)));
             const remainingApps = options
                 .filter((_, index) => !selectedSitesIndexes.includes(index))

package/out/command-line/register-tunnel-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAY/F,CAAC"}
+{"version":3,"file":"register-tunnel-commands.d.ts","sourceRoot":"","sources":["../../src/command-line/register-tunnel-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,mDAAoD,YAAY,KAAG,IAa/F,CAAC"}

package/out/command-line/register-tunnel-commands.js

@@ -11,6 +11,7 @@ const registerCommands = ({ cmd, ui, controllers: { tunnelController } }) => {
         .option('-d, --debug', cli_shared_1.Text.tunnel.optionDebugger)
         .option('-f,--debugFunctionHandlers <debugFunctionHandlers...>', cli_shared_1.Text.tunnel.functionHandlers)
         .option('-p,--debugStartingPort [debugStartingPort]', cli_shared_1.Text.tunnel.debuggerPort, cli_shared_1.defaultDebugStartingPort.toString())
+        .option('-n, --no-verify', 'disable pre-tunnel checks')
         .action(async (options) => {
         await tunnelController.run(options, ui);
     });

package/out/command-line/uninstall-command-helpers.d.ts

@@ -9,10 +9,11 @@ export interface Option {
         contextAri?: string;
         installationIdx: number;
         product: string;
+        autoSelectId?: string;
     };
 }
 export declare const getMultiChoiceOptionsForUninstall: (filteredInstallations: Installation[]) => Option[];
-export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[]];
+export declare const getInstallationsFromSelection: (options: Option[], selectedSitesIndexes: number[], filteredInstallations: Installation[]) => [Installation[], Installation[], boolean];
 export declare const performSingleUninstall: (installId: string, installationContext: string, { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
 export declare const performMultipleUninstalls: (appsToUninstallFirst: Installation[], appsToUninstallSecond: Installation[], { ui, commands: { uninstallAppCommand } }: Dependencies) => Promise<void>;
 //# sourceMappingURL=uninstall-command-helpers.d.ts.map

package/out/command-line/uninstall-command-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uninstall-command-helpers.d.ts","sourceRoot":"","sources":["../../src/command-line/uninstall-command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClH;AAMD,eAAO,MAAM,iCAAiC,0BAA2B,YAAY,EAAE,KAAG,MAAM,EA8B/F,CAAC;AAEF,eAAO,MAAM,6BAA6B,YAC/B,MAAM,EAAE,wBACK,MAAM,EAAE,yBACP,YAAY,EAAE,KACpC,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,CAiBjC,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,uBACI,MAAM,6CACgB,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,yBACd,YAAY,EAAE,yBACb,YAAY,EAAE,6CACM,YAAY,kBAsDxD,CAAC"}
+{"version":3,"file":"uninstall-command-helpers.d.ts","sourceRoot":"","sources":["../../src/command-line/uninstall-command-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAItD,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE;QACL,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAMD,eAAO,MAAM,iCAAiC,0BAA2B,YAAY,EAAE,KAAG,MAAM,EA+B/F,CAAC;AAWF,eAAO,MAAM,6BAA6B,YAC/B,MAAM,EAAE,wBACK,MAAM,EAAE,yBACP,YAAY,EAAE,KACpC,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,EAAE,OAAO,CAmC1C,CAAC;AAEF,eAAO,MAAM,sBAAsB,cACtB,MAAM,uBACI,MAAM,6CACgB,YAAY,kBAuBxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,yBACd,YAAY,EAAE,yBACb,YAAY,EAAE,6CACM,YAAY,kBAsDxD,CAAC"}

package/out/command-line/uninstall-command-helpers.js

@@ -19,6 +19,7 @@ const getMultiChoiceOptionsForUninstall = (filteredInstallations) => {
             extra: {
                 installationIdx: idx,
                 product: product,
+                autoSelectId: !!secondaryProducts?.length ? id : undefined,
                 required: !!secondaryProducts?.length
             }
         });
@@ -48,7 +49,22 @@ const getInstallationsFromSelection = (options, selectedSitesIndexes, filteredIn
         .filter((_, idx) => selectedSitesIndexes.includes(idx))
         .filter(({ extra }) => extra?.required)
         .map(({ extra }) => filteredInstallations[extra.installationIdx]);
-    return [firstUninstall, secondUninstall];
+    const installationIds = new Set([...firstUninstall, ...secondUninstall].map(({ id }) => id));
+    const groups = options.reduce((acc, option, idx) => {
+        if (!installationIds.has(option.value)) {
+            return acc;
+        }
+        const group = acc.get(option.value) || new Set();
+        group.add(idx);
+        acc.set(option.value, group);
+        return acc;
+    }, new Map());
+    const selectedSitesIndexSet = new Set(selectedSitesIndexes);
+    const wholeGroupSelected = Array.from(installationIds).some((id) => {
+        const group = groups.get(id);
+        return group && group.size > 1 && Array.from(group).every((idx) => selectedSitesIndexSet.has(idx));
+    });
+    return [firstUninstall, secondUninstall, wholeGroupSelected];
 };
 exports.getInstallationsFromSelection = getInstallationsFromSelection;
 const performSingleUninstall = async (installId, installationContext, { ui, commands: { uninstallAppCommand } }) => {

package/out/command-line/view/version-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/version-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAQ,EAAE,EAAY,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,eAAO,MAAM,eAAe,iDAAkD,EAAE,WAAW,QAAQ,cAAc,CAAC;;;;GAgHjH,CAAC;AAMF,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIzF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3F,8BAA8B,IAAI,OAAO,CAAC,CAAC,MAAM,cAAc,CAAC,EAAE,CAAC;IAmDzE,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMlG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAY7D,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAI7C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMxG,kBAAkB,CAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,IAAI;IAkCxG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMtF,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzC,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,IAAI;CAwBzD"}
+{"version":3,"file":"version-view.d.ts","sourceRoot":"","sources":["../../../src/command-line/view/version-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAQ,EAAE,EAAY,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,eAAO,MAAM,eAAe,iDAAkD,EAAE,WAAW,QAAQ,cAAc,CAAC;;;;GA+HjH,CAAC;AAMF,qBAAa,WAAW;IACV,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,EAAE;IAEtB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAIxF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIzF,mBAAmB,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAI3F,8BAA8B,IAAI,OAAO,CAAC,CAAC,MAAM,cAAc,CAAC,EAAE,CAAC;IAuDzE,2BAA2B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMlG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI;IAY7D,iBAAiB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAI7C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMxG,kBAAkB,CAAC,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,GAAG,IAAI;IAkCxG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAMtF,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIzC,kBAAkB,CAAC,IAAI,EAAE,eAAe,EAAE,GAAG,IAAI;CA0BzD"}

package/out/command-line/view/version-view.js

@@ -14,6 +14,16 @@ const getDetailsTable = ({ formatKeyValueList, formatYamlProperties }, details)
         }));
         return formatKeyValueList(egressItems, '', true);
     };
+    const analytics = (analytics) => {
+        const functionItems = analytics.map((analytic) => {
+            const properties = {
+                addresses: analytic.addresses,
+                inScopeEUD: analytic.inScopeEUD
+            };
+            return formatYamlProperties(properties, analytic.type, false);
+        });
+        return (0, cli_shared_1.itemList)(functionItems, '');
+    };
     const securityPolicies = (policies) => {
         const policyItems = policies.map((policy) => ({
             key: policy.type,
@@ -87,6 +97,11 @@ const getDetailsTable = ({ formatKeyValueList, formatYamlProperties }, details)
             detailsFn: egress,
             property: 'egresses'
         },
+        {
+            entry: 'analytics',
+            detailsFn: analytics,
+            property: 'analytics'
+        },
         {
             entry: 'policies',
             detailsFn: securityPolicies,
@@ -144,6 +159,10 @@ class VersionView {
                 names: ['Egress', descriptions.egress],
                 property: 'egresses'
             },
+            {
+                names: ['Analytics', descriptions.analytics],
+                property: 'analytics'
+            },
             {
                 names: ['Policies', descriptions.policies],
                 property: 'policies'
@@ -235,6 +254,7 @@ class VersionView {
             ['version', 'Major Versions'],
             ['deploymentDate', 'Deployment Date'],
             ['egresses', 'Egress'],
+            ['analytics', 'Analytics'],
             ['policies', 'Policies'],
             ['scopes', 'Scopes'],
             ['connectKeys', 'Connect keys'],
@@ -242,11 +262,12 @@ class VersionView {
             ['remotes', 'Remotes'],
             ['modules', 'Modules'],
             ['requiresLicense', 'License']
-        ], data.map(({ version, egresses, modules, policies, deploymentDateTime, ...rest }) => ({
+        ], data.map(({ version, egresses, analytics, modules, policies, deploymentDateTime, ...rest }) => ({
             ...rest,
             version: version.toString(),
             deploymentDate: deploymentDateTime.toISOString(),
             egresses: getPropertySummary(egresses),
+            analytics: getPropertySummary(analytics),
             policies: getPropertySummary(policies),
             modules: getPropertySummary(modules)
         })));