@forge/cli 4.5.2-next.4 → 5.0.0-next.1

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

@@ -1 +1 @@
-{"version":3,"file":"feedback-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/feedback-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAA+B,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAA3C,EAAE,EAAE,EAAE,EAAmB,kBAAkB,EAAE,kBAAkB;IAE/E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAQ/D"}
+{"version":3,"file":"feedback-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/feedback-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,kBAAkB,EAAsB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAA3C,EAAE,EAAE,EAAE,EAAmB,kBAAkB,EAAE,kBAAkB;IAE/E,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAQ/D"}

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

@@ -8,11 +8,11 @@ class FeedbackController {
         this.feedbackPostClient = feedbackPostClient;
     }
     async sendFeedback(feedback) {
-        const credentials = await cli_shared_1.getCredentialsStoreProvider(this.ui).getCredentials();
+        const { email } = await cli_shared_1.getCredentialStore(this.ui).getCredentials();
         return this.feedbackPostClient.sendFeedback({
             summary: feedback.length <= 50 ? feedback : feedback.slice(0, 50) + '...',
             description: feedback,
-            email: credentials.email
+            email
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EASH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAiBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAQD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBALX,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW;YAG7B,cAAc;YAmBd,gBAAgB;YAsChB,gBAAgB;YAKhB,aAAa;YAWb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAuFpC"}
+{"version":3,"file":"install-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/install-controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,iBAAiB,EACjB,UAAU,EAEV,EAAE,EAUH,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,UAAU,gBAAgB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;CACxB;AAiBD,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,WAAW,EAAE,MAAM;CAGhC;AAQD,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBALX,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,EAAE,EACN,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,WAAW;YAG7B,cAAc;YAmBd,gBAAgB;YAsChB,gBAAgB;YAKhB,aAAa;YAeb,gBAAgB;IAoB9B,OAAO,CAAC,uCAAuC;IAalC,GAAG,CAAC,EACf,WAAW,EACX,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACf,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAuFpC"}

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

@@ -60,13 +60,16 @@ class InstallController {
         this.ui.info(cli_shared_1.Text.installationContext.overviewProduct);
         return await this.ui.promptForList(cli_shared_1.Text.installationContext.promptProduct, cli_shared_1.SUPPORTED_PRODUCTS);
     }
-    async promptForSite() {
+    async promptForSite(product) {
         this.ui.info(cli_shared_1.Text.installationContext.overviewSite);
-        const trySite = await this.ui.promptForText(cli_shared_1.Text.installationContext.promptSite);
+        const promptText = product && cli_shared_1.isWorkspaceProduct(product)
+            ? cli_shared_1.Text.installationContext.promptWorkspace
+            : cli_shared_1.Text.installationContext.promptSite;
+        const trySite = await this.ui.promptForText(promptText);
         if (!trySite) {
             throw new cli_shared_1.ValidationError(cli_shared_1.Text.error.invalidSite);
         }
-        return cli_shared_1.validateSite(trySite);
+        return cli_shared_1.validateSite(trySite, product);
     }
     async promptForUpgrade(siteOption, productOption, environmentOption) {
         const { installations } = await this.installationService.listNonTechnicalAppInstallations({
@@ -76,7 +79,7 @@ class InstallController {
         });
         const { site, product, environmentKey } = await this.installView.promptForUpgrade(installations);
         return {
-            site: cli_shared_1.validateSite(site),
+            site: cli_shared_1.validateSite(site, product),
             product: cli_shared_1.capitalizeProduct(product),
             environment: environmentKey
         };
@@ -106,7 +109,7 @@ class InstallController {
             product = upgradeResult.product;
         }
         product = product ? product : await this.promptForProduct();
-        site = site ? site : await this.promptForSite();
+        site = site ? site : await this.promptForSite(product);
         this.ui.info(text.banner);
         if (cli_shared_1.isSecureSite(site)) {
             await this.securityPrompt(site);

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

@@ -11,7 +11,7 @@ class TunnelController {
         this.tunnelView = tunnelView;
     }
     async run(tunnelOptions, ui) {
-        const creds = await cli_shared_1.getCredentialsStoreProvider(ui).getCredentials();
+        const creds = await cli_shared_1.getCredentialStore(ui).getCredentials();
         const errorCallback = this.tunnelView.getTunnelErrorHandler(cli_shared_1.exitOnError);
         if (process.env.FORGE_DEV_TUNNEL) {
             return await this.localTunnelService.run(tunnelOptions, creds, ui.debugEnabled, errorCallback);

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

@@ -49,6 +49,7 @@ export declare const getDependencies: (cliDetails: CLIDetails | undefined) => Pr
         featureFlagService: FeatureFlagService;
         installationsService: InstallationService;
         migrationKeysService: MigrationKeysService;
+        credentialStore: import("@forge/cli-shared/src").CredentialStore;
     };
     controllers: {
         autocompleteController: AutocompleteController;

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":"AAEA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,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;AAI3E,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;AAIzE,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;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkPvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,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":"AAEA,OAAO,EASL,UAAU,EACV,aAAa,EAEb,UAAU,EAGV,gBAAgB,EAGhB,kBAAkB,EAUlB,YAAY,EACZ,aAAa,EAOb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,mBAAmB,CAAC;AAG3B,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;AAM3E,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;AAIzE,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;AAWlE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF,eAAO,MAAM,eAAe,eAAsB,UAAU,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2PvE,CAAC;AAGF,aAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;AAC3D,oBAAY,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC"}

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

@@ -15,6 +15,7 @@ const graphql_client_2 = require("../migration-keys/graphql-client");
 const configure_provider_1 = require("../providers/configure-provider");
 const graphql_client_3 = require("../providers/graphql-client");
 const graphql_client_4 = require("../installations/graphql-client");
+const site_translation_1 = require("../installations/site-translation");
 const install_app_site_1 = require("../installations/install-app-site");
 const uninstall_app_1 = require("../installations/uninstall-app");
 const cached_config_service_1 = require("../service/cached-config-service");
@@ -74,9 +75,9 @@ exports.getDependencies = async (cliDetails) => {
     const preCommandController = new pre_command_controller_1.PreCommandController(liteLintService, liteLintView, configFile, cachedConfigService, analyticsSettingsView, settingsView);
     cmd = new command_1.Command(ui, analyticsClientReporter, preCommandController, cliDetails);
     const graphqlGateway = cli_shared_1.getGraphqlGateway();
-    const tokenStore = cli_shared_1.getCredentialsStoreProvider(ui);
-    const authenticator = new cli_shared_1.PersonalTokenAuthenticator(tokenStore);
-    const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, tokenStore, appConfigReader);
+    const credentialStore = cli_shared_1.getCredentialStore(ui);
+    const authenticator = new cli_shared_1.PersonalTokenAuthenticator(credentialStore);
+    const featureFlagService = new cli_shared_1.FeatureFlagService(ui, cliDetails, credentialStore, appConfigReader);
     const createGraphQLClient = (auth) => {
         const minimalGraphQLRunner = new cli_shared_1.MinimalGraphQLRunner(auth, graphqlGateway, cliDetails);
         const graphQLRunner = new cli_shared_1.DebuggingGraphqlRunner(minimalGraphQLRunner, graphqlGateway, ui);
@@ -86,8 +87,8 @@ exports.getDependencies = async (cliDetails) => {
     const fileUploader = new cli_shared_1.HttpFileUploader(fileReader);
     const feedbackPostClient = new cli_shared_1.HttpsFeedbackPostClient();
     const zipAccessor = new cli_shared_1.UnzipperZipAccessor();
-    const loginCommand = new cli_shared_1.LoginCommand(createGraphQLClient, tokenStore, ui);
-    const logoutCommand = new cli_shared_1.LogoutCommand(tokenStore);
+    const loginCommand = new cli_shared_1.LoginCommand(createGraphQLClient, credentialStore, ui);
+    const logoutCommand = new cli_shared_1.LogoutCommand(credentialStore);
     const downloader = new cli_shared_1.TemplateServiceDownloader();
     const extractor = new cli_shared_1.ZipTemplateExtractor(zipAccessor);
     const lister = new cli_shared_1.TemplateServiceLister();
@@ -109,7 +110,9 @@ exports.getDependencies = async (cliDetails) => {
     const globalEdgeClient = new cli_shared_1.GlobalEdgeHttpClient(globalEdgeFetchClient);
     const logsClient = new cli_shared_1.LogsGraphQLClient(graphQLClient);
     const viewAppLogsCommand = new cli_shared_1.ViewAppLogsCommand(assertiveAppConfigReader, appEnvironmentClient, globalEdgeClient, logsClient);
-    const installationsClient = new graphql_client_4.InstallationsGraphqlClient(graphQLClient, cli_shared_1.pause);
+    const bitbucketTranslation = new site_translation_1.BitbucketTranslator();
+    const cloudProductTranslation = new site_translation_1.CloudIdTranslator(graphQLClient);
+    const installationsClient = new graphql_client_4.InstallationsGraphqlClient(graphQLClient, cloudProductTranslation, bitbucketTranslation, cli_shared_1.pause);
     const installAppSiteCommand = new install_app_site_1.InstallAppSiteCommand(assertiveAppConfigReader, installationsClient);
     const uninstallAppCommand = new uninstall_app_1.UninstallAppCommand(assertiveAppConfigReader, installationsClient);
     const deployMonitorClient = new deploy_1.DeployMonitorGraphqlClient(graphQLClient);
@@ -171,7 +174,8 @@ exports.getDependencies = async (cliDetails) => {
         services: {
             featureFlagService,
             installationsService,
-            migrationKeysService
+            migrationKeysService,
+            credentialStore
         },
         controllers: {
             autocompleteController,

package/out/command-line/register-authentication-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,+BAA+B,EAKhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoCrH;AAgDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}
+{"version":3,"file":"register-authentication-command.d.ts","sourceRoot":"","sources":["../../src/command-line/register-authentication-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,+BAA+B,EAIhC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAQ,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAYtD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,aAAa,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,YAAY,EAC1B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,mBAAmB,GACpC,OAAO,CAAC;IAAE,KAAK,EAAE,+BAA+B,CAAC;IAAC,SAAS,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;CAAE,CAAC,CAoCrH;AAiDD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,QAIlD"}

package/out/command-line/register-authentication-command.js

@@ -63,22 +63,24 @@ function registerLogoutCommand({ cmd, ui, commands: { logoutCommand } }) {
         ui.info(cli_shared_2.Text.logout.loggedOut);
     });
 }
-function registerWhoAmICommand({ cmd, ui, commands: { loginCommand } }) {
+function registerWhoAmICommand({ cmd, ui, services: { credentialStore }, commands: { loginCommand } }) {
     cmd
         .command('whoami')
         .description(cli_shared_2.Text.whoami.cmd)
         .action(async () => {
         try {
-            const credentials = await cli_shared_1.getCredentialsStoreProvider(ui).getCredentials();
+            const credentials = await credentialStore.getCredentials();
             const { name, accountId } = await loginCommand.getUser(credentials);
             ui.info(cli_shared_2.Text.whoami.success.personalCredentials(credentials.email, name, accountId));
         }
         catch (error) {
             if (error instanceof cli_shared_1.UserNotFoundError) {
-                const msg = cli_shared_1.hasKeytar()
-                    ? cli_shared_2.Text.whoami.error.personalCredentialsKeytar
-                    : cli_shared_2.Text.whoami.error.personalCredentialsEnv(cli_shared_1.EMAIL_KEY, cli_shared_1.API_TOKEN_KEY);
-                throw new Error(msg);
+                if (process.env[cli_shared_1.EMAIL_KEY] && process.env[cli_shared_1.API_TOKEN_KEY]) {
+                    throw new Error(cli_shared_2.Text.whoami.error.personalCredentialsEnv(cli_shared_1.EMAIL_KEY, cli_shared_1.API_TOKEN_KEY));
+                }
+                else {
+                    throw new Error(cli_shared_2.Text.whoami.error.personalCredentialsKeytar);
+                }
             }
             throw error;
         }

package/out/installations/graphql-client.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="node" />
-import { URL } from 'url';
-import { AppEnvironment, GraphQLClient, GraphQlMutationError, Pause } from '@forge/cli-shared';
-import { AppUninstallationInput } from '@forge/cli-shared';
+import { AppEnvironment, AppUninstallationInput, GraphQLClient, GraphQlMutationError, Pause } from '@forge/cli-shared';
 import { AppInstallSiteDetails, InstallAppClient } from './install-app-site';
 import { Installation, ListAppInstallationsClient, UpgradeAppInstallationsClient } from '../service/installation-service';
 import { UninstallAppClient, UninstallAppOutput } from './uninstall-app';
+import { SiteTranslator } from './site-translation';
 export declare const UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
 export declare const ALREADY_UPGRADED_CODE = "INSTALLATION_ALREADY_UPGRADED";
 export declare class PermissionDeniedError extends GraphQlMutationError {
@@ -31,17 +29,20 @@ export declare class MissingAppUninstallTask extends Error {
 }
 export declare class InstallationNotFoundError extends Error {
 }
-export declare class UnknownSiteWithoutCloudIdError extends Error {
+export declare class UnknownSiteWithoutResourceIdError extends Error {
     constructor();
 }
-export declare class InvalidAtlassianSiteError extends Error {
-    constructor(url: URL);
-}
 export declare class InstallationsGraphqlClient implements InstallAppClient, ListAppInstallationsClient, UninstallAppClient, UpgradeAppInstallationsClient {
     private readonly graphqlClient;
+    private readonly cloudIdTranslator;
+    private readonly bitbucketTranslator;
     private readonly pause;
-    static buildInstallationContext(product: string, cloudId: string): string;
-    constructor(graphqlClient: GraphQLClient, pause: Pause);
+    SITE_RESOURCE_TYPE: string;
+    WORKSPACE_RESOURCE_TYPE: string;
+    static buildInstallationContext(product: string, resourceId: string, resourceType: string): string;
+    constructor(graphqlClient: GraphQLClient, cloudIdTranslator: SiteTranslator, bitbucketTranslator: SiteTranslator, pause: Pause);
+    private buildInstallationContext;
+    private getProductTranslation;
     installAppIntoSite({ environmentKey, site, product, appId }: AppInstallSiteDetails): Promise<void>;
     upgradeInstallation({ site, product, environmentKey, appId }: AppInstallSiteDetails): Promise<void>;
     private monitorAppInstallOrUpgrade;
@@ -51,10 +52,10 @@ export declare class InstallationsGraphqlClient implements InstallAppClient, Lis
     getInstallation(appId: string, installationId: string): Promise<Installation>;
     private getAppInstallationTask;
     private monitorUninstallApp;
-    private createCloudIdToHostnameMap;
+    private getResourceArisForProduct;
+    private getCombinedHostnameMap;
     private resolveInstallationsHostnames;
     private getAllInstallations;
-    private getCloudId;
     getVersions(appId: string, environmentKey: string, firstN?: number): Promise<AppEnvironment['versions']>;
 }
 //# sourceMappingURL=graphql-client.d.ts.map

package/out/installations/graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EAEpB,KAAK,EACN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,sBAAsB,EAQvB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAgBtD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AACtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAChD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAC5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAC7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AACrD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,8BAA+B,SAAQ,KAAK;;CAIxD;AAED,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,GAAG,EAAE,GAAG;CAGrB;AAuBD,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAW9F,OAAO,CAAC,QAAQ,CAAC,aAAa;IAAiB,OAAO,CAAC,QAAQ,CAAC,KAAK;WAVnE,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;gBAU1C,aAAa,EAAE,aAAa,EAAmB,KAAK,EAAE,KAAK;IAE3E,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAoDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA8ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;YAiBnB,0BAA0B;YAsC1B,6BAA6B;YAqC7B,mBAAmB;YAsCnB,UAAU;IAgBX,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}
+{"version":3,"file":"graphql-client.d.ts","sourceRoot":"","sources":["../../src/installations/graphql-client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EAId,sBAAsB,EAEtB,aAAa,EACb,oBAAoB,EAKpB,KAAK,EAIN,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,eAAO,MAAM,kCAAkC,MAAM,CAAC;AAiBtD,eAAO,MAAM,qBAAqB,kCAAkC,CAAC;AAMrE,qBAAa,qBAAsB,SAAQ,oBAAoB;gBACjD,SAAS,SAAY,EAAE,KAAK,SAAY;CAGrD;AAED,qBAAa,qBAAsB,SAAQ,oBAAoB;;CAI9D;AAED,qBAAa,iBAAkB,SAAQ,oBAAoB;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,YAAa,SAAQ,oBAAoB;gBACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS;CAGtD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;CAAG;AAEtD,qBAAa,kBAAmB,SAAQ,KAAK;CAAG;AAEhD,qBAAa,8BAA+B,SAAQ,KAAK;CAAG;AAE5D,qBAAa,eAAgB,SAAQ,KAAK;CAAG;AAE7C,qBAAa,uBAAwB,SAAQ,KAAK;CAAG;AAErD,qBAAa,yBAA0B,SAAQ,KAAK;CAAG;AAEvD,qBAAa,iCAAkC,SAAQ,KAAK;;CAI3D;AAED,qBAAa,0BACX,YAAW,gBAAgB,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,6BAA6B;IAexG,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAjBxB,kBAAkB,SAAU;IAC5B,uBAAuB,SAAe;WAExB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;gBAWtF,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,cAAc,EACjC,mBAAmB,EAAE,cAAc,EACnC,KAAK,EAAE,KAAK;YAGjB,wBAAwB;IAKtC,OAAO,CAAC,qBAAqB;IAQhB,kBAAkB,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,qBAAqB;IAmDlF,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,qBAAqB;YA6ClF,0BAA0B;IAe3B,YAAY,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgC7D,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAmB7F,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAKzD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAS5E,sBAAsB;YA8BtB,mBAAmB;IAiBjC,OAAO,CAAC,yBAAyB;YAOnB,sBAAsB;YAoBtB,6BAA6B;YAkC7B,mBAAmB;IAsCpB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;CAqCjH"}

package/out/installations/graphql-client.js

@@ -1,35 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InstallationsGraphqlClient = exports.InvalidAtlassianSiteError = exports.UnknownSiteWithoutCloudIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
+exports.InstallationsGraphqlClient = exports.UnknownSiteWithoutResourceIdError = exports.InstallationNotFoundError = exports.MissingAppUninstallTask = exports.MissingAppError = exports.InstallationRequestFailedError = exports.MissingTaskIdError = exports.EnvironmentNotFoundError = exports.UpgradeError = exports.InstallationError = exports.AlreadyInstalledError = exports.PermissionDeniedError = exports.ALREADY_UPGRADED_CODE = exports.UNINSTALLATION_EVENT_POLL_INTERVAL = void 0;
 const cs_ari_1 = require("@forge/util/packages/cs-ari");
 const cli_shared_1 = require("@forge/cli-shared");
-const cli_shared_2 = require("@forge/cli-shared");
-const cli_shared_3 = require("@forge/cli-shared");
 exports.UNINSTALLATION_EVENT_POLL_INTERVAL = 500;
 exports.ALREADY_UPGRADED_CODE = 'INSTALLATION_ALREADY_UPGRADED';
 const ALREADY_INSTALLED_CODE = 'APP_ALREADY_INSTALLED';
 const PERMISSION_DENIED = 'PERMISSION_DENIED';
 class PermissionDeniedError extends cli_shared_1.GraphQlMutationError {
     constructor(requestId = 'unknown', appId = 'unknown') {
-        super(cli_shared_3.Text.install.error.permissionsDeniedInstructions(requestId, appId), PERMISSION_DENIED);
+        super(cli_shared_1.Text.install.error.permissionsDeniedInstructions(requestId, appId), PERMISSION_DENIED);
     }
 }
 exports.PermissionDeniedError = PermissionDeniedError;
 class AlreadyInstalledError extends cli_shared_1.GraphQlMutationError {
     constructor() {
-        super(cli_shared_3.Text.install.error.alreadyInstalledError, ALREADY_INSTALLED_CODE);
+        super(cli_shared_1.Text.install.error.alreadyInstalledError, ALREADY_INSTALLED_CODE);
     }
 }
 exports.AlreadyInstalledError = AlreadyInstalledError;
 class InstallationError extends cli_shared_1.GraphQlMutationError {
     constructor(message, code) {
-        super(cli_shared_3.Text.install.error.serverSideInstallationError(message), code);
+        super(cli_shared_1.Text.install.error.serverSideInstallationError(message), code);
     }
 }
 exports.InstallationError = InstallationError;
 class UpgradeError extends cli_shared_1.GraphQlMutationError {
     constructor(message, code) {
-        super(cli_shared_3.Text.upgrade.error.serverSideInstallationError(message), code);
+        super(cli_shared_1.Text.upgrade.error.serverSideInstallationError(message), code);
     }
 }
 exports.UpgradeError = UpgradeError;
@@ -51,50 +49,41 @@ exports.MissingAppUninstallTask = MissingAppUninstallTask;
 class InstallationNotFoundError extends Error {
 }
 exports.InstallationNotFoundError = InstallationNotFoundError;
-class UnknownSiteWithoutCloudIdError extends Error {
+class UnknownSiteWithoutResourceIdError extends Error {
     constructor() {
-        super(cli_shared_3.Text.installList.noCloudId);
+        super(cli_shared_1.Text.installList.noResourceId);
     }
 }
-exports.UnknownSiteWithoutCloudIdError = UnknownSiteWithoutCloudIdError;
-class InvalidAtlassianSiteError extends Error {
-    constructor(url) {
-        super(cli_shared_3.Text.install.error.invalidAtlassianSite(url));
-    }
-}
-exports.InvalidAtlassianSiteError = InvalidAtlassianSiteError;
-const tenantToHostname = (tenantInfo) => {
-    if (!tenantInfo) {
-        return null;
-    }
-    return tenantInfo.hostName || null;
-};
-const tenantContextsToCloudId = (url, contexts) => {
-    if (!contexts.length) {
-        throw new InvalidAtlassianSiteError(url);
-    }
-    const context = contexts[0];
-    if (!context || !context.cloudId) {
-        throw new InvalidAtlassianSiteError(url);
-    }
-    return context.cloudId;
-};
+exports.UnknownSiteWithoutResourceIdError = UnknownSiteWithoutResourceIdError;
 class InstallationsGraphqlClient {
-    constructor(graphqlClient, pause) {
+    constructor(graphqlClient, cloudIdTranslator, bitbucketTranslator, pause) {
         this.graphqlClient = graphqlClient;
+        this.cloudIdTranslator = cloudIdTranslator;
+        this.bitbucketTranslator = bitbucketTranslator;
         this.pause = pause;
+        this.SITE_RESOURCE_TYPE = 'site';
+        this.WORKSPACE_RESOURCE_TYPE = 'workspace';
     }
-    static buildInstallationContext(product, cloudId) {
+    static buildInstallationContext(product, resourceId, resourceType) {
         const ari = new cs_ari_1.ResourceIdentifier({
             resourceOwner: product.toLowerCase(),
-            resourceType: 'site',
-            resourceId: cloudId
+            resourceType: resourceType,
+            resourceId: resourceId
         });
         return ari.toString();
     }
+    async buildInstallationContext(product, site) {
+        const ari = await this.getProductTranslation(product).buildInstallationContext(product, site);
+        return ari.toString();
+    }
+    getProductTranslation(product) {
+        if (product && cli_shared_1.isBitbucketProduct(product)) {
+            return this.bitbucketTranslator;
+        }
+        return this.cloudIdTranslator;
+    }
     async installAppIntoSite({ environmentKey, site, product, appId }) {
-        const cloudId = await this.getCloudId(site);
-        const installationContext = InstallationsGraphqlClient.buildInstallationContext(product, cloudId);
+        const installationContext = await this.buildInstallationContext(product, site);
         const query = `
       mutation forge_cli_installApplication($input: AppInstallationInput!) {
         installApp(input: $input) {
@@ -118,7 +107,7 @@ class InstallationsGraphqlClient {
             }
         };
         const { response: { installApp: { success, taskId, errors } }, requestId } = await this.graphqlClient.mutate(query, variables);
-        const error = cli_shared_2.getError(errors);
+        const error = cli_shared_1.getError(errors);
         if (!success) {
             if (error.code === ALREADY_INSTALLED_CODE) {
                 throw new AlreadyInstalledError();
@@ -134,8 +123,7 @@ class InstallationsGraphqlClient {
         await this.monitorAppInstallOrUpgrade(taskId);
     }
     async upgradeInstallation({ site, product, environmentKey, appId }) {
-        const cloudId = await this.getCloudId(site);
-        const installationContext = InstallationsGraphqlClient.buildInstallationContext(product, cloudId);
+        const installationContext = await this.buildInstallationContext(product, site);
         const query = `
       mutation forge_cli_upgradeApplication($input: AppInstallationUpgradeInput!) {
         upgradeApp(input: $input) {
@@ -159,7 +147,7 @@ class InstallationsGraphqlClient {
             }
         };
         const { response: { upgradeApp: { success, errors, taskId } }, requestId } = await this.graphqlClient.mutate(query, variables);
-        const error = cli_shared_2.getError(errors);
+        const error = cli_shared_1.getError(errors);
         if (!success) {
             throw new UpgradeError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
@@ -196,7 +184,7 @@ class InstallationsGraphqlClient {
       }
     `;
         const { response: { uninstallApp: { success, errors, taskId } }, requestId } = await this.graphqlClient.mutate(query, { input });
-        const error = cli_shared_2.getError(errors);
+        const error = cli_shared_1.getError(errors);
         if (!success) {
             throw new cli_shared_1.GraphQlMutationError(`${error.message} (requestId: ${requestId || 'unknown'})`, error.code);
         }
@@ -228,7 +216,7 @@ class InstallationsGraphqlClient {
         if (matchedInstallation) {
             return matchedInstallation;
         }
-        throw new InstallationNotFoundError(cli_shared_3.Text.installationId.errors.notFound(installationId));
+        throw new InstallationNotFoundError(cli_shared_1.Text.installationId.errors.notFound(installationId));
     }
     async getAppInstallationTask(taskId) {
         const query = `
@@ -248,7 +236,7 @@ class InstallationsGraphqlClient {
             id: taskId
         });
         if (!appInstallationTask) {
-            throw new MissingAppUninstallTask(cli_shared_3.Text.uninstall.missingUninstallTask);
+            throw new MissingAppUninstallTask(cli_shared_1.Text.uninstall.missingUninstallTask);
         }
         const { state, errors } = appInstallationTask;
         return {
@@ -269,29 +257,16 @@ class InstallationsGraphqlClient {
         }
         return true;
     }
-    async createCloudIdToHostnameMap(cloudIds) {
-        const MAX_CLOUD_IDS_AT_ONCE = 20;
-        const cloudIdsChunks = [];
-        for (let i = 0; i < cloudIds.length; i += MAX_CLOUD_IDS_AT_ONCE) {
-            cloudIdsChunks.push(cloudIds.slice(i, i + MAX_CLOUD_IDS_AT_ONCE));
-        }
-        const query = `
-      query forge_cli_getHostnameForTenantContexts($cloudIds: [ID!]!) {
-        tenantContexts(cloudIds: $cloudIds) {
-          hostName
-        }
-      }
-    `;
-        const results = await Promise.all(cloudIdsChunks.map((cloudIdsChunk) => this.graphqlClient.query(query, {
-            cloudIds: cloudIdsChunk
-        })));
-        const tenantContexts = [].concat(...results.map((result) => result.tenantContexts || []));
-        const cloudIdToHostname = {};
-        cloudIds.forEach((cloudId, index) => {
-            const maybeHostname = tenantToHostname(tenantContexts[index]);
-            cloudIdToHostname[cloudId] = maybeHostname || cloudId;
-        });
-        return cloudIdToHostname;
+    getResourceArisForProduct(installationContexts, condition) {
+        return [...new Set(installationContexts.filter((context) => condition(context)))];
+    }
+    async getCombinedHostnameMap(installationContexts) {
+        const bitbucketAris = this.getResourceArisForProduct(installationContexts, this.bitbucketTranslator.ariBelongsToProduct);
+        const workspaceAriToHostname = await this.bitbucketTranslator.getSitesForResourceAris(bitbucketAris);
+        const cloudIdAris = this.getResourceArisForProduct(installationContexts, this.cloudIdTranslator.ariBelongsToProduct);
+        const siteAriToHostname = await this.cloudIdTranslator.getSitesForResourceAris(cloudIdAris);
+        const combinedAriToHostname = Object.assign(Object.assign({}, siteAriToHostname), workspaceAriToHostname);
+        return combinedAriToHostname;
     }
     async resolveInstallationsHostnames(installations) {
         if (!installations.length) {
@@ -299,17 +274,16 @@ class InstallationsGraphqlClient {
         }
         const installationContexts = installations.map(({ installation }) => {
             const context = cs_ari_1.parse(installation.installationContext);
-            const cloudId = context.resourceId;
-            if (!cloudId) {
-                throw new UnknownSiteWithoutCloudIdError();
+            const resourceId = context.resourceId;
+            if (!resourceId) {
+                throw new UnknownSiteWithoutResourceIdError();
             }
             return context;
         });
-        const uniqueCloudIds = [...new Set(installationContexts.map((context) => context.resourceId))];
-        const cloudIdToHostname = await this.createCloudIdToHostnameMap(uniqueCloudIds);
+        const combinedAriToHostname = await this.getCombinedHostnameMap(installationContexts);
         return installationContexts.map((context, i) => {
             const { environment, installation } = installations[i];
-            const site = cloudIdToHostname[context.resourceId];
+            const site = combinedAriToHostname[context.toString()];
             return {
                 id: installation.id,
                 product: context.resourceOwner,
@@ -356,20 +330,6 @@ class InstallationsGraphqlClient {
         }
         return output;
     }
-    async getCloudId(site) {
-        const query = `
-      query forge_cli_getCloudIfForTenantContexts($hostNames: [String!]) {
-        tenantContexts(hostNames: $hostNames) {
-          cloudId
-        }
-      }
-    `;
-        const result = await this.graphqlClient.query(query, {
-            hostNames: [site.hostname]
-        });
-        const tenantContexts = result.tenantContexts || [];
-        return tenantContextsToCloudId(site, tenantContexts);
-    }
     async getVersions(appId, environmentKey, firstN = 1) {
         const query = `
       query forge_cli_getApplicationEnvironmentLatestVersions($appId: ID!, $environmentKey: String!, $firstN: Int!) {

package/out/installations/site-translation/bitbucket.d.ts

@@ -0,0 +1,24 @@
+/// <reference types="node" />
+import { SiteTranslator, ResourcefulAri } from './site-translation';
+import { URL } from 'url';
+import { Ari } from '@forge/util/packages/cs-ari';
+export declare class InvalidWorkspaceError extends Error {
+    constructor(url: URL);
+}
+export declare class InvalidResponseError extends Error {
+    constructor(url: URL);
+}
+export declare const getBitbucketEndpoint: () => string;
+export declare class BitbucketTranslator implements SiteTranslator {
+    ariBelongsToProduct(ari: ResourcefulAri): boolean;
+    buildInstallationContext(product: string, site: URL): Promise<Ari>;
+    getSitesForResourceAris(aris: ResourcefulAri[]): Promise<Record<string, string>>;
+    private getWorkspaceId;
+    getWorkspaceUrl(workspaceId: string): Promise<URL | null>;
+    private decorateWorkspaceId;
+    private extractWorkspaceId;
+    private buildFetchUrl;
+    private extractWorkspaceName;
+    private buildWorkspaceUrl;
+}
+//# sourceMappingURL=bitbucket.d.ts.map

package/out/installations/site-translation/bitbucket.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket.d.ts","sourceRoot":"","sources":["../../../src/installations/site-translation/bitbucket.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAsB,MAAM,6BAA6B,CAAC;AAGtE,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,GAAG,EAAE,GAAG;CAGrB;AAED,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,GAAG,EAAE,GAAG;CAGrB;AAOD,eAAO,MAAM,oBAAoB,QAAO,MAEvC,CAAC;AAEF,qBAAa,mBAAoB,YAAW,cAAc;IACjD,mBAAmB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAI3C,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAUlE,uBAAuB,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAc/E,cAAc;IAwBf,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAsBtE,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,iBAAiB;CAG1B"}