Updated docker compose/Dockerfile, fixed Integration Test to wait for response from user service

Author: erinyoo

Dockerfile

@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java:8
 MAINTAINER Justin Phillips "[email protected]"
 VOLUME /tmp
-ADD build/libs/microservices--backing-service--edge-service-0.0.1.jar app.jar
+ADD build/libs/edge-service-0.0.1.jar app.jar
 RUN bash -c 'touch /app.jar'
 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]

docker-compose.yml

@@ -31,9 +31,9 @@ services:
 #    ports:
 #      - 8888:8888
 
-  mysql-server:
+  mysqlserver:
     image: mysql:5.7
-    container_name: mysql-server
+    container_name: mysqlserver
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -50,10 +50,10 @@ services:
     image: aista/user-service
     depends_on:
       - discovery-service
-      - mysql-server
+      - mysqlserver
     container_name: userservice
     ports:
-      - '8091:8091'
+      - '8080'
 
   mongo:
     image: 'mongo:3.4.1'

src/test/java/aist/edge/edgeservice/EdgeServiceIntegrationTests.java

@@ -33,6 +33,7 @@ public class EdgeServiceIntegrationTests {
     private static String tripQueryURL;
     private static String gmapsAdapterURL;
     private static String calculationServiceURL;
+    private static String userServiceURL;
 
     //Wait for all services to have ports open
     @ClassRule
@@ -44,8 +45,6 @@ public class EdgeServiceIntegrationTests {
             .waitingForService("gmapsadapter", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("calculationservice", HealthChecks.toHaveAllPortsOpen())
             .waitingForService("discovery-service", HealthChecks.toHaveAllPortsOpen())
-            .waitingForService("userservice", HealthChecks.toRespondOverHttp(8091,
-                (port) -> port.inFormat("http://localhost:8091")))
             .waitingForService("discovery-service", HealthChecks.toRespondOverHttp(8761,
                 (port) -> port.inFormat("http://localhost:8761")))
             .build();
@@ -77,6 +76,16 @@ public static void initialize() {
         calculationServiceURL = String.format("http://%s:%s", calculationService.getIp(),
                 calculationService.getExternalPort());
         LOG.info("Calculation Service endpoint found: " + calculationServiceURL);
+
+        DockerPort userService = docker.containers().container("userservice")
+                .port(8080);
+        userServiceURL = String.format("http://%s:%s", userService.getIp(),
+                userService.getExternalPort());
+        while (!docker.containers().container("userservice").portIsListeningOnHttp(8080,
+            (port) -> port.inFormat(userServiceURL)).succeeded()) {
+            LOG.info("Waiting for user service to respond over HTTP");
+        }
+        LOG.info("User Service endpoint found: " + userServiceURL);
     }
 
     private TestRestTemplate restTemplate = new TestRestTemplate();
@@ -85,6 +94,8 @@ public static void initialize() {
 
     @Before
     public void setUp() throws JSONException {
+
+
         String plainCreds = "eagleeye:thisissecret";
         byte[] plainCredsBytes = plainCreds.getBytes();
         byte[] base64CredsBytes = Base64.getEncoder().encode(plainCredsBytes);
@@ -101,7 +112,7 @@ public void setUp() throws JSONException {
         HttpEntity<String> request = new HttpEntity<>(body, headers);
 
         //when:
-        ResponseEntity<String> response = restTemplate.postForEntity("http://localhost:8091/auth/oauth/token",
+        ResponseEntity<String> response = restTemplate.postForEntity(userServiceURL + "/auth/oauth/token",
                 request, String.class, parameters);
 
         //then:

src/test/resources/docker-compose.yml

@@ -23,8 +23,9 @@ services:
 #    ports:
 #      - 8888:8888
 
-  mysql-server:
+  mysqlserver:
     image: mysql:5.7
+    container_name: mysqlserver
     volumes:
       - mysql-data:/var/lib/mysql:rw
     restart: always
@@ -39,11 +40,12 @@ services:
 
   userservice:
     image: aista/user-service
+    container_name: userservice
     depends_on:
       - discovery-service
-      - mysql-server
+      - mysqlserver
     ports:
-      - '8091:8091'
+      - '8080'
 
   mongo:
     image: 'mongo:3.4.1'