@forge/cli-shared

9.4.1-next.3-experimental-e9e08bb9.4.1-next.4
out/tunnel/docker-compose-lifecycle.js
~out/tunnel/docker-compose-lifecycle.jsModified
+8−10
Index: package/out/tunnel/docker-compose-lifecycle.js
===================================================================
--- package/out/tunnel/docker-compose-lifecycle.js
+++ package/out/tunnel/docker-compose-lifecycle.js
@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processDockerAuthentication = exports.createDockerLifecycleLogFilter = exports.stopDockerComposeStack = exports.determineComposeFlags = exports.getDockerComposeErrorMessage = exports.startDockerComposeStack = exports.deleteDockerComposeFile = exports.generateContainersDockerComposeFile = exports.DockerAuthenticationError = exports.CannotUseBothImageAndBuildContextError = exports.MissingImageOrBuildContextError = exports.UnableToParseDockerComposeFileError = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.InvalidContainerServicePort = exports.STARTUP_TIMER_BUFFER_MS = exports.STARTUP_TIMER_MS = exports.DOCKER_LIFECYCLE_PATTERNS = exports.K8S_AUTH_TOKEN_FILENAME = exports.CONTAINER_SERVICE_ASSETS = exports.PROXY_SIDECAR_VOLUME_DIR = void 0;
+exports.processDockerAuthentication = exports.stopDockerComposeStack = exports.determineComposeFlags = exports.startDockerComposeStack = exports.deleteDockerComposeFile = exports.generateContainersDockerComposeFile = exports.DockerAuthenticationError = exports.CannotUseBothImageAndBuildContextError = exports.MissingImageOrBuildContextError = exports.UnableToParseDockerComposeFileError = exports.DockerUnableToStartError = exports.DockerUnableToPullProxySidecarImage = exports.InvalidContainerServicePort = exports.STARTUP_TIMER_BUFFER_MS = exports.STARTUP_TIMER_MS = exports.K8S_AUTH_TOKEN_FILENAME = exports.CONTAINER_SERVICE_ASSETS = exports.PROXY_SIDECAR_VOLUME_DIR = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
 const yaml = tslib_1.__importStar(require("yaml"));
@@ -27,9 +27,9 @@
     }
 };
 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'];
-exports.DOCKER_LIFECYCLE_PATTERNS = [
+const LIFECYCLE_PATTERNS = [
     /Container .* (Starting|Started|Stopping|Stopped|Creating|Created|Recreated)/,
     /Network .* (Creating|Created|Removing|Removed)/,
     /Volume .* (Creating|Created|Removing|Removed)/,
     /\[[\+\-]\] Running/
@@ -216,9 +216,9 @@
         try {
             await (0, docker_compose_1.pullOne)(PROXY_SIDECAR_SERVICE_NAME, pullOptions);
         }
         catch (ecrRegistryError) {
-            throw new DockerUnableToPullProxySidecarImage(new Error(`Initial pull error: ${(0, exports.getDockerComposeErrorMessage)(portableRegistryError)}. Retry error: ${(0, exports.getDockerComposeErrorMessage)(ecrRegistryError)}`));
+            throw new DockerUnableToPullProxySidecarImage(new Error(`Initial pull error: ${getDockerComposeErrorMessage(portableRegistryError)}. Retry error: ${getDockerComposeErrorMessage(ecrRegistryError)}`));
         }
     }
     await waitForContainersToStart(dockerComposeFilePath, serviceKey, logger);
 };
@@ -229,9 +229,8 @@
         return dockerComposeError.err || dockerComposeError.out || dockerComposeError.message || 'Unknown Error Occurred.';
     }
     return error != null ? String(error) : 'Unknown Error Occurred.';
 };
-exports.getDockerComposeErrorMessage = getDockerComposeErrorMessage;
 const useEcrProxySidecarImage = (dockerComposeFilePath) => {
     const composeConfig = yaml.parse(fs.readFileSync(dockerComposeFilePath, 'utf8'));
     const proxySidecar = composeConfig?.services?.[PROXY_SIDECAR_SERVICE_NAME];
     if (!proxySidecar) {
@@ -342,9 +341,9 @@
             const lines = output.split('\n');
             lines.forEach((line) => {
                 if (!line.trim())
                     return;
-                if (exports.DOCKER_LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
+                if (LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
                     logger.info(line);
                 }
             });
         };
@@ -355,9 +354,9 @@
             composeOptions: [`-p${serviceKey}`],
             callback: logFilter
         }).catch((error) => {
             clearTimeout(startupTimer);
-            reject(new DockerUnableToStartError(new Error((0, exports.getDockerComposeErrorMessage)(error))));
+            reject(new DockerUnableToStartError(new Error(getDockerComposeErrorMessage(error))));
         });
         setTimeout(async () => {
             if (containersStarted)
                 return;
@@ -399,9 +398,9 @@
                 cwd: '.',
                 log: false,
                 config: file,
                 composeOptions: [`-p${serviceKey}`],
-                callback: (0, exports.createDockerLifecycleLogFilter)(logger)
+                callback: createCustomLogFilter(logger)
             });
             await (0, exports.deleteDockerComposeFile)(file);
         }
         catch (err) {
@@ -410,24 +409,23 @@
     }));
     deleteContainerServiceAssetsDir();
 };
 exports.stopDockerComposeStack = stopDockerComposeStack;
-const createDockerLifecycleLogFilter = (logger) => {
+const createCustomLogFilter = (logger) => {
     let buffer = '';
     return (chunk) => {
         buffer += chunk.toString();
         const lines = buffer.split('\n');
         buffer = lines.pop() || '';
         lines.forEach((line) => {
             if (!line.trim())
                 return;
-            if (exports.DOCKER_LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
+            if (LIFECYCLE_PATTERNS.some((pattern) => pattern.test(line))) {
                 logger.info(line);
             }
         });
     };
 };
-exports.createDockerLifecycleLogFilter = createDockerLifecycleLogFilter;
 const processDockerAuthentication = async (childProcess) => {
     await new Promise((resolve, reject) => {
         childProcess.on('close', (code) => {
             if (code === 0) {