diff --git a/config/repo/eureka-server.yml b/config/repo/eureka-server.yml index f344b4db..4bdeb51b 100644 --- a/config/repo/eureka-server.yml +++ b/config/repo/eureka-server.yml @@ -14,8 +14,8 @@ eureka: hostname: localhost #eurekaInstance Name client: # for development set it to false in order to not register itself to its peer. - Register-with-eureka: false #Do you register yourself with Eureka Server? - Fetch-registry: false #Do not get registration information through eureka + register-with-eureka: false #Do you register yourself with Eureka Server? + fetch-registry: false #Do not get registration information through eureka service-url.defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ server: # Make the number of renewals required to prevent an emergency tiny (probably 0) diff --git a/store-cloud-infra/eureka-server/src/test/java/com/siriusxi/cloud/infra/eds/EurekaDiscoveryServerTests.java b/store-cloud-infra/eureka-server/src/test/java/com/siriusxi/cloud/infra/eds/EurekaDiscoveryServerTests.java index cb239153..58fc1993 100644 --- a/store-cloud-infra/eureka-server/src/test/java/com/siriusxi/cloud/infra/eds/EurekaDiscoveryServerTests.java +++ b/store-cloud-infra/eureka-server/src/test/java/com/siriusxi/cloud/infra/eds/EurekaDiscoveryServerTests.java @@ -13,13 +13,19 @@ @SpringBootTest( webEnvironment = RANDOM_PORT, - properties = {"spring.cloud.config.enabled: false"}) + properties = { + "spring.cloud.config.enabled: false", + "eureka.client.register-with-eureka: false", + "eureka.client.fetch-registry: false", + "app.eureka.user: mt", + "app.eureka.pass: p" + }) class EurekaDiscoveryServerTests { - @Value("${app.eureka.username}") + @Value("${app.eureka.user}") private String username; - @Value("${app.eureka.password}") + @Value("${app.eureka.pass}") private String password; private TestRestTemplate testRestTemplate; @@ -32,20 +38,19 @@ public void setTestRestTemplate(TestRestTemplate testRestTemplate) { @Test public void catalogLoads() { - String expectedResponseBody = - "{\"applications\":{\"versions__delta\":\"1\"," + - "\"apps__hashcode\":\"\",\"application\":[]}}"; - ResponseEntity entity = testRestTemplate.getForEntity("/eureka/apps", String.class); - assertEquals(HttpStatus.OK, entity.getStatusCode()); - assertEquals(expectedResponseBody, entity.getBody()); - } - - @Test - public void healthy() { - String expectedResponseBody = "{\"status\":\"UP\"}"; - ResponseEntity entity = testRestTemplate.getForEntity("/actuator/health", String.class); - assertEquals(HttpStatus.OK, entity.getStatusCode()); - assertEquals(expectedResponseBody, entity.getBody()); - } + String expectedResponseBody = + "{\"applications\":{\"versions__delta\":\"1\"," + + "\"apps__hashcode\":\"\",\"application\":[]}}"; + ResponseEntity entity = testRestTemplate.getForEntity("/eureka/apps", String.class); + assertEquals(HttpStatus.OK, entity.getStatusCode()); + assertEquals(expectedResponseBody, entity.getBody()); + } + @Test + public void healthy() { + String expectedResponseBody = "{\"status\":\"UP\"}"; + ResponseEntity entity = testRestTemplate.getForEntity("/actuator/health", String.class); + assertEquals(HttpStatus.OK, entity.getStatusCode()); + assertEquals(expectedResponseBody, entity.getBody()); + } } diff --git a/store-cloud-infra/eureka-server/src/test/resources/application.yaml b/store-cloud-infra/eureka-server/src/test/resources/application.yaml deleted file mode 100644 index a49d4d10..00000000 --- a/store-cloud-infra/eureka-server/src/test/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# Define Security -app: - eureka: - username: mt - password: p