npm package diff
Package: @forge/cli-shared
Versions: 8.9.0-next.17 - 8.9.0-next.18
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
@@ -12,8 +12,9 @@
const HIDDEN_DIR = '.services';
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';
class InvalidContainerServicePort extends shared_1.UserError {
constructor(serviceKey) {
super(text_1.Text.error.invalidServicePort(serviceKey));
}
@@ -44,9 +45,9 @@
const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
const config = {
container_name: container.key,
...container.tunnel?.docker,
- depends_on: [getProxySidecarContainerName(serviceKey)]
+ depends_on: [PROXY_SIDECAR_SERVICE_NAME]
};
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');
@@ -81,9 +82,9 @@
if (appId.startsWith('ari:cloud:ecosystem::app/')) {
appIdShort = appId.split('/')[1];
}
return {
- 'proxy-sidecar': {
+ [PROXY_SIDECAR_SERVICE_NAME]: {
image: proxySidecarImage,
container_name: getProxySidecarContainerName(serviceKey),
environment: [
`SERVICE_URL=http://${containerKeys[0]}:8080`,
@@ -99,9 +100,9 @@
}
};
};
const getProxySidecarContainerName = (serviceKey) => {
- return `proxy-sidecar-${serviceKey}`;
+ return `${PROXY_SIDECAR_SERVICE_NAME}-${serviceKey}`;
};
const getContainerDockerComposePath = (serviceKey) => {
const hiddenDir = path.join(process.cwd(), HIDDEN_DIR);
if (!fs.existsSync(hiddenDir)) {Modified: package/out/graphql/graphql-types.js
Large diffs are not rendered by default.
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.17",
+ "version": "8.9.0-next.18",
"description": "Common functionality for Forge CLI",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"main": "out/index.js",
@@ -11,9 +11,9 @@
"compile": "tsc -b -v",
"generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
},
"dependencies": {
- "@forge/manifest": "11.0.0-next.8",
+ "@forge/manifest": "11.0.0-next.9",
"@forge/util": "2.0.1",
"@forge/i18n": "0.0.7",
"@sentry/node": "7.106.0",
"adm-zip": "^0.5.10",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,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
+{"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;AAGvD,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 fileModified: package/out/graphql/graphql-types.d.ts.map
Large diffs are not rendered by default.
Modified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/graphql/graphql-types.d.ts
Large diffs are not rendered by default.