From 719ad87dca7cad0f3fa4b810cb562ec9acea3460 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Mon, 10 Dec 2018 17:48:45 -0600 Subject: [PATCH] Set spring.application.name in acceptance tests. --- .../CloudFoundryAcceptanceTest.java | 1 + .../fixtures/cf/CloudFoundryService.java | 1 + .../src/main/resources/application-local.yml | 2 ++ .../src/test/resources/application-appbroker-cf.yml | 2 ++ .../src/test/resources/application.yml | 3 --- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java index 83eaeb7..8547e5c 100644 --- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java +++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/CloudFoundryAcceptanceTest.java @@ -126,6 +126,7 @@ class CloudFoundryAcceptanceTest { void deployServiceBrokerForService(String serviceName) { String[] properties = new String[] { + "spring.application.name=backing-broker", "spring.cloud.openservicebroker.catalog.services[0].id=" + serviceName, "spring.cloud.openservicebroker.catalog.services[0].name=" + serviceName, "spring.cloud.openservicebroker.catalog.services[0].plans[0].id=" + serviceName, diff --git a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryService.java b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryService.java index b3fa2c7..670d5ce 100644 --- a/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryService.java +++ b/spring-cloud-app-broker-acceptance-tests/src/test/java/org.springframework.cloud.appbroker.acceptance/fixtures/cf/CloudFoundryService.java @@ -107,6 +107,7 @@ public class CloudFoundryService { return cloudFoundryOperations.applications() .pushManifest(PushApplicationManifestRequest.builder() .manifest(ApplicationManifest.builder() + .environmentVariable("spring.application.name", "app-broker-acceptance") .putAllEnvironmentVariables(appBrokerDeployerEnvironmentVariables()) .putAllEnvironmentVariables(appBrokerCatalogEnvironmentVariables()) .putAllEnvironmentVariables(backingAppEnvironmentVariables(backingAppProperties)) diff --git a/spring-cloud-app-broker-sample/src/main/resources/application-local.yml b/spring-cloud-app-broker-sample/src/main/resources/application-local.yml index 78db3f1..48af499 100644 --- a/spring-cloud-app-broker-sample/src/main/resources/application-local.yml +++ b/spring-cloud-app-broker-sample/src/main/resources/application-local.yml @@ -1,4 +1,6 @@ spring: + application: + name: app-broker-sample cloud: openservicebroker: catalog: diff --git a/spring-cloud-app-broker-sample/src/test/resources/application-appbroker-cf.yml b/spring-cloud-app-broker-sample/src/test/resources/application-appbroker-cf.yml index 48de31c..f274b1a 100644 --- a/spring-cloud-app-broker-sample/src/test/resources/application-appbroker-cf.yml +++ b/spring-cloud-app-broker-sample/src/test/resources/application-appbroker-cf.yml @@ -1,4 +1,6 @@ spring: + application: + name: app-broker-test cloud: appbroker: deployer: diff --git a/spring-cloud-app-broker-sample/src/test/resources/application.yml b/spring-cloud-app-broker-sample/src/test/resources/application.yml index c7a231e..3474d8a 100644 --- a/spring-cloud-app-broker-sample/src/test/resources/application.yml +++ b/spring-cloud-app-broker-sample/src/test/resources/application.yml @@ -1,6 +1,3 @@ -spring: - application: - name: foo-app logging: level: cloudfoundry-client: DEBUG \ No newline at end of file