match port range output from docker ps (#695)

* match port range output from docker ps

* fix typos, add test

* lint

* Add changelog

Co-authored-by: Fabian Windheuser <fwindheuser@palantir.com>

Author: hughsimpson

changelog/@unreleased/pr-695.v2.yml

@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Map port range mappings from docker ps output.
+  links:
+  - https://github.com/palantir/docker-compose-rule/pull/695

docker-compose-rule-core/src/main/java/com/palantir/docker/compose/connection/Ports.java

@@ -28,9 +28,15 @@
 public final class Ports {
 
     private static final Pattern PORT_PATTERN = Pattern.compile("((\\d+).(\\d+).(\\d+).(\\d+)):(\\d+)->(\\d+)/tcp");
+    private static final Pattern PORT_RANGE_PATTERN =
+            Pattern.compile("((\\d+).(\\d+).(\\d+).(\\d+)):(\\d+)-(\\d+)->(\\d+)-(\\d+)/tcp");
     private static final int IP_ADDRESS = 1;
     private static final int EXTERNAL_PORT = 6;
     private static final int INTERNAL_PORT = 7;
+    private static final int EXTERNAL_PORT_RANGE_START = 6;
+    private static final int EXTERNAL_PORT_RANGE_END = 7;
+    private static final int INTERNAL_PORT_RANGE_START = 8;
+    private static final int INTERNAL_PORT_RANGE_END = 9;
 
     private static final String NO_IP_ADDRESS = "0.0.0.0";
 
@@ -60,6 +66,24 @@ public static Ports parseFromDockerComposePs(String psOutput, String dockerMachi
 
             ports.add(new DockerPort(ip, externalPort, internalPort));
         }
+        Matcher rangeMatcher = PORT_RANGE_PATTERN.matcher(psOutput);
+        while (rangeMatcher.find()) {
+            String matchedIpAddress = rangeMatcher.group(IP_ADDRESS);
+            String ip = matchedIpAddress.equals(NO_IP_ADDRESS) ? dockerMachineIp : matchedIpAddress;
+            int externalPortRangeStart = Integer.parseInt(rangeMatcher.group(EXTERNAL_PORT_RANGE_START));
+            int externalPortRangeEnd = Integer.parseInt(rangeMatcher.group(EXTERNAL_PORT_RANGE_END));
+            int internalPortRangeStart = Integer.parseInt(rangeMatcher.group(INTERNAL_PORT_RANGE_START));
+            int internalPortRangeEnd = Integer.parseInt(rangeMatcher.group(INTERNAL_PORT_RANGE_END));
+            int len = externalPortRangeEnd - externalPortRangeStart;
+            // Sanity check
+            if (len == internalPortRangeEnd - internalPortRangeStart) {
+                for (int i = 0; i <= len; i++) {
+                    int externalPort = externalPortRangeStart + i;
+                    int internalPort = internalPortRangeStart + i;
+                    ports.add(new DockerPort(ip, externalPort, internalPort));
+                }
+            }
+        }
         return new Ports(ports);
     }
 

docker-compose-rule-core/src/test/java/com/palantir/docker/compose/connection/PortsShould.java

@@ -64,6 +64,15 @@ public void result_in_two_ports_when_there_are_two_tcp_port_mappings() {
         assertThat(ports, is(expected));
     }
 
+    @Test
+    public void result_in_two_ports_when_there_are_two_tcp_ports_in_a_range_mapping() {
+        String psOutput = "0.0.0.0:4432-4433->5432-5433/tcp";
+        Ports ports = Ports.parseFromDockerComposePs(psOutput, LOCALHOST_IP);
+        Ports expected = new Ports(
+                newArrayList(new DockerPort(LOCALHOST_IP, 4432, 5432), new DockerPort(LOCALHOST_IP, 4433, 5433)));
+        assertThat(ports, is(expected));
+    }
+
     @Test
     public void result_in_no_ports_when_there_is_a_non_mapped_exposed_port() {
         String psOutput = "5432/tcp";