Add missing case to container name resolution

Author: cristianrgreco

src/docker-compose-container-name-resolver.test.ts

@@ -0,0 +1,30 @@
+import { resolveDockerComposeContainerName } from "./docker-compose-container-name-resolver";
+
+describe("resolveDockerComposeContainerName", () => {
+  it("should remove docker-compose label", () => {
+    const name = "docker-compose_container_1";
+    const expected = "container_1";
+
+    expect(resolveDockerComposeContainerName(name)).toBe(expected);
+  });
+
+  it("should remove prefix", () => {
+    const name = "123_docker-compose_container_1";
+    const expected = "container_1";
+
+    expect(resolveDockerComposeContainerName(name)).toBe(expected);
+  });
+
+  it("should remove suffix", () => {
+    const name = "docker-compose_container_1_123";
+    const expected = "container_1";
+
+    expect(resolveDockerComposeContainerName(name)).toBe(expected);
+  });
+
+  it("should throw error if unable to resolve container name", () => {
+    expect(() => resolveDockerComposeContainerName("unknown")).toThrowError(
+      `Unable to resolve container name for: "unknown"`
+    );
+  });
+});

src/docker-compose-container-name-resolver.ts

@@ -0,0 +1,7 @@
+export const resolveDockerComposeContainerName = (containerName: string): string => {
+  const matches = containerName.match(/^.*docker-compose_(.+?_[0-9]+)/);
+  if (!matches) {
+    throw new Error(`Unable to resolve container name for: "${containerName}"`);
+  }
+  return matches[1];
+};

src/docker-compose-environment.ts

@@ -6,6 +6,7 @@ import { Container } from "./container";
 import { ContainerState } from "./container-state";
 import { DockerClient } from "./docker-client";
 import { DockerodeClientFactory } from "./docker-client-factory";
+import { resolveDockerComposeContainerName } from "./docker-compose-container-name-resolver";
 import { StartedGenericContainer } from "./generic-container";
 import log from "./logger";
 import { HostPortCheck, InternalPortCheck } from "./port-check";
@@ -46,7 +47,7 @@ export class DockerComposeEnvironment {
     const startedGenericContainers = (await Promise.all(
       startedContainers.map(async startedContainer => {
         const container = await this.dockerClient.getContainer(startedContainer.Id);
-        const containerName = this.getContainerName(startedContainer);
+        const containerName = resolveDockerComposeContainerName(startedContainer.Names[0]);
 
         (await container.logs())
           .on("data", data => log.trace(`${containerName}: ${data}`))
@@ -99,15 +100,6 @@ export class DockerComposeEnvironment {
     return boundPorts;
   }
 
-  private getContainerName(container: Dockerode.ContainerInfo): string {
-    const containerName = container.Names[0];
-    const matches = containerName.match(/^.*docker-compose_(.*$)/);
-    if (!matches) {
-      throw new Error(`Unable to compute container name for: "${containerName}"`);
-    }
-    return matches[1];
-  }
-
   private async waitForContainer(
     container: Container,
     containerName: string,