diff --git a/build.gradle b/build.gradle index 57c6da7..656155e 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { cfJavaClientVersion = "5.9.0.RELEASE" commonsTextVersion = "1.10.0" immutablesVersion = "2.9.3" - openServiceBrokerVersion = "4.0.0-M1" + openServiceBrokerVersion = "4.0.0-SNAPSHOT" springCredhubVersion = "3.0.0" springFrameworkVersion = "6.0.0" wiremockVersion = "2.35.0" diff --git a/spring-cloud-app-broker-security-credhub/src/main/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflow.java b/spring-cloud-app-broker-security-credhub/src/main/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflow.java index 6d9cba9..2123435 100644 --- a/spring-cloud-app-broker-security-credhub/src/main/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflow.java +++ b/spring-cloud-app-broker-security-credhub/src/main/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflow.java @@ -118,7 +118,7 @@ public class CredHubPersistingCreateServiceInstanceAppBindingWorkflow extends Cr CreateServiceInstanceAppBindingResponse response, CredentialName credentialName) { return CreateServiceInstanceAppBindingResponse.builder() .async(response.isAsync()) - .bindingExisted(response.isBindingExisted()) + .bindingStatus(response.getBindingStatus()) .credentials(CREDHUB_REF_KEY, credentialName.getName()) .operation(response.getOperation()) .syslogDrainUrl(response.getSyslogDrainUrl()) diff --git a/spring-cloud-app-broker-security-credhub/src/test/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest.java b/spring-cloud-app-broker-security-credhub/src/test/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest.java index 6b87d28..bddd205 100644 --- a/spring-cloud-app-broker-security-credhub/src/test/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest.java +++ b/spring-cloud-app-broker-security-credhub/src/test/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest.java @@ -30,6 +30,7 @@ import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import org.springframework.cloud.servicebroker.model.binding.BindResource; +import org.springframework.cloud.servicebroker.model.binding.BindingStatus; import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceAppBindingResponse; import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceAppBindingResponse.CreateServiceInstanceAppBindingResponseBuilder; import org.springframework.cloud.servicebroker.model.binding.CreateServiceInstanceBindingRequest; @@ -81,7 +82,7 @@ class CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest { CreateServiceInstanceAppBindingResponseBuilder responseBuilder = CreateServiceInstanceAppBindingResponse .builder() - .bindingExisted(true) + .bindingStatus(BindingStatus.EXISTS_WITH_IDENTICAL_PARAMETERS) .syslogDrainUrl("https://logs.example.local") .volumeMounts(VolumeMount.builder().build()) .volumeMounts(VolumeMount.builder().build()) @@ -95,7 +96,7 @@ class CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest { .assertNext(createServiceInstanceAppBindingResponseBuilder -> { CreateServiceInstanceAppBindingResponse response = createServiceInstanceAppBindingResponseBuilder .build(); - assertThat(response.isBindingExisted()).isEqualTo(true); + assertThat(response.getBindingStatus()).isEqualTo(BindingStatus.EXISTS_WITH_IDENTICAL_PARAMETERS); assertThat(response.getCredentials()).hasSize(0); assertThat(response.getSyslogDrainUrl()).isEqualTo("https://logs.example.local"); assertThat(response.getVolumeMounts()).hasSize(4); @@ -134,7 +135,7 @@ class CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest { CreateServiceInstanceAppBindingResponseBuilder responseBuilder = CreateServiceInstanceAppBindingResponse .builder() - .bindingExisted(true) + .bindingStatus(BindingStatus.EXISTS_WITH_IDENTICAL_PARAMETERS) .credentials("credential1", "value1") .credentials("credential2", 2) .credentials("credential3", true) @@ -163,7 +164,7 @@ class CredHubPersistingCreateServiceInstanceAppBindingWorkflowTest { .assertNext(createServiceInstanceAppBindingResponseBuilder -> { CreateServiceInstanceAppBindingResponse response = createServiceInstanceAppBindingResponseBuilder .build(); - assertThat(response.isBindingExisted()).isEqualTo(true); + assertThat(response.getBindingStatus()).isEqualTo(BindingStatus.EXISTS_WITH_IDENTICAL_PARAMETERS); assertThat(response.getCredentials()).hasSize(1); assertThat(response.getCredentials().get("credhub-ref")).isEqualTo(credentialName.getName()); assertThat(response.getSyslogDrainUrl()).isEqualTo("https://logs.example.local");