npm package diff

Package: @forge/cli-shared

Versions: 8.9.0-next.9 - 8.9.0-next.10

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

Index: package/out/tunnel/docker-compose-lifecycle.js
===================================================================
--- package/out/tunnel/docker-compose-lifecycle.js
+++ package/out/tunnel/docker-compose-lifecycle.js
@@ -43,9 +43,10 @@
             }
             const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
                 const config = {
                     container_name: container.key,
-                    ...container.tunnel?.docker
+                    ...container.tunnel?.docker,
+                    depends_on: [getProxySidecarContainerName(serviceKey)]
                 };
                 const envArray = container?.tunnel?.docker.environment ?? [];
                 const filteredEnvArray = envArray.filter((envVar) => !envVar.startsWith('FORGE_EGRESS_PROXY_URL='));
                 filteredEnvArray.push('FORGE_EGRESS_PROXY_URL=http://proxy-sidecar:7072');
@@ -82,9 +83,9 @@
     }
     return {
         'proxy-sidecar': {
             image: proxySidecarImage,
-            container_name: `proxy-sidecar-${serviceKey}`,
+            container_name: getProxySidecarContainerName(serviceKey),
             environment: [
                 `SERVICE_URL=http://${containerKeys[0]}:8080`,
                 `FOP_BASE_URL=${fopBaseUrl}`,
                 `APP_ID=ari:cloud:ecosystem::app/${appIdShort}`,
@@ -93,13 +94,15 @@
                 `IS_LOCAL_DEV=true`,
                 `K8S_AUTH_TOKEN_PATH=${exports.PROXY_SIDECAR_VOLUME_DIR}/${exports.K8S_AUTH_TOKEN_FILENAME}`
             ],
             volumes: [`../${exports.CONTAINER_SERVICE_ASSETS}:${exports.PROXY_SIDECAR_VOLUME_DIR}:ro`],
-            ports: [`${port}:${tunnel_options_1.DEFAULT_PROXY_INGRESS_PORT}`],
-            depends_on: containerKeys
+            ports: [`${port}:${tunnel_options_1.DEFAULT_PROXY_INGRESS_PORT}`]
         }
     };
 };
+const getProxySidecarContainerName = (serviceKey) => {
+    return `proxy-sidecar-${serviceKey}`;
+};
 const getContainerDockerComposePath = (serviceKey) => {
     const hiddenDir = path.join(process.cwd(), HIDDEN_DIR);
     if (!fs.existsSync(hiddenDir)) {
         fs.mkdirSync(hiddenDir, { recursive: true });

Modified: package/package.json

Index: package/package.json
===================================================================
--- package/package.json
+++ package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@forge/cli-shared",
-  "version": "8.9.0-next.9",
+  "version": "8.9.0-next.10",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "out/index.js",

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

Index: package/out/tunnel/docker-compose-lifecycle.d.ts.map
===================================================================
--- package/out/tunnel/docker-compose-lifecycle.d.ts.map
+++ package/out/tunnel/docker-compose-lifecycle.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAC3D,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AACpE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAEvD,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;AAMD,eAAO,MAAM,mCAAmC,8BAAqC,MAAM,SAAS,MAAM,oCA6CzG,CAAC;AA4DF,eAAO,MAAM,uBAAuB,gBAAuB,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,0BAAiC,MAAM,cAAc,MAAM,kBAuB9F,CAAC;AAMF,eAAO,MAAM,sBAAsB,eAAsB,UAAU,iBAAiB,OAAO,MAAM,EAAE,MAAM,CAAC,kBA4BzG,CAAC"}
\ No newline at end of file
+{"version":3,"file":"docker-compose-lifecycle.d.ts","sourceRoot":"","sources":["../../src/tunnel/docker-compose-lifecycle.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,eAAO,MAAM,wBAAwB,qBAAqB,CAAC;AAC3D,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AACpE,eAAO,MAAM,uBAAuB,kBAAkB,CAAC;AAEvD,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;AAMD,eAAO,MAAM,mCAAmC,8BAAqC,MAAM,SAAS,MAAM,oCA8CzG,CAAC;AA+DF,eAAO,MAAM,uBAAuB,gBAAuB,MAAM,kBAYhE,CAAC;AAOF,eAAO,MAAM,uBAAuB,0BAAiC,MAAM,cAAc,MAAM,kBAuB9F,CAAC;AAMF,eAAO,MAAM,sBAAsB,eAAsB,UAAU,iBAAiB,OAAO,MAAM,EAAE,MAAM,CAAC,kBA4BzG,CAAC"}
\ No newline at end of file

Modified: package/CHANGELOG.md

Large diffs are not rendered by default. Click here to display diff