Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-implement V3 Service Bindings #1158

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Re-implement V3 Service Bindings #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected final Mono<String> delete(Object requestPayload, Function<UriComponent
.send(requestPayload)
.response()
.get())
.map(AbstractClientV3Operations::extractJobId);
.flatMap(response -> Mono.justOrEmpty(extractJobId(response)));
}

protected final <T> Mono<HttpClientResponseWithParsedBody<T>> deleteWithResponse(Object requestPayload, Class<T> responseType,
Expand Down Expand Up @@ -141,7 +141,7 @@ protected <T> Mono<T> post(Object requestPayload, Class<T> responseType, Functio
}

protected final <T> Mono<HttpClientResponseWithParsedBody<T>> postWithResponse(Object requestPayload, Class<T> responseType,
Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
return createOperator()
.flatMap(operator -> operator.post()
.uri(queryTransformer(requestPayload).andThen(uriTransformer))
Expand All @@ -157,7 +157,7 @@ protected final Mono<String> post(Object requestPayload, Function<UriComponentsB
.send(requestPayload)
.response()
.get())
.map(AbstractClientV3Operations::extractJobId);
.flatMap(response -> Mono.justOrEmpty(extractJobId(response)));
}

protected final <T> Mono<T> put(Object requestPayload, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
Expand Down
40 changes: 35 additions & 5 deletions ...ain/java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,25 @@
import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingResponse;
import org.cloudfoundry.client.v3.servicebindings.DeleteServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingDetailsRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingDetailsResponse;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingParametersRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingParametersResponse;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingResponse;
import org.cloudfoundry.client.v3.servicebindings.ListServiceBindingsRequest;
import org.cloudfoundry.client.v3.servicebindings.ListServiceBindingsResponse;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingResource;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingsV3;
import org.cloudfoundry.client.v3.servicebindings.UpdateServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.UpdateServiceBindingResponse;
import org.cloudfoundry.reactor.ConnectionContext;
import org.cloudfoundry.reactor.TokenProvider;
import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;
import reactor.core.publisher.Mono;

import java.util.Map;
import java.util.Optional;

/**
* The Reactor-based implementation of {@link ServiceBindingsV3}
Expand All @@ -50,25 +58,47 @@ public ReactorServiceBindingsV3(ConnectionContext connectionContext, Mono<String

@Override
public Mono<CreateServiceBindingResponse> create(CreateServiceBindingRequest request) {
return post(request, CreateServiceBindingResponse.class, builder -> builder.pathSegment("service_bindings"))
return postWithResponse(request, ServiceBindingResource.class, builder -> builder.pathSegment("service_credential_bindings"))
.map(responseTuple -> CreateServiceBindingResponse.builder()
.serviceBinding(responseTuple.getBody())
.jobId(Optional.ofNullable(extractJobId(responseTuple.getResponse())))
.build())
.checkpoint();
}

@Override
public Mono<Void> delete(DeleteServiceBindingRequest request) {
return delete(request, Void.class, builder -> builder.pathSegment("service_bindings", request.getServiceBindingId()))
public Mono<String> delete(DeleteServiceBindingRequest request) {
return delete(request, builder -> builder.pathSegment("service_credential_bindings", request.getServiceBindingId()))
.checkpoint();
}

@Override
public Mono<GetServiceBindingResponse> get(GetServiceBindingRequest request) {
return get(request, GetServiceBindingResponse.class, builder -> builder.pathSegment("service_bindings", request.getServiceBindingId()))
return get(request, GetServiceBindingResponse.class, builder -> builder.pathSegment("service_credential_bindings", request.getServiceBindingId()))
.checkpoint();
}

@Override
public Mono<GetServiceBindingDetailsResponse> getDetails(GetServiceBindingDetailsRequest request) {
return get(request, GetServiceBindingDetailsResponse.class, builder -> builder.pathSegment("service_credential_bindings", request.getServiceBindingId(), "details"))
.checkpoint();
}

@Override
public Mono<GetServiceBindingParametersResponse> getParameters(GetServiceBindingParametersRequest request) {
return get(request, GetServiceBindingParametersResponse.class, builder -> builder.pathSegment("service_credential_bindings", request.getServiceBindingId(), "parameters"))
.checkpoint();
}

@Override
public Mono<ListServiceBindingsResponse> list(ListServiceBindingsRequest request) {
return get(request, ListServiceBindingsResponse.class, builder -> builder.pathSegment("service_bindings"))
return get(request, ListServiceBindingsResponse.class, builder -> builder.pathSegment("service_credential_bindings"))
.checkpoint();
}

@Override
public Mono<UpdateServiceBindingResponse> update(UpdateServiceBindingRequest request) {
return patch(request, UpdateServiceBindingResponse.class, builder -> builder.pathSegment("service_credential_bindings", request.getServiceBindingId()))
.checkpoint();
}

Expand Down
109 changes: 59 additions & 50 deletions ...java/org/cloudfoundry/reactor/client/v3/servicebindings/ReactorServiceBindingsV3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@
import org.cloudfoundry.client.v3.Link;
import org.cloudfoundry.client.v3.Pagination;
import org.cloudfoundry.client.v3.Relationship;
import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingData;
import org.cloudfoundry.client.v3.ToOneRelationship;
import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.CreateServiceBindingResponse;
import org.cloudfoundry.client.v3.servicebindings.DeleteServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingRequest;
import org.cloudfoundry.client.v3.servicebindings.GetServiceBindingResponse;
import org.cloudfoundry.client.v3.servicebindings.ListServiceBindingsRequest;
import org.cloudfoundry.client.v3.servicebindings.ListServiceBindingsResponse;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingData;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingRelationships;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingResource;
import org.cloudfoundry.client.v3.servicebindings.ServiceBindingType;
Expand All @@ -44,7 +43,7 @@
import static io.netty.handler.codec.http.HttpMethod.DELETE;
import static io.netty.handler.codec.http.HttpMethod.GET;
import static io.netty.handler.codec.http.HttpMethod.POST;
import static io.netty.handler.codec.http.HttpResponseStatus.CREATED;
import static io.netty.handler.codec.http.HttpResponseStatus.ACCEPTED;
import static io.netty.handler.codec.http.HttpResponseStatus.NO_CONTENT;
import static io.netty.handler.codec.http.HttpResponseStatus.OK;

Expand All @@ -56,48 +55,34 @@ public final class ReactorServiceBindingsV3Test extends AbstractClientApiTest {
public void create() {
mockRequest(InteractionContext.builder()
.request(TestRequest.builder()
.method(POST).path("/service_bindings")
.method(POST).path("/service_credential_bindings")
.payload("fixtures/client/v3/servicebindings/POST_request.json")
.build())
.response(TestResponse.builder()
.status(CREATED)
.payload("fixtures/client/v3/servicebindings/POST_response.json")
.status(ACCEPTED)
.header("Location", "https://api.example.org/v3/jobs/af5c57f6-8769-41fa-a499-2c84ed896788")
.build())
.build());

this.serviceBindings
.create(CreateServiceBindingRequest.builder()
.data(CreateServiceBindingData.builder()
.parameter("some_object_id", "for_the_service_broker")
.build())
.relationships(ServiceBindingRelationships.builder()
.application(Relationship.builder()
.id("74f7c078-0934-470f-9883-4fddss5b8f13")
.application(ToOneRelationship.builder()
.data(Relationship.builder()
.id("74f7c078-0934-470f-9883-4fddss5b8f13")
.build())
.build())
.serviceInstance(Relationship.builder()
.id("8bfe4c1b-9e18-45b1-83be-124163f31f9e")
.serviceInstance(ToOneRelationship.builder()
.data(Relationship.builder()
.id("8bfe4c1b-9e18-45b1-83be-124163f31f9e")
.build())
.build())
.build())
.type(ServiceBindingType.APPLICATION)
.build())
.as(StepVerifier::create)
.expectNext(CreateServiceBindingResponse.builder()
.id("dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.type("app")
.data(ServiceBindingData.builder()
.credential("super-secret", "password")
.syslogDrainUrl("syslog://drain.url.com")
.build())
.createdAt("2015-11-13T17:02:56Z")
.link("self", Link.builder()
.href("/v3/service_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.build())
.link("service_instance", Link.builder()
.href("/v3/service_instances/8bfe4c1b-9e18-45b1-83be-124163f31f9e")
.build())
.link("app", Link.builder()
.href("/v3/apps/74f7c078-0934-470f-9883-4fddss5b8f13")
.build())
.jobId("af5c57f6-8769-41fa-a499-2c84ed896788")
.build())
.expectComplete()
.verify(Duration.ofSeconds(5));
Expand All @@ -107,7 +92,7 @@ public void create() {
public void delete() {
mockRequest(InteractionContext.builder()
.request(TestRequest.builder()
.method(DELETE).path("/service_bindings/test-service-binding-id")
.method(DELETE).path("/service_credential_bindings/test-service-binding-id")
.build())
.response(TestResponse.builder()
.status(NO_CONTENT)
Expand All @@ -127,7 +112,7 @@ public void delete() {
public void get() {
mockRequest(InteractionContext.builder()
.request(TestRequest.builder()
.method(GET).path("/service_bindings/test-service-binding-id")
.method(GET).path("/service_credential_bindings/test-service-binding-id")
.build())
.response(TestResponse.builder()
.status(OK)
Expand All @@ -142,14 +127,22 @@ public void get() {
.as(StepVerifier::create)
.expectNext(GetServiceBindingResponse.builder()
.id("dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.type("app")
.data(ServiceBindingData.builder()
.credential("super-secret", "password")
.syslogDrainUrl("syslog://drain.url.com")
.type(ServiceBindingType.APPLICATION)
.relationships(ServiceBindingRelationships.builder()
.application(ToOneRelationship.builder()
.data(Relationship.builder()
.id("74f7c078-0934-470f-9883-4fddss5b8f13")
.build())
.build())
.serviceInstance(ToOneRelationship.builder()
.data(Relationship.builder()
.id("8bfe4c1b-9e18-45b1-83be-124163f31f9e")
.build())
.build())
.build())
.createdAt("2015-11-13T17:02:56Z")
.link("self", Link.builder()
.href("/v3/service_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.href("/v3/service_credential_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.build())
.link("service_instance", Link.builder()
.href("/v3/service_instances/8bfe4c1b-9e18-45b1-83be-124163f31f9e")
Expand All @@ -166,7 +159,7 @@ public void get() {
public void list() {
mockRequest(InteractionContext.builder()
.request(TestRequest.builder()
.method(GET).path("/service_bindings?app_guids=test-application-id&order_by=%2Bcreated_at&page=1")
.method(GET).path("/service_credential_bindings?app_guids=test-application-id&order_by=%2Bcreated_at&page=1")
.build())
.response(TestResponse.builder()
.status(OK)
Expand All @@ -185,25 +178,33 @@ public void list() {
.pagination(Pagination.builder()
.totalResults(3)
.first(Link.builder()
.href("/v3/service_bindings?page=1&per_page=2")
.href("/v3/service_credential_bindings?page=1&per_page=2")
.build())
.last(Link.builder()
.href("/v3/service_bindings?page=2&per_page=2")
.href("/v3/service_credential_bindings?page=2&per_page=2")
.build())
.next(Link.builder()
.href("/v3/service_bindings?page=2&per_page=2")
.href("/v3/service_credential_bindings?page=2&per_page=2")
.build())
.build())
.resource(ServiceBindingResource.builder()
.id("dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.type("app")
.data(ServiceBindingData.builder()
.credential("super-secret", "password")
.syslogDrainUrl("syslog://drain.url.com")
.type(ServiceBindingType.APPLICATION)
.relationships(ServiceBindingRelationships.builder()
.application(ToOneRelationship.builder()
.data(Relationship.builder()
.id("74f7c078-0934-470f-9883-4fddss5b8f13")
.build())
.build())
.serviceInstance(ToOneRelationship.builder()
.data(Relationship.builder()
.id("8bfe4c1b-9e18-45b1-83be-124163f31f9e")
.build())
.build())
.build())
.createdAt("2015-11-13T17:02:56Z")
.link("self", Link.builder()
.href("/v3/service_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.href("/v3/service_credential_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3")
.build())
.link("service_instance", Link.builder()
.href("/v3/service_instances/8bfe4c1b-9e18-45b1-83be-124163f31f9e")
Expand All @@ -214,14 +215,22 @@ public void list() {
.build())
.resource(ServiceBindingResource.builder()
.id("7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62")
.type("app")
.data(ServiceBindingData.builder()
.credential("super-secret", "password")
.syslogDrainUrl("syslog://drain.url.com")
.type(ServiceBindingType.APPLICATION)
.relationships(ServiceBindingRelationships.builder()
.application(ToOneRelationship.builder()
.data(Relationship.builder()
.id("74f7c078-0934-470f-9883-4fddss5b8f13")
.build())
.build())
.serviceInstance(ToOneRelationship.builder()
.data(Relationship.builder()
.id("8bf356j3-9e18-45b1-3333-124163f31f9e")
.build())
.build())
.build())
.createdAt("2015-11-13T17:02:56Z")
.link("self", Link.builder()
.href("/v3/service_bindings/7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62")
.href("/v3/service_credential_bindings/7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62")
.build())
.link("service_instance", Link.builder()
.href("/v3/service_instances/8bf356j3-9e18-45b1-3333-124163f31f9e")
Expand Down
38 changes: 25 additions & 13 deletions ...ry-client-reactor/src/test/resources/fixtures/client/v3/servicebindings/GET_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,37 @@
"pagination": {
"total_results": 3,
"first": {
"href": "/v3/service_bindings?page=1&per_page=2"
"href": "/v3/service_credential_bindings?page=1&per_page=2"
},
"last": {
"href": "/v3/service_bindings?page=2&per_page=2"
"href": "/v3/service_credential_bindings?page=2&per_page=2"
},
"next": {
"href": "/v3/service_bindings?page=2&per_page=2"
"href": "/v3/service_credential_bindings?page=2&per_page=2"
},
"previous": null
},
"resources": [
{
"guid": "dde5ad2a-d8f4-44dc-a56f-0452d744f1c3",
"type": "app",
"data": {
"credentials": {
"super-secret": "password"
"relationships": {
"app": {
"data": {
"guid": "74f7c078-0934-470f-9883-4fddss5b8f13"
}
},
"syslog_drain_url": "syslog://drain.url.com"
"service_instance": {
"data": {
"guid": "8bfe4c1b-9e18-45b1-83be-124163f31f9e"
}
}
},
"created_at": "2015-11-13T17:02:56Z",
"updated_at": null,
"links": {
"self": {
"href": "/v3/service_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3"
"href": "/v3/service_credential_bindings/dde5ad2a-d8f4-44dc-a56f-0452d744f1c3"
},
"service_instance": {
"href": "/v3/service_instances/8bfe4c1b-9e18-45b1-83be-124163f31f9e"
Expand All @@ -39,17 +45,23 @@
{
"guid": "7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62",
"type": "app",
"data": {
"credentials": {
"super-secret": "password"
"relationships": {
"app": {
"data": {
"guid": "74f7c078-0934-470f-9883-4fddss5b8f13"
}
},
"syslog_drain_url": "syslog://drain.url.com"
"service_instance": {
"data": {
"guid": "8bf356j3-9e18-45b1-3333-124163f31f9e"
}
}
},
"created_at": "2015-11-13T17:02:56Z",
"updated_at": null,
"links": {
"self": {
"href": "/v3/service_bindings/7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62"
"href": "/v3/service_credential_bindings/7aa37bad-6ccb-4ef9-ba48-9ce3a91b2b62"
},
"service_instance": {
"href": "/v3/service_instances/8bf356j3-9e18-45b1-3333-124163f31f9e"
Expand Down
Loading