@forge/cli-shared 9.3.0-next.12 → 9.3.0-next.13

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;AAYvD,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;AAuFF,eAAO,MAAM,uBAAuB,GAAU,aAAa,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,GAAU,uBAAuB,MAAM,EAAE,YAAY,MAAM,EAAE,QAAQ,MAAM,kBAc9G,CAAC;AAOF,eAAO,MAAM,qBAAqB,GAChC,uBAAuB,MAAM,EAC7B,YAAY,MAAM,EAClB,QAAQ,MAAM,KACb,OAAO,CAAC,MAAM,EAAE,CAgBlB,CAAC;AA8LF,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,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"}

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

@@ -15,6 +15,19 @@ exports.PROXY_SIDECAR_VOLUME_DIR = '/forge/container';
 exports.CONTAINER_SERVICE_ASSETS = '.container-service-assets';
 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'
+    }
+};
+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 LIFECYCLE_PATTERNS = [
     /Container .* (Starting|Started|Stopping|Stopped|Creating|Created|Recreated)/,
     /Network .* (Creating|Created|Removing|Removed)/,
@@ -134,11 +147,10 @@ const adjustFilePath = (filePath) => {
 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';
-    let proxySidecarImage = 'forge-ecr.services.atlassian.com/forge-platform/proxy-sidecar:latest';
-    if (process.env.FORGE_GRAPHQL_GATEWAY?.startsWith('https://api-private.stg.atlassian.com/graphql')) {
+    const proxySidecarRegistry = getProxySidecarRegistry('portable');
+    if (isStagingEnvironment()) {
         fopBaseUrl = 'https://forge-outbound-proxy.stg.services.atlassian.com';
         jwksUrl = 'https://forge.cdn.stg.atlassian-dev.net/.well-known/jwks.json';
-        proxySidecarImage = 'forge-ecr.stg.services.atlassian.com/forge-platform/proxy-sidecar:latest';
     }
     let appIdShort = appId;
     if (appId.startsWith('ari:cloud:ecosystem::app/')) {
@@ -146,7 +158,7 @@ const getProxySidecarConfig = async (serviceKey, containerKeys, port, appId, env
     }
     return {
         [PROXY_SIDECAR_SERVICE_NAME]: {
-            image: proxySidecarImage,
+            image: `${proxySidecarRegistry}/${PROXY_SIDECAR_IMAGE_PATH}`,
             container_name: getProxySidecarContainerName(serviceKey),
             environment: [
                 `SERVICE_URL=http://${containerKeys[0]}:8080`,
@@ -190,19 +202,44 @@ const deleteDockerComposeFile = async (composeFile) => {
 };
 exports.deleteDockerComposeFile = deleteDockerComposeFile;
 const startDockerComposeStack = async (dockerComposeFilePath, serviceKey, logger) => {
+    const pullOptions = {
+        cwd: path.dirname(dockerComposeFilePath),
+        log: true,
+        config: dockerComposeFilePath
+    };
     try {
-        await (0, docker_compose_1.pullOne)('proxy-sidecar', {
-            cwd: path.dirname(dockerComposeFilePath),
-            log: true,
-            config: dockerComposeFilePath
-        });
+        await (0, docker_compose_1.pullOne)(PROXY_SIDECAR_SERVICE_NAME, pullOptions);
     }
-    catch (err) {
-        throw new DockerUnableToPullProxySidecarImage(err);
+    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)}`));
+        }
     }
     await waitForContainersToStart(dockerComposeFilePath, serviceKey, logger);
 };
 exports.startDockerComposeStack = startDockerComposeStack;
+const getDockerComposeErrorMessage = (error) => {
+    if (error && typeof error === 'object') {
+        const dockerComposeError = error;
+        return dockerComposeError.err || dockerComposeError.out || dockerComposeError.message || 'Unknown Error Occurred.';
+    }
+    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 {
@@ -318,8 +355,7 @@ const waitForContainersToStart = async (dockerComposeFilePath, serviceKey, logge
             callback: logFilter
         }).catch((error) => {
             clearTimeout(startupTimer);
-            const errorMessage = error?.err || error?.out || error?.message || 'Unknown Error Occurred.';
-            reject(new DockerUnableToStartError(new Error(errorMessage)));
+            reject(new DockerUnableToStartError(new Error(getDockerComposeErrorMessage(error))));
         });
         setTimeout(async () => {
             if (containersStarted)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "9.3.0-next.12",
+  "version": "9.3.0-next.13",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",