don't have to do hostconfig mapping if re-inspecting after re-starting container

Author: cbrevik

packages/testcontainers/src/generic-container/generic-container.ts

@@ -128,13 +128,15 @@ export class GenericContainer implements TestContainer {
   }
 
   private async reuseContainer(client: ContainerRuntimeClient, container: Container) {
-    const inspectResult = await client.container.inspect(container);
-    const mappedInspectResult = mapInspectResult(inspectResult);
-    if (!mappedInspectResult.state.running) {
+    let inspectResult = await client.container.inspect(container);
+    if (!inspectResult.State.Running) {
       log.debug("Reused container is not running, attempting to start it");
       await client.container.start(container);
+      // Refetch the inspect result to get the updated state
+      inspectResult = await client.container.inspect(container);
     }
 
+    const mappedInspectResult = mapInspectResult(inspectResult);
     const boundPorts = BoundPorts.fromInspectResult(client.info.containerRuntime.hostIps, mappedInspectResult).filter(
       this.exposedPorts
     );

packages/testcontainers/src/utils/map-inspect-result.ts

@@ -7,10 +7,7 @@ export function mapInspectResult(inspectResult: ContainerInspectInfo): InspectRe
   return {
     name: inspectResult.Name,
     hostname: inspectResult.Config.Hostname,
-    ports: {
-      ...mapHostConfigPortBindings(inspectResult),
-      ...mapPorts(inspectResult),
-    },
+    ports: mapPorts(inspectResult),
     healthCheckStatus: mapHealthCheckStatus(inspectResult),
     networkSettings: mapNetworkSettings(inspectResult),
     state: {
@@ -23,27 +20,6 @@ export function mapInspectResult(inspectResult: ContainerInspectInfo): InspectRe
   };
 }
 
-type HostConfigPortBindings = {
-  [port: string]: Array<{
-    HostIp: string;
-    HostPort: string;
-  }>;
-};
-
-function mapHostConfigPortBindings(inspectInfo: ContainerInspectInfo): Ports {
-  return Object.entries(inspectInfo.HostConfig.PortBindings as HostConfigPortBindings)
-    .filter(([, hostPorts]) => hostPorts !== null)
-    .map(([containerPort, hostPorts]) => {
-      return {
-        [parseInt(containerPort)]: hostPorts.map((hostPort) => ({
-          hostIp: hostPort.HostIp,
-          hostPort: parseInt(hostPort.HostPort),
-        })),
-      };
-    })
-    .reduce((acc, curr) => ({ ...acc, ...curr }), {});
-}
-
 function mapPorts(inspectInfo: ContainerInspectInfo): Ports {
   return Object.entries(inspectInfo.NetworkSettings.Ports)
     .filter(([, hostPorts]) => hostPorts !== null)