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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @forge/cli-shared
 
+## 9.8.0-next.1
+
+### Minor Changes
+
+- 0700ef3: Removed the ECR fallback when pulling the Forge tunnel proxy-sidecar image. Tunnel now pulls that image only from the portable registry.
+
 ## 9.8.0-next.0
 
 ### Minor Changes

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,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;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;AAsFF,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

@@ -17,17 +17,11 @@ 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)/,
@@ -147,7 +141,7 @@ 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';
-    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';
@@ -210,15 +204,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 +217,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.1",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",