npm package diff
Package: @forge/cli
Versions: 12.7.1 - 12.7.2-next.8
Modified: package/out/command-line/controller/tunnel-controller.js
Index: package/out/command-line/controller/tunnel-controller.js
===================================================================
--- package/out/command-line/controller/tunnel-controller.js
+++ package/out/command-line/controller/tunnel-controller.js
@@ -1,14 +1,9 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.TunnelController = void 0;
-const tslib_1 = require("tslib");
const cli_shared_1 = require("@forge/cli-shared");
const tunnel_service_1 = require("../../service/tunnel-service");
-const docker_compose_1 = require("docker-compose");
-const yaml = tslib_1.__importStar(require("yaml"));
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
class TunnelController {
nodeTunnelService;
tunnelView;
configFile;
@@ -24,22 +19,36 @@
this.environmentClient = environmentClient;
}
async run(tunnelOptions) {
const options = await this.validateTunnelCommandOptions(tunnelOptions);
- const envKey = tunnelOptions.environment;
+ const envKey = tunnelOptions.environment || cli_shared_1.DEFAULT_ENVIRONMENT_OPTION;
this.tunnelView.preamble(envKey);
const { app: { id: appId }, services, modules } = await this.configFile.readConfig();
const serviceWithTunnelConfigExists = services?.some((service) => service.containers?.some((container) => {
return !!container.tunnel;
}));
if (services && serviceWithTunnelConfigExists) {
+ const appEnvironments = await this.environmentClient.listEnvironment({ appId });
+ const environmentDetails = appEnvironments.filter((environment) => environment.key === envKey);
+ if (environmentDetails.length < 1) {
+ throw new tunnel_service_1.EnvironmentIsNotDefined(envKey);
+ }
+ const envId = environmentDetails[0].id;
const childProcess = await this.containerCommandService.authenticateDocker();
await this.processDockerAuthentication(childProcess);
- const dockerComposeFilePaths = await this.generateContainersDockerComposeFile(services, appId, envKey);
+ const dockerComposeFilePaths = await (0, cli_shared_1.generateContainersDockerComposeFile)(services, appId, envId);
options.containersDockerComposeFiles = dockerComposeFilePaths;
- for (const [serviceKey, filePath] of Object.entries(dockerComposeFilePaths)) {
- await this.startDockerComposeStack(filePath, serviceKey);
+ try {
+ for (const [serviceKey, filePath] of Object.entries(dockerComposeFilePaths)) {
+ await (0, cli_shared_1.startDockerComposeStack)(filePath, serviceKey);
+ }
}
+ catch (err) {
+ for (const filePath of Object.values(dockerComposeFilePaths)) {
+ await (0, cli_shared_1.deleteDockerComposeFile)(filePath);
+ }
+ throw err;
+ }
}
if (modules) {
const uiKit1Modules = (0, cli_shared_1.findUIKit1Modules)(modules);
if (uiKit1Modules.length > 0) {
@@ -47,31 +56,8 @@
}
}
return await this.nodeTunnelService.run(options);
}
- async startDockerComposeStack(dockerComposeFilePath, serviceKey) {
- try {
- await (0, docker_compose_1.pullOne)('proxy-sidecar', {
- cwd: path.dirname(dockerComposeFilePath),
- log: true,
- config: dockerComposeFilePath
- });
- }
- catch (err) {
- throw new tunnel_service_1.DockerUnableToPullProxySidecarImage(err);
- }
- try {
- await (0, docker_compose_1.upAll)({
- cwd: path.dirname(dockerComposeFilePath),
- log: true,
- config: dockerComposeFilePath,
- composeOptions: [`-p${serviceKey}`]
- });
- }
- catch (err) {
- throw new tunnel_service_1.DockerUnableToStartError(err);
- }
- }
async processDockerAuthentication(childProcess) {
await new Promise((resolve, reject) => {
childProcess.on('close', (code) => {
if (code === 0) {
@@ -108,84 +94,7 @@
options.debugStartingPort = port;
}
return options;
}
- async generateContainersDockerComposeFile(services, appId, envKey) {
- const filesGenerated = {};
- for (const service of services) {
- const { key: serviceKey, containers } = service;
- const containersWithTunnelConfig = containers.filter((container) => !!container.tunnel);
- if (containersWithTunnelConfig.length > 0) {
- const port = await (0, cli_shared_1.getServicePort)(services, serviceKey);
- if (!port || port < 1024 || port > 49152) {
- throw new tunnel_service_1.InvalidContainerServicePort(serviceKey);
- }
- const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
- const config = {
- container_name: container.key,
- ...container.tunnel?.docker
- };
- 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');
- config.environment = filteredEnvArray;
- return [container.key, config];
- }));
- const dockerComposeConfig = {
- services: {
- ...containerConfig,
- ...(await this.getProxySidecarConfig(serviceKey, Object.keys(containerConfig), port, appId, envKey))
- }
- };
- const yamlString = yaml.stringify(dockerComposeConfig);
- const filePath = this.getContainerDockerComposePath(serviceKey);
- fs.writeFileSync(filePath, yamlString);
- filesGenerated[serviceKey] = filePath;
- }
- }
- return filesGenerated;
- }
- getContainerDockerComposePath(serviceKey) {
- const hiddenDir = path.join(process.cwd(), '.services');
- if (!fs.existsSync(hiddenDir)) {
- fs.mkdirSync(hiddenDir, { recursive: true });
- }
- return path.join(hiddenDir, `docker-compose-${serviceKey}.yml`);
- }
- async getProxySidecarConfig(serviceKey, containerKeys, port, appId, envKey = cli_shared_1.DEFAULT_ENVIRONMENT_OPTION) {
- 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')) {
- 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';
- }
- const appEnvironments = await this.environmentClient.listEnvironment({ appId });
- const environmentDetails = appEnvironments.filter((environment) => environment.key === envKey);
- if (environmentDetails.length < 1) {
- throw new tunnel_service_1.EnvironmentIsNotDefined(envKey);
- }
- let appIdShort = appId;
- if (appId.startsWith('ari:cloud:ecosystem::app/')) {
- appIdShort = appId.split('/')[1];
- }
- return {
- 'proxy-sidecar': {
- image: proxySidecarImage,
- container_name: `proxy-sidecar-${serviceKey}`,
- environment: [
- `SERVICE_URL=http://${containerKeys[0]}:8080`,
- `FOP_BASE_URL=${fopBaseUrl}`,
- `APP_ID=ari:cloud:ecosystem::app/${appIdShort}`,
- `ENV_ID=ari:cloud:ecosystem::environment/${appIdShort}/${environmentDetails[0].id}`,
- `JWKS_URL=${jwksUrl}`,
- `IS_LOCAL_DEV=true`
- ],
- ports: [`${port}:${cli_shared_1.DEFAULT_PROXY_INGRESS_PORT}`],
- depends_on: containerKeys
- }
- };
- }
}
exports.TunnelController = TunnelController;
//# sourceMappingURL=tunnel-controller.js.map
\ No newline at end of fileModified: package/out/service/tunnel-service.js
Index: package/out/service/tunnel-service.js
===================================================================
--- package/out/service/tunnel-service.js
+++ package/out/service/tunnel-service.js
@@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = exports.InvalidContainerServicePort = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.DockerAuthenticationError = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
+exports.InProcessTunnelService = exports.EnvironmentIsNotDefined = exports.DockerAuthenticationError = exports.InvalidDebugStartingPortNumber = exports.DebugArgumentNameMismatch = exports.FunctionHandlersMustBeDefinedInDebugMode = void 0;
const manifest_1 = require("@forge/manifest");
const cli_shared_1 = require("@forge/cli-shared");
class FunctionHandlersMustBeDefinedInDebugMode extends cli_shared_1.UserError {
constructor() {
@@ -26,26 +26,8 @@
super(cli_shared_1.Text.tunnel.unableToAuthenticateDocker(errCode));
}
}
exports.DockerAuthenticationError = DockerAuthenticationError;
-class DockerUnableToPullProxySidecarImage extends cli_shared_1.UserError {
- constructor(err) {
- super(cli_shared_1.Text.tunnel.unableToPullProxySidecarImage(err?.message ?? 'Unknown Error Occurred.'));
- }
-}
-exports.DockerUnableToPullProxySidecarImage = DockerUnableToPullProxySidecarImage;
-class DockerUnableToStartError extends cli_shared_1.UserError {
- constructor(err) {
- super(cli_shared_1.Text.tunnel.unableToStartDockerComposeStack(err?.message ?? 'Unknown Error Occurred.'));
- }
-}
-exports.DockerUnableToStartError = DockerUnableToStartError;
-class InvalidContainerServicePort extends cli_shared_1.UserError {
- constructor(serviceKey) {
- super(cli_shared_1.Text.error.invalidServicePort(serviceKey));
- }
-}
-exports.InvalidContainerServicePort = InvalidContainerServicePort;
class EnvironmentIsNotDefined extends cli_shared_1.UserError {
constructor(envKey) {
super(cli_shared_1.Text.error.environmentIsNotDefined(envKey));
}Modified: package/npm-shrinkwrap.json
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",
- "version": "12.7.1",
+ "version": "12.7.2-next.8",
"description": "A command line interface for managing Atlassian-hosted apps",
"author": "Atlassian",
"license": "SEE LICENSE IN LICENSE.txt",
"bin": {
@@ -20,16 +20,16 @@
"generate:custom-scopes-schema": "yaml -1js --indent 2 < src/custom-scopes/validate/schema.yaml > src/custom-scopes/validate/schema.json",
"generate:custom-scopes-types": "json2ts --input src/custom-scopes/validate/schema.json --output src/custom-scopes/generated-types.d.ts --style.singleQuote"
},
"dependencies": {
- "@forge/bundler": "6.1.10",
- "@forge/cli-shared": "8.8.1",
+ "@forge/bundler": "6.1.11-next.8",
+ "@forge/cli-shared": "8.8.2-next.5",
"@forge/egress": "2.1.1",
- "@forge/lint": "5.11.6",
- "@forge/manifest": "10.8.0",
+ "@forge/lint": "5.12.0-next.8",
+ "@forge/manifest": "11.0.0-next.3",
"@forge/i18n": "0.0.7",
"@forge/runtime": "6.1.1",
- "@forge/tunnel": "6.3.1",
+ "@forge/tunnel": "6.3.2-next.8",
"@forge/util": "2.0.1",
"@sentry/node": "7.106.0",
"ajv": "^8.12.0",
"archiver": "^7.0.1",Modified: package/out/command-line/controller/tunnel-controller.d.ts.map
Index: package/out/command-line/controller/tunnel-controller.d.ts.map
===================================================================
--- package/out/command-line/controller/tunnel-controller.d.ts.map
+++ package/out/command-line/controller/tunnel-controller.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,oBAAoB,EAQrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAOL,aAAa,EAGd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAM3E,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBALjB,iBAAiB,EAAE,aAAa,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,EACxC,uBAAuB,EAAE,gBAAgB,EACzC,iBAAiB,EAAE,qBAAqB;IAG9C,GAAG,CAAC,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YA+CtD,uBAAuB;YA6BvB,2BAA2B;YAa3B,4BAA4B;YA8B5B,mCAAmC;IAgDjD,OAAO,CAAC,6BAA6B;YASvB,qBAAqB;CAgDpC"}
\ No newline at end of file
+{"version":3,"file":"tunnel-controller.d.ts","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,oBAAoB,EASrB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAIL,aAAa,EAGd,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBALjB,iBAAiB,EAAE,aAAa,EAChC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,mBAAmB,EACxC,uBAAuB,EAAE,gBAAgB,EACzC,iBAAiB,EAAE,qBAAqB;IAG9C,GAAG,CAAC,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;YA8DtD,2BAA2B;YAa3B,4BAA4B;CA6B3C"}
\ No newline at end of fileModified: package/out/command-line/controller/tunnel-controller.js.map
Index: package/out/command-line/controller/tunnel-controller.js.map
===================================================================
--- package/out/command-line/controller/tunnel-controller.js.map
+++ package/out/command-line/controller/tunnel-controller.js.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"tunnel-controller.js","sourceRoot":"","sources":["../../../src/command-line/controller/tunnel-controller.ts"],"names":[],"mappings":"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"}
\ No newline at end of fileModified: package/out/service/tunnel-service.d.ts.map
Index: package/out/service/tunnel-service.d.ts.map
===================================================================
--- package/out/service/tunnel-service.d.ts.map
+++ package/out/service/tunnel-service.d.ts.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,mCAAoC,SAAQ,SAAS;gBACpD,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,wBAAyB,SAAQ,SAAS;gBACzC,GAAG,CAAC,EAAE,KAAK;CAGxB;AAED,qBAAa,2BAA4B,SAAQ,SAAS;gBAC5C,UAAU,EAAE,MAAM;CAG/B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB9D"}
\ No newline at end of file
+{"version":3,"file":"tunnel-service.d.ts","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,qBAAa,wCAAyC,SAAQ,SAAS;;CAItE;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,eAAe,EAAE,MAAM;CAGpC;AAED,qBAAa,8BAA+B,SAAQ,SAAS;gBAC/C,IAAI,EAAE,MAAM;CAGzB;AAED,qBAAa,yBAA0B,SAAQ,SAAS;gBAC1C,OAAO,EAAE,MAAM;CAG5B;AAED,qBAAa,uBAAwB,SAAQ,SAAS;gBACxC,MAAM,EAAE,MAAM;CAG3B;AAaD,qBAAa,sBAAuB,YAAW,aAAa;IAExD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,4BAA4B;gBAF5B,kBAAkB,EAAE,kBAAkB,EACtC,gBAAgB,EAAE,gBAAgB,EAClC,4BAA4B,EAAE,4BAA4B;IAGhE,GAAG,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB9D"}
\ No newline at end of fileModified: package/out/service/tunnel-service.js.map
Index: package/out/service/tunnel-service.js.map
===================================================================
--- package/out/service/tunnel-service.js.map
+++ package/out/service/tunnel-service.js.map
@@ -1,1 +1,1 @@
-{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,OAAe;QACzB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,mCAAoC,SAAQ,sBAAS;IAChE,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAC9F,CAAC;CACF;AAJD,kFAIC;AAED,MAAa,wBAAyB,SAAQ,sBAAS;IACrD,YAAY,GAAW;QACrB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,+BAA+B,CAAC,GAAG,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC,CAAC;IAChG,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,2BAA4B,SAAQ,sBAAS;IACxD,YAAY,UAAkB;QAC5B,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AAzBD,wDAyBC"}
\ No newline at end of file
+{"version":3,"file":"tunnel-service.js","sourceRoot":"","sources":["../../src/service/tunnel-service.ts"],"names":[],"mappings":";;;AAAA,8CAAgD;AAEhD,kDAAmE;AASnE,MAAa,wCAAyC,SAAQ,sBAAS;IACrE;QACE,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,4FAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,eAAuB;QACjC,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC,CAAC;IAChE,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,8BAA+B,SAAQ,sBAAS;IAC3D,YAAY,IAAY;QACtB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1D,CAAC;CACF;AAJD,wEAIC;AAED,MAAa,yBAA0B,SAAQ,sBAAS;IACtD,YAAY,OAAe;QACzB,KAAK,CAAC,iBAAI,CAAC,MAAM,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;AAJD,8DAIC;AAED,MAAa,uBAAwB,SAAQ,sBAAS;IACpD,YAAY,MAAc;QACxB,KAAK,CAAC,iBAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,0DAIC;AAaD,MAAa,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,kBAAsC,EACtC,gBAAkC,EAClC,4BAA0D;QAF1D,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iCAA4B,GAA5B,4BAA4B,CAA8B;IAC1E,CAAC;IAEG,KAAK,CAAC,GAAG,CAAC,aAA4B;QAC3C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAClD;YACE,cAAc,EAAE,aAAa,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,SAAS;YACrF,eAAe;YACf,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,aAAa,CAAC,GAAG;YACtB,IAAI,EAAE,aAAa,CAAC,SAAS;SAC9B,EACD,aAAa,CAAC,4BAA4B,CAC3C,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5E,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,wBAAa,CAAC,CAAC;QAC/F,MAAM,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IACrG,CAAC;CACF;AAzBD,wDAyBC"}
\ No newline at end of fileModified: package/CHANGELOG.md
Large diffs are not rendered by default.
Modified: package/out/command-line/controller/tunnel-controller.d.ts
Index: package/out/command-line/controller/tunnel-controller.d.ts
===================================================================
--- package/out/command-line/controller/tunnel-controller.d.ts
+++ package/out/command-line/controller/tunnel-controller.d.ts
@@ -12,12 +12,8 @@
private readonly containerCommandService;
private readonly environmentClient;
constructor(nodeTunnelService: TunnelService, tunnelView: TunnelView, configFile: ConfigFile, cachedConfigService: CachedConfigService, containerCommandService: ContainerCommand, environmentClient: ListEnvironmentClient);
run(tunnelOptions: TunnelCommandOptions): Promise<void>;
- private startDockerComposeStack;
private processDockerAuthentication;
private validateTunnelCommandOptions;
- private generateContainersDockerComposeFile;
- private getContainerDockerComposePath;
- private getProxySidecarConfig;
}
//# sourceMappingURL=tunnel-controller.d.ts.map
\ No newline at end of fileModified: package/out/service/tunnel-service.d.ts
Index: package/out/service/tunnel-service.d.ts
===================================================================
--- package/out/service/tunnel-service.d.ts
+++ package/out/service/tunnel-service.d.ts
@@ -15,17 +15,8 @@
}
export declare class DockerAuthenticationError extends UserError {
constructor(errCode: string);
}
-export declare class DockerUnableToPullProxySidecarImage extends UserError {
- constructor(err?: Error);
-}
-export declare class DockerUnableToStartError extends UserError {
- constructor(err?: Error);
-}
-export declare class InvalidContainerServicePort extends UserError {
- constructor(serviceKey: string);
-}
export declare class EnvironmentIsNotDefined extends UserError {
constructor(envKey: string);
}
export declare class InProcessTunnelService implements TunnelService {