more cleanly separate out getting ports from converting them into flags

Signed-off-by: Anton Gilgur <[email protected]>
devcontainers · Jul 16, 2024 · a8b9491 · a8b9491
1 parent 5356a4d
commit a8b9491
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/spec-node/ports.ts b/src/spec-node/ports.ts
@@ -6,7 +6,6 @@ function normalizePorts(ports: number | string | (number | string)[] | undefined
 	return ports.map((port) => typeof port === 'number' ? `127.0.0.1:${port}:${port}`: port);
 }
 
-export function getStaticPortsArgs(config: DevContainerFromDockerfileConfig | DevContainerFromImageConfig): string[] {
-	const staticPorts = normalizePorts(config.forwardPorts).concat(normalizePorts(config.appPort));
-	return staticPorts.flatMap((port) => ['-p', port]);
+export function getStaticPorts(config: DevContainerFromDockerfileConfig | DevContainerFromImageConfig): string[] {
+	return normalizePorts(config.forwardPorts).concat(normalizePorts(config.appPort));
 }
diff --git a/src/spec-node/singleContainer.ts b/src/spec-node/singleContainer.ts
@@ -13,7 +13,7 @@ import { LogLevel, Log, makeLog } from '../spec-utils/log';
 import { extendImage, getExtendImageBuildInfo, updateRemoteUserUID } from './containerFeatures';
 import { getDevcontainerMetadata, getImageBuildInfoFromDockerfile, getImageMetadataFromContainer, ImageMetadataEntry, lifecycleCommandOriginMapFromMetadata, mergeConfiguration, MergedDevContainerConfig } from './imageMetadata';
 import { ensureDockerfileHasFinalStageName, generateMountCommand } from './dockerfileUtils';
-import { getStaticPortsArgs } from './ports';
+import { getStaticPorts } from './ports';
 
 export const hostFolderLabel = 'devcontainer.local_folder'; // used to label containers created from a workspace/folder
 export const configFileLabel = 'devcontainer.config_file';
@@ -349,7 +349,8 @@ export async function spawnDevContainer(params: DockerResolverParameters, config
 	const { common } = params;
 	common.progress(ResolverProgress.StartingContainer);
 
-	const exposed = getStaticPortsArgs(config);
+	const exposedPorts = getStaticPorts(config);
+	const exposed = exposedPorts.flatMap((port) => ['-p', port]);
 
 	const cwdMount = workspaceMount ? ['--mount', workspaceMount] : [];