@forge/cli-shared 9.7.0-next.1 → 9.7.0-next.10

package/out/ui/text.js

@@ -59,6 +59,11 @@ const platformKeytarRecommendations = () => {
             return '';
     }
 };
+const globalTargetLocation = ({ unit, org }) => unit && org
+    ? `in unit ${chalk_1.default.bold(unit)} in organization ${chalk_1.default.bold(org)}`
+    : unit
+        ? `in unit ${chalk_1.default.bold(unit)}`
+        : `in organization ${chalk_1.default.bold(org ?? '')}`;
 exports.Text = {
     buildTerminalLink,
     go,
@@ -81,7 +86,6 @@ exports.Text = {
             ? `one of the following valid Atlassian apps: ${validContexts.join(', ')}`
             : 'a valid Atlassian app'}.`,
         missingSiteUrlValue: 'Site parameter requires a site URL. Rerun the command with a valid site URL.',
-        missingShardContext: 'Shard parameter requires a string value.',
         invalidSite: 'The site you entered is not an Atlassian site. Rerun the command with the URL to an Atlassian site to install the app.',
         invalidWorkspace: 'The workspace you entered is not a valid workspace. Rerun the command with the URL to a valid workspace to install the app.',
         invalidInstallationContext: 'Could not find an installation for the provided Atlassian app',
@@ -153,10 +157,6 @@ exports.Text = {
     },
     optionSite: 'site URL (example.atlassian.net)',
     optionProduct: (supportedProducts) => `Atlassian app (${supportedProducts.join(', ')})`,
-    optionShard: {
-        desc: 'identifier for a shard',
-        incorrectFormat: 'shard identifier should be formatted "<id>:<region>"'
-    },
     optionPlacement: {
         desc: 'placement where the app is deployed'
     },
@@ -625,6 +625,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
         }
     },
     version: {
+        services: 'Services',
         cmd: {
             cmdName: 'version',
             desc: 'app version information'
@@ -649,6 +650,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
                 'scopes',
                 'connect keys',
                 'functions',
+                'services',
                 'remotes',
                 'modules',
                 'license'
@@ -685,6 +687,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
                 'scopes',
                 'connect keys',
                 'functions',
+                'services',
                 'remotes',
                 'modules',
                 'license'
@@ -714,6 +717,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
                             analytics: 'Analytics',
                             policies: 'Content security policies (Custom UI)',
                             functions: 'Function modules used by the app',
+                            services: 'Container services used by the app',
                             modules: 'Modules used by the app (other than functions & remotes)',
                             remotes: 'Remote modules used by the app (Remote backend, Connect or External Auth)',
                             connectKeys: 'Connect on Forge',
@@ -739,6 +743,7 @@ What do you like or don't like about Forge? Share your feedback below or press C
                 'scopes',
                 'connect keys',
                 'functions',
+                'services',
                 'remotes',
                 'modules',
                 'license'
@@ -1025,9 +1030,27 @@ What do you like or don't like about Forge? Share your feedback below or press C
             serverStepFailed: 'Deployment failed'
         },
         error: {
-            notFound: "Couldn't find app deployment",
+            artifactTooLarge: {
+                package: (limit, actual) => {
+                    const sizeLimit = limit ? `the ${limit} limit` : 'the allowed size limit';
+                    const includeActual = actual ? ` (${actual})` : '';
+                    return `The total app package${includeActual} exceeds ${sizeLimit}. Remove unnecessary files, reduce bundle sizes, and deploy again.`;
+                },
+                entry: (limit, actual, skillPath) => {
+                    const sizeLimit = limit ? `the ${limit} limit` : 'the allowed size limit';
+                    const includeActual = actual ? ` (${actual})` : '';
+                    const target = skillPath ? `Skill directory '${skillPath}'` : 'A packaged file or directory';
+                    return `${target}${includeActual} exceeds ${sizeLimit}. Remove or compress large reference files, and deploy again.`;
+                },
+                totalUncompressed: (limit, actual) => {
+                    const sizeLimit = limit ? `the ${limit} limit` : 'the allowed size limit';
+                    const includeActual = actual ? ` (${actual})` : '';
+                    return `The total size of all skill directories${includeActual} exceeds ${sizeLimit}. Reduce file sizes across your skills, and deploy again.`;
+                }
+            },
             manifestFilePathNotFound: (filePath) => `Manifest file path does not exist: ${filePath}`,
-            manifestDirectoryPathNotFound: (directoryPath) => `Manifest directory path does not exist: ${directoryPath}`
+            manifestDirectoryPathNotFound: (directoryPath) => `Manifest directory path does not exist: ${directoryPath}`,
+            notFound: "Couldn't find app deployment"
         },
         appBillingDetailsMissing: {
             privateApp: `Deployment blocked - This app has no associated Developer Space.\n\n` +
@@ -1165,6 +1188,55 @@ When corporate security has approved the app, you can proceed with the installat
             link: (link) => `Follow the prompts at this URL to authorize your app:
 ${buildTerminalLink(link)}\n`,
             openBrowser: `Press any key to open the URL in your default browser.`
+        },
+        global: {
+            promptOrganization: 'Select an Organization:',
+            selectUnitOverview: 'Next, select a unit you want to install your app in.',
+            promptUnit: 'Select a Unit:',
+            installConfirmation: (target) => `Installing your app ${globalTargetLocation(target)}\n${ctrlC}\n`,
+            promptContinueInstall: 'Do you want to continue installing the app?',
+            cmd: {
+                start: 'Installing',
+                end: 'Install complete!'
+            },
+            upgrade: {
+                start: 'Upgrading',
+                end: 'Upgrade complete!'
+            },
+            promptUnitUpgrade: 'Select the unit to upgrade:',
+            unitUpgradeOverview: 'To upgrade your app to the latest code and scopes, select a unit installation from the list.',
+            installSuccess: (environment, target) => `Your app in the ${(0, environment_1.environmentToOption)(environment)} environment is installed ${globalTargetLocation(target)}.`,
+            alreadyInstalled: (target) => `Your app is already installed ${globalTargetLocation(target)}.`,
+            upgradeSuccess: (environment, target) => `Your app in the ${(0, environment_1.environmentToOption)(environment)} environment is upgraded ${globalTargetLocation(target)}.`,
+            promptConnect: 'Do you want to connect the app to other Atlassian apps or platform tools?',
+            promptConnectAnother: 'Do you want to connect the app to another Atlassian app or platform tool?',
+            promptConnection: 'Select an Atlassian app or platform tool:',
+            linkedSuffix: ' (linked)',
+            alreadyLinked: (product) => `${product} is already connected. Choose a different app or platform tool.`,
+            enterSiteOverview: 'Enter the site you want to connect your app to, e.g., your-domain.atlassian.net.',
+            promptSiteUrl: 'Enter the site URL:',
+            enterWorkspaceOverview: 'Enter the Bitbucket workspace you want to connect your app to.',
+            promptWorkspace: 'Enter the workspace:',
+            connectConfirmationSite: (product) => `Connecting your app to ${chalk_1.default.bold(product)} in an Atlassian site.\n${ctrlC}\n`,
+            connectConfirmationWorkspace: (product) => `Connecting your app to ${chalk_1.default.bold(product)} in a Bitbucket workspace.\n${ctrlC}\n`,
+            connect: {
+                start: 'Connecting',
+                end: 'Connection complete!'
+            },
+            connectionSuccess: (environment, product, site) => `Your app in the ${(0, environment_1.environmentToOption)(environment)} environment is connected to ${chalk_1.default.bold(product)} in ${chalk_1.default.bold(site)}. You can install the app in other Atlassian apps by running the ${forge('install')} command again.`,
+            optionUnit: 'the unit id to install the global app into',
+            error: {
+                identityRequestFailed: (status) => `Failed to fetch your organizations and units from the Identity API (status ${status}).`,
+                noOrgs: 'We could not find any organizations for your account.',
+                noUnits: (org) => `We could not find any units in ${org} for your account.`,
+                noUnitInstallations: 'This app is not installed in any unit in this environment, so there is nothing to upgrade.',
+                noInstallationId: 'The installation completed but no installation id was returned, so optional connections cannot be linked.',
+                nonInteractiveOrgRequired: 'You have access to multiple organizations. Pass --unitId <id> to install directly.',
+                nonInteractiveUnitRequired: 'The organization has multiple units. Pass --unitId <id> to install directly.',
+                connectFlagsRequired: 'Pass both --product and --site to link a connection non-interactively.',
+                unsupportedConnection: (product) => `"${product}" is not a linkable Atlassian app. Choose one of: Jira, Confluence, Bitbucket.`,
+                notInstalledInUnit: (unitId) => `The app is not installed in unit ${unitId}. Install it into the unit first (${forge('install', '--unitId', unitId)}), then link a connection.`
+            }
         }
     },
     harmonization: {
@@ -1557,6 +1629,9 @@ ${buildTerminalLink(link)}\n`,
         cmd: {
             desc: "display information about the deployed app's containers and services"
         },
+        specifyPlacement: (placement) => `Placement: ${chalk_1.default.bold(placement)}`,
+        fetchingServices: 'Fetching deployed services',
+        fetchingContainers: 'Fetching deployed service containers',
         services: {
             cmd: {
                 desc: 'display information about deployed app services',

package/out/ui/ui.d.ts

@@ -27,12 +27,16 @@ export type TableOptions<Key extends string> = {
         [K in Key]?: boolean;
     };
     groupKey?: Key;
+    sectionKey?: Key;
+    sectionLabel?: (value: TableCell) => string;
 };
 export type HintCategory = 'create' | 'deploy' | 'all';
 export interface UI extends Logger, Prompt {
     emptyLine(): void;
     displayProgress<Result>(progress: () => Promise<Result>, startText: string, successText: string | ((result: Result) => string | ProgressResult), hintCategory?: HintCategory): Promise<Result>;
-    displayTemporaryMessage<Result>(progress: () => Promise<Result>, waitText: string): Promise<Result>;
+    displayTemporaryMessage<Result>(progress: () => Promise<Result>, waitText: string, options?: {
+        animateEllipsis?: boolean;
+    }): Promise<Result>;
     clearSpinner(): void;
     table<Key extends string>(head: [Key, string][], data: Record<Key, TableCell>[] | undefined | null, options?: TableOptions<Key>): void;
     formatKeyValueList(items: {

package/out/ui/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,MAAM;IACrB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACvE,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,CAAC,SAAS,MAAM,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,EAAE,EACZ,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,MAAM,CAAA;KAAE,EAC3C,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,uBAAuB,CAAC,CAAC,SAAS,MAAM,EACtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,CAAC,EAAE,EACZ,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,MAAM,CAAA;KAAE,EAC3C,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,CAAC,CAAC,CAAC;IACd,cAAc,CACZ,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,CAAC,EAAE,OAAO,GACrB,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrB,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;CACpB;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAE5D,MAAM,MAAM,YAAY,CAAC,GAAG,SAAS,MAAM,IAAI;IAC7C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM;KAAE,CAAC;IACvD,SAAS,CAAC,EAAE;SAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE,OAAO;KAAE,CAAC;IAGrC,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC;AAMF,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEvD,MAAM,WAAW,EAAG,SAAQ,MAAM,EAAE,MAAM;IACxC,SAAS,IAAI,IAAI,CAAC;IAElB,eAAe,CAAC,MAAM,EACpB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,cAAc,CAAC,EACnE,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnB,uBAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpG,YAAY,IAAI,IAAI,CAAC;IAErB,KAAK,CAAC,GAAG,SAAS,MAAM,EACtB,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EACrB,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,SAAS,GAAG,IAAI,EACjD,OAAO,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,GAC1B,IAAI,CAAC;IAER,kBAAkB,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC3G,oBAAoB,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CACnF"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../src/ui/ui.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "9.7.0-next.1",
+  "version": "9.7.0-next.10",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -55,7 +55,7 @@
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/typescript": "^4.1.6",
     "@graphql-codegen/typescript-operations": "^4.6.0",
-    "@graphql-tools/schema": "^10.0.23",
+    "@graphql-tools/schema": "^10.1.1",
     "@types/adm-zip": "^0.5.5",
     "@types/array.prototype.flatmap": "^1.2.6",
     "@types/cross-spawn": "^6.0.6",