@forge/cli-shared 9.8.0-next.0 → 9.8.0-next.10

package/out/graphql/index.d.ts

@@ -2,6 +2,7 @@ export { graphql } from './gql/gql';
 export * from './app-environment-graphql-client';
 export * from './debugging-graphql-runner';
 export * from './gateway';
+export * from './path-based-graphql-client-resolver';
 export * from './graphql-client';
 export * from './graphql-runtime-enums';
 export * from './graphql-domain-types';

package/out/graphql/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/graphql/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,sBAAsB,CAAC;AACrC,cAAc,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/graphql/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,cAAc,kCAAkC,CAAC;AACjD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,WAAW,CAAC;AAC1B,cAAc,sCAAsC,CAAC;AACrD,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC;AAChD,cAAc,sBAAsB,CAAC;AACrC,cAAc,sCAAsC,CAAC"}

package/out/graphql/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "graphql", { enumerable: true, get: function () {
 tslib_1.__exportStar(require("./app-environment-graphql-client"), exports);
 tslib_1.__exportStar(require("./debugging-graphql-runner"), exports);
 tslib_1.__exportStar(require("./gateway"), exports);
+tslib_1.__exportStar(require("./path-based-graphql-client-resolver"), exports);
 tslib_1.__exportStar(require("./graphql-client"), exports);
 tslib_1.__exportStar(require("./graphql-runtime-enums"), exports);
 tslib_1.__exportStar(require("./graphql-domain-types"), exports);

package/out/graphql/path-based-graphql-client-resolver.d.ts

@@ -0,0 +1,10 @@
+import { GraphQLClient } from './graphql-client';
+export type GraphQLClientFactory = (endpoint: string) => GraphQLClient;
+export declare class PathBasedGraphQLClientResolver {
+    private readonly defaultClient;
+    private readonly createGraphQLClient;
+    private readonly siteClients;
+    constructor(defaultClient: GraphQLClient, createGraphQLClient: GraphQLClientFactory);
+    resolve(site?: string): GraphQLClient;
+}
+//# sourceMappingURL=path-based-graphql-client-resolver.d.ts.map

package/out/graphql/path-based-graphql-client-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-based-graphql-client-resolver.d.ts","sourceRoot":"","sources":["../../src/graphql/path-based-graphql-client-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,aAAa,CAAC;AAgBvE,qBAAa,8BAA8B;IAIvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAJtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;gBAG7C,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,oBAAoB;IAGrD,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,aAAa;CAc7C"}

package/out/graphql/path-based-graphql-client-resolver.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PathBasedGraphQLClientResolver = void 0;
+const gateway_1 = require("./gateway");
+const SITE_GRAPHQL_GATEWAY_PATH = '/gateway/api/graphql';
+const HOSTNAME_PATTERN = /^(?=.{1,253}$)(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i;
+class PathBasedGraphQLClientResolver {
+    defaultClient;
+    createGraphQLClient;
+    siteClients = new Map();
+    constructor(defaultClient, createGraphQLClient) {
+        this.defaultClient = defaultClient;
+        this.createGraphQLClient = createGraphQLClient;
+    }
+    resolve(site) {
+        const hostname = site?.trim().toLowerCase();
+        if (!hostname || !HOSTNAME_PATTERN.test(hostname) || !(0, gateway_1.isPathBasedRoutingEnabled)()) {
+            return this.defaultClient;
+        }
+        const endpoint = `https://${hostname}${SITE_GRAPHQL_GATEWAY_PATH}`;
+        let client = this.siteClients.get(endpoint);
+        if (!client) {
+            client = this.createGraphQLClient(endpoint);
+            this.siteClients.set(endpoint, client);
+        }
+        return client;
+    }
+}
+exports.PathBasedGraphQLClientResolver = PathBasedGraphQLClientResolver;

package/out/tunnel/docker-compose-lifecycle.d.ts

@@ -4,7 +4,7 @@ import { Logger } from '../ui/logger';
 import { Services } from '@forge/manifest';
 import { ChildProcess } from 'child_process';
 export declare const PROXY_SIDECAR_VOLUME_DIR = "/forge/container";
-export declare const CONTAINER_SERVICE_ASSETS = ".container-service-assets";
+export declare const CONTAINER_SERVICE_ASSETS: string;
 export declare const K8S_AUTH_TOKEN_FILENAME = "local-account";
 export declare const STARTUP_TIMER_MS: number;
 export declare const STARTUP_TIMER_BUFFER_MS: number;

package/out/tunnel/docker-compose-lifecycle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAO3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAC3D,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AACpE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAgCvD,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAW,CAAC;AAEhD,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,sCAAuC,SAAQ,SAAS;gBACvD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAMD,eAAO,MAAM,mCAAmC,GAAU,UAAU,QAAQ,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,oCAgFzG,CAAC;AAsFF,eAAO,MAAM,uBAAuB,GAAU,aAAa,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,GAAU,uBAAuB,MAAM,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,kBA8B9G,CAAC;AA6BF,eAAO,MAAM,qBAAqB,GAChC,uBAAuB,MAAM,EAC7B,YAAY,MAAM,EAClB,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAgBlB,CAAC;AA2LF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,QAAQ,MAAM,EACd,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,kBAmCtC,CAAC;AAgCF,eAAO,MAAM,2BAA2B,GAAU,cAAc,YAAY,kBAW3E,CAAC"}
+{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AAUA,OAAO,EAAmB,SAAS,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAO3C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAM7C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAE3D,eAAO,MAAM,wBAAwB,QAAgE,CAAC;AACtG,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAwBvD,eAAO,MAAM,gBAAgB,QAAY,CAAC;AAC1C,eAAO,MAAM,uBAAuB,QAAW,CAAC;AAEhD,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK;CAG5C;AAED,qBAAa,+BAAgC,SAAQ,SAAS;gBAChD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,sCAAuC,SAAQ,SAAS;gBACvD,YAAY,EAAE,MAAM;CAGjC;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAMD,eAAO,MAAM,mCAAmC,GAAU,UAAU,QAAQ,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,oCAgFzG,CAAC;AAyFF,eAAO,MAAM,uBAAuB,GAAU,aAAa,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,GAAU,uBAAuB,MAAM,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,kBAc9G,CAAC;AAiBF,eAAO,MAAM,qBAAqB,GAChC,uBAAuB,MAAM,EAC7B,YAAY,MAAM,EAClB,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAgBlB,CAAC;AA2LF,eAAO,MAAM,sBAAsB,GACjC,YAAY,UAAU,EACtB,QAAQ,MAAM,EACd,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,kBAmCtC,CAAC;AAgCF,eAAO,MAAM,2BAA2B,GAAU,cAAc,YAAY,kBAW3E,CAAC"}

package/out/tunnel/docker-compose-lifecycle.js

@@ -10,24 +10,20 @@ const docker_compose_1 = require("docker-compose");
 const shared_1 = require("../shared");
 const text_1 = require("../ui/text");
 const tunnel_options_1 = require("./tunnel-options");
-const HIDDEN_DIR = '.services';
+const SERVICES_DIR_NAME = 'services';
+const HIDDEN_DIR = path.join(shared_1.FORGE_DIRECTORY, SERVICES_DIR_NAME);
 exports.PROXY_SIDECAR_VOLUME_DIR = '/forge/container';
-exports.CONTAINER_SERVICE_ASSETS = '.container-service-assets';
+const CONTAINER_SERVICE_ASSETS_DIR_NAME = 'container-service-assets';
+exports.CONTAINER_SERVICE_ASSETS = path.join(shared_1.FORGE_DIRECTORY, CONTAINER_SERVICE_ASSETS_DIR_NAME);
 exports.K8S_AUTH_TOKEN_FILENAME = 'local-account';
 const PROXY_SIDECAR_SERVICE_NAME = 'proxy-sidecar';
 const PROXY_SIDECAR_IMAGE_PATH = 'forge-platform/proxy-sidecar:latest';
 const PROXY_SIDECAR_REGISTRIES = {
-    portable: {
-        production: 'forge-registry.services.atlassian.com',
-        staging: 'forge-registry.stg.services.atlassian.com'
-    },
-    ecr: {
-        production: 'forge-ecr.services.atlassian.com',
-        staging: 'forge-ecr.stg.services.atlassian.com'
-    }
+    production: 'forge-registry.services.atlassian.com',
+    staging: 'forge-registry.stg.services.atlassian.com'
 };
 const isStagingEnvironment = () => process.env.FORGE_GRAPHQL_GATEWAY?.startsWith('https://api-private.stg.atlassian.com/graphql') ?? false;
-const getProxySidecarRegistry = (registryType) => PROXY_SIDECAR_REGISTRIES[registryType][isStagingEnvironment() ? 'staging' : 'production'];
+const getProxySidecarRegistry = () => PROXY_SIDECAR_REGISTRIES[isStagingEnvironment() ? 'staging' : 'production'];
 const LIFECYCLE_PATTERNS = [
     /Container .* (Starting|Started|Stopping|Stopped|Creating|Created|Recreated)/,
     /Network .* (Creating|Created|Removing|Removed)/,
@@ -134,20 +130,19 @@ const generateContainersDockerComposeFile = async (services, appId, envId) => {
     return filesGenerated;
 };
 exports.generateContainersDockerComposeFile = generateContainersDockerComposeFile;
+const relativeComposePath = (from, to) => path.relative(from, to).split(path.sep).join('/');
 const adjustFilePath = (filePath) => {
     if (path.isAbsolute(filePath)) {
         return filePath;
     }
-    let adjusted = filePath;
-    if (adjusted.startsWith('./')) {
-        adjusted = adjusted.slice(2);
-    }
-    return path.join('..', adjusted);
+    const composeFileDir = path.join(process.cwd(), HIDDEN_DIR);
+    const absoluteTarget = path.resolve(process.cwd(), filePath);
+    return relativeComposePath(composeFileDir, absoluteTarget);
 };
 const getProxySidecarConfig = async (serviceKey, containerKeys, port, appId, envId, serviceIndex, healthEndpointPath) => {
     let fopBaseUrl = 'https://forge-outbound-proxy.services.atlassian.com';
     let jwksUrl = 'https://forge.cdn.prod.atlassian-dev.net/.well-known/jwks.json';
-    const proxySidecarRegistry = getProxySidecarRegistry('portable');
+    const proxySidecarRegistry = getProxySidecarRegistry();
     if (isStagingEnvironment()) {
         fopBaseUrl = 'https://forge-outbound-proxy.stg.services.atlassian.com';
         jwksUrl = 'https://forge.cdn.stg.atlassian-dev.net/.well-known/jwks.json';
@@ -170,7 +165,7 @@ const getProxySidecarConfig = async (serviceKey, containerKeys, port, appId, env
                 `K8S_AUTH_TOKEN_PATH=${exports.PROXY_SIDECAR_VOLUME_DIR}/${exports.K8S_AUTH_TOKEN_FILENAME}`,
                 `${containerKeys[0]}_CONTAINER_HEALTHCHECK=http://${containerKeys[0]}:8080${healthEndpointPath}`
             ],
-            volumes: [`../${exports.CONTAINER_SERVICE_ASSETS}:${exports.PROXY_SIDECAR_VOLUME_DIR}:ro`],
+            volumes: [`${adjustFilePath(exports.CONTAINER_SERVICE_ASSETS)}:${exports.PROXY_SIDECAR_VOLUME_DIR}:ro`],
             ports: [
                 `${port}:${tunnel_options_1.DEFAULT_PROXY_INGRESS_PORT}`,
                 `${tunnel_options_1.DEFAULT_PROXY_HEALTHCHECK_PORT_HOST_MACHINE + serviceIndex}:${tunnel_options_1.DEFAULT_PROXY_HEALTHCHECK_PORT}`
@@ -210,15 +205,8 @@ const startDockerComposeStack = async (dockerComposeFilePath, serviceKey, logger
     try {
         await (0, docker_compose_1.pullOne)(PROXY_SIDECAR_SERVICE_NAME, pullOptions);
     }
-    catch (portableRegistryError) {
-        logger.warn('Unable to pull the proxy sidecar image. Retrying from an alternate source...');
-        useEcrProxySidecarImage(dockerComposeFilePath);
-        try {
-            await (0, docker_compose_1.pullOne)(PROXY_SIDECAR_SERVICE_NAME, pullOptions);
-        }
-        catch (ecrRegistryError) {
-            throw new DockerUnableToPullProxySidecarImage(new Error(`Initial pull error: ${getDockerComposeErrorMessage(portableRegistryError)}. Retry error: ${getDockerComposeErrorMessage(ecrRegistryError)}`));
-        }
+    catch (pullError) {
+        throw new DockerUnableToPullProxySidecarImage(new Error(getDockerComposeErrorMessage(pullError)));
     }
     await waitForContainersToStart(dockerComposeFilePath, serviceKey, logger);
 };
@@ -230,16 +218,6 @@ const getDockerComposeErrorMessage = (error) => {
     }
     return error != null ? String(error) : 'Unknown Error Occurred.';
 };
-const useEcrProxySidecarImage = (dockerComposeFilePath) => {
-    const composeConfig = yaml.parse(fs.readFileSync(dockerComposeFilePath, 'utf8'));
-    const proxySidecar = composeConfig?.services?.[PROXY_SIDECAR_SERVICE_NAME];
-    if (!proxySidecar) {
-        throw new Error(`The Docker Compose file does not contain the ${PROXY_SIDECAR_SERVICE_NAME} service.`);
-    }
-    const ecrRegistry = getProxySidecarRegistry('ecr');
-    proxySidecar.image = `${ecrRegistry}/${PROXY_SIDECAR_IMAGE_PATH}`;
-    fs.writeFileSync(dockerComposeFilePath, yaml.stringify(composeConfig));
-};
 const determineComposeFlags = async (dockerComposeFilePath, serviceKey, logger) => {
     const flags = ['--build', '--quiet-pull'];
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "9.8.0-next.0",
+  "version": "9.8.0-next.10",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -13,12 +13,12 @@
     "prebuild": "yarn generate-graphql-types"
   },
   "dependencies": {
-    "@forge/manifest": "13.7.0-next.0",
+    "@forge/manifest": "13.7.0-next.6",
     "@forge/util": "3.0.0",
     "@forge/i18n": "1.0.0",
     "@sentry/node": "7.106.0",
     "@vercel/detect-agent": "^1.2.3",
-    "adm-zip": "^0.6.0",
+    "adm-zip": "^0.6.1",
     "archiver": "^8.0.0",
     "array.prototype.flatmap": "^1.3.3",
     "case": "^1.6.3",
@@ -58,7 +58,7 @@
     "@graphql-codegen/typescript-operations": "^4.6.0",
     "@graphql-tools/schema": "^10.1.1",
     "@graphql-typed-document-node/core": "^3.2.0",
-    "@types/adm-zip": "^0.5.5",
+    "@types/adm-zip": "^0.5.8",
     "@types/array.prototype.flatmap": "^1.2.6",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",