@forge/cli 10.4.1 → 10.5.0-next.11

package/out/service/tunnel-service.js

@@ -12,7 +12,6 @@ const cli_shared_1 = require("@forge/cli-shared");
 const version_info_1 = require("../command-line/version-info");
 const DISABLE_TTY = process.env.DISABLE_TTY === 'true';
 exports.CONTAINER_NAME = `forge-tunnel-docker-${process.pid}`;
-const PATH_DOCKER_NGROK_CONFIG = '/opt/provided-ngrok-config.yml';
 const cliDetails = (0, version_info_1.getCLIDetails)();
 let versionTags;
 if (cliDetails?.version !== undefined) {
@@ -46,13 +45,6 @@ class TunnelServiceBase {
     constructor(cachedConfigService) {
         this.cachedConfigService = cachedConfigService;
     }
-    ngrokConfigPath() {
-        const path = this.cachedConfigService.getNgrokConfigPath();
-        if (!path) {
-            throw new cli_shared_1.UserError(cli_shared_1.Text.tunnel.error.noNgrokConfig);
-        }
-        return path;
-    }
 }
 class InProcessTunnelService extends TunnelServiceBase {
     ui;
@@ -60,27 +52,21 @@ class InProcessTunnelService extends TunnelServiceBase {
     tunnelInteractor;
     configFilePortFindingService;
     analyticsService;
-    featureFlagService;
-    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService, featureFlagService) {
+    constructor(ui, startTunnelCommand, tunnelInteractor, configFilePortFindingService, cachedConfigService, analyticsService) {
         super(cachedConfigService);
         this.ui = ui;
         this.startTunnelCommand = startTunnelCommand;
         this.tunnelInteractor = tunnelInteractor;
         this.configFilePortFindingService = configFilePortFindingService;
         this.analyticsService = analyticsService;
-        this.featureFlagService = featureFlagService;
     }
     async run(tunnelOptions, creds, debugEnabled, onError) {
         try {
             const resourcePortMap = await this.configFilePortFindingService.findPorts();
-            const ngrokConfig = (await this.featureFlagService.isCloudflareTunnelEnabled())
-                ? undefined
-                : this.ngrokConfigPath();
             const tunnel = await this.startTunnelCommand.execute({
                 environmentKey: tunnelOptions.environment || process.env.ENVIRONMENT_KEY || 'default',
                 resourcePortMap,
-                host: 'localhost',
-                ngrokConfig
+                host: 'localhost'
             });
             const monitor = await this.tunnelInteractor.watchApp(tunnel, tunnelOptions);
             const manifestFileWatcher = this.tunnelInteractor.watchAndWarnOnManifestChanges(manifest_1.MANIFEST_FILE);
@@ -101,18 +87,13 @@ exports.InProcessTunnelService = InProcessTunnelService;
 class SandboxTunnelServiceBase extends TunnelServiceBase {
     configFilePortFindingService;
     cachedConfigService;
-    featureFlagService;
-    constructor(configFilePortFindingService, cachedConfigService, featureFlagService) {
+    constructor(configFilePortFindingService, cachedConfigService) {
         super(cachedConfigService);
         this.configFilePortFindingService = configFilePortFindingService;
         this.cachedConfigService = cachedConfigService;
-        this.featureFlagService = featureFlagService;
     }
     async getTunnelProcessEnvironment(tunnelOptions, debugEnabled, { email, token }, port, cspReporterPort, resourcePorts) {
         const graphqlGateway = (0, cli_shared_1.getGraphqlGateway)();
-        const ngrokConfig = (await this.featureFlagService.isCloudflareTunnelEnabled())
-            ? []
-            : this.getNgrokConfigEnvironment();
         return [
             { key: 'APP_FOLDER', value: '/app' },
             { key: 'FORGE_EMAIL', value: email },
@@ -125,16 +106,12 @@ class SandboxTunnelServiceBase extends TunnelServiceBase {
             ...this.getInspectorPortEnvironment(port),
             ...this.getCspReporterPortEnvironment(cspReporterPort),
             ...this.getResourcePortEnvironment(resourcePorts),
-            ...this.getUserEnvironmentVariables(),
-            ...ngrokConfig
+            ...this.getUserEnvironmentVariables()
         ];
     }
     getInspectorPortEnvironment(port) {
         return [{ key: 'TUNNEL_INSPECTOR_PORT', value: port.toString() }];
     }
-    getNgrokConfigEnvironment() {
-        return [{ key: 'NGROK_CONFIG', value: this.ngrokConfigPath() }];
-    }
     getCspReporterPortEnvironment(cspReporterPort) {
         if (cspReporterPort) {
             return [{ key: 'CSP_REPORTER_PORT', value: cspReporterPort.toString() }];
@@ -183,12 +160,10 @@ exports.LocalTunnelService = LocalTunnelService;
 class DockerTunnelService extends SandboxTunnelServiceBase {
     dockerService;
     analyticsService;
-    featureFlagService;
-    constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService, featureFlagService) {
-        super(configFilePortFindingService, cachedConfigService, featureFlagService);
+    constructor(configFilePortFindingService, cachedConfigService, dockerService, analyticsService) {
+        super(configFilePortFindingService, cachedConfigService);
         this.dockerService = dockerService;
         this.analyticsService = analyticsService;
-        this.featureFlagService = featureFlagService;
     }
     async run(tunnelOptions, creds, debugEnabled) {
         await this.validateDockerVersion(creds, debugEnabled);
@@ -265,7 +240,6 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
         if (process.env.FORGE_DEV_DOCKER_TUNNEL) {
             const monorepoRoot = (0, path_1.join)(__dirname, '../../../..');
             options.push(`-v=${monorepoRoot}:/monorepo:cached`);
-            options.push(`-v=${monorepoRoot}/node_modules/ngrok/docker-bin:/monorepo/node_modules/ngrok/bin`);
             options.push(`-v=${monorepoRoot}/node_modules/cloudflared/docker-bin:/monorepo/node_modules/cloudflared/bin`);
         }
         if (process.env.FORGE_TUNNEL_MOUNT_DIRECTORIES) {
@@ -274,14 +248,8 @@ class DockerTunnelService extends SandboxTunnelServiceBase {
                 options.push(`-v=${mount}:cached`);
             });
         }
-        if (!(await this.featureFlagService.isCloudflareTunnelEnabled())) {
-            options.push('--mount', `type=bind,source=${this.ngrokConfigPath()},target=${PATH_DOCKER_NGROK_CONFIG}`);
-        }
         return options;
     }
-    getNgrokConfigEnvironment() {
-        return [{ key: 'NGROK_CONFIG', value: PATH_DOCKER_NGROK_CONFIG }];
-    }
     async getCommonOptions() {
         return ['--rm', `--name`, exports.CONTAINER_NAME, '--platform', 'linux/amd64'];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli",
-  "version": "10.4.1",
+  "version": "10.5.0-next.11",
   "description": "A command line interface for managing Atlassian-hosted apps",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,13 +18,13 @@
     "postinstall": "node -e \"fs.existsSync('./out/bin/postinstall.js') && require('./out/bin/postinstall.js')\""
   },
   "dependencies": {
-    "@forge/bundler": "4.17.5",
-    "@forge/cli-shared": "5.3.2",
+    "@forge/bundler": "4.18.0-next.10",
+    "@forge/cli-shared": "5.4.0-next.9",
     "@forge/egress": "1.2.13",
-    "@forge/lint": "5.3.1",
-    "@forge/manifest": "7.5.3",
+    "@forge/lint": "5.3.2-next.9",
+    "@forge/manifest": "7.6.0-next.6",
     "@forge/runtime": "5.10.1",
-    "@forge/tunnel": "5.3.4",
+    "@forge/tunnel": "5.4.0-next.11",
     "@forge/util": "1.4.4",
     "@sentry/node": "7.100.1",
     "ajv": "^8.12.0",