Merge branch '730-unbind-route-service-instances'

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/services/DefaultServices.java

@@ -70,6 +70,7 @@
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.AssociateUserProvidedServiceInstanceRouteResponse;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.CreateUserProvidedServiceInstanceResponse;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.DeleteUserProvidedServiceInstanceRequest;
+import org.cloudfoundry.client.v2.userprovidedserviceinstances.RemoveUserProvidedServiceInstanceRouteRequest;
 import org.cloudfoundry.client.v2.userprovidedserviceinstances.UpdateUserProvidedServiceInstanceResponse;
 import org.cloudfoundry.operations.util.OperationsLogging;
 import org.cloudfoundry.util.ExceptionUtils;
@@ -369,6 +370,28 @@ public Mono<Void> unbind(UnbindServiceInstanceRequest request) {
             .checkpoint();
     }
 
+    @Override
+    public Mono<Void> unbindRoute(UnbindRouteServiceInstanceRequest request) {
+        return Mono
+            .when(this.cloudFoundryClient, this.organizationId, this.spaceId)
+            .then(function((cloudFoundryClient, organizationId, spaceId) -> Mono
+                .when(
+                    Mono.just(cloudFoundryClient),
+                    getDomainId(cloudFoundryClient, request.getDomainName(), organizationId),
+                    Mono.just(spaceId)
+                )))
+            .then(function((cloudFoundryClient, domainId, spaceId) -> Mono
+                .when(
+                    Mono.just(cloudFoundryClient),
+                    getRouteId(cloudFoundryClient, request.getDomainName(), domainId, request.getHostname(), request.getPath()),
+                    getSpaceServiceInstanceId(cloudFoundryClient, request.getServiceInstanceName(), spaceId)
+                )))
+            .then(function(DefaultServices::requestRemoveRoute))
+            .then()
+            .transform(OperationsLogging.log("Unbind Route from Service Instance"))
+            .checkpoint();
+    }
+
     @Override
     public Mono<Void> updateInstance(UpdateServiceInstanceRequest request) {
         return Mono
@@ -526,7 +549,7 @@ private static Mono<String> getPrivateDomainId(CloudFoundryClient cloudFoundryCl
             .singleOrEmpty();
     }
 
-    private static Mono<RouteResource> getRoute(CloudFoundryClient cloudFoundryClient, String domainId, String domain, String host, String path) {
+    private static Mono<RouteResource> getRoute(CloudFoundryClient cloudFoundryClient, String domain, String domainId, String host, String path) {
         return getRoute(cloudFoundryClient, domainId, host, path)
             .otherwiseIfEmpty(ExceptionUtils.illegalArgument("Route %s.%s does not exist", host, domain));
     }
@@ -539,7 +562,7 @@ private static Mono<RouteResource> getRoute(CloudFoundryClient cloudFoundryClien
     }
 
     private static Mono<String> getRouteId(CloudFoundryClient cloudFoundryClient, String domain, String domainId, String host, String path) {
-        return getRoute(cloudFoundryClient, domainId, domain, host, path)
+        return getRoute(cloudFoundryClient, domain, domainId, host, path)
             .map(ResourceUtils::getId);
     }
 
@@ -590,6 +613,11 @@ private static Mono<String> getServicePlanIdByName(CloudFoundryClient cloudFound
             .otherwise(NoSuchElementException.class, t -> ExceptionUtils.illegalArgument("Service plan %s does not exist", plan));
     }
 
+    private static Mono<List<ServicePlanResource>> getServicePlans(CloudFoundryClient cloudFoundryClient, String serviceId) {
+        return requestListServicePlans(cloudFoundryClient, serviceId)
+            .collectList();
+    }
+
     private static Mono<String> getSharedDomainId(CloudFoundryClient cloudFoundryClient, String domain) {
         return requestSharedDomain(cloudFoundryClient, domain)
             .map(ResourceUtils::getId)
@@ -869,6 +897,14 @@ private static Flux<PrivateDomainResource> requestPrivateDomain(CloudFoundryClie
                     .build()));
     }
 
+    private static Mono<Void> requestRemoveRoute(CloudFoundryClient cloudFoundryClient, String routeId, String userProvidedServiceInstanceId) {
+        return cloudFoundryClient.userProvidedServiceInstances()
+            .removeRoute(RemoveUserProvidedServiceInstanceRouteRequest.builder()
+                .routeId(routeId)
+                .userProvidedServiceInstanceId(userProvidedServiceInstanceId)
+                .build());
+    }
+
     private static Flux<RouteResource> requestRoutes(CloudFoundryClient cloudFoundryClient, UnaryOperator<ListRoutesRequest.Builder> modifier) {
 
         ListRoutesRequest.Builder listBuilder = modifier.apply(ListRoutesRequest.builder());
@@ -1035,9 +1071,4 @@ private static Mono<Void> waitForCreateInstance(CloudFoundryClient cloudFoundryC
                 .map(response -> ResourceUtils.getEntity(response).getLastOperation()));
     }
 
-    private Mono<List<ServicePlanResource>> getServicePlans(CloudFoundryClient cloudFoundryClient, String serviceId) {
-        return requestListServicePlans(cloudFoundryClient, serviceId)
-            .collectList();
-    }
-
 }

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/services/Services.java

@@ -135,6 +135,14 @@ public interface Services {
      */
     Mono<Void> unbind(UnbindServiceInstanceRequest request);
 
+    /**
+     * Unbind a service instance from a route
+     *
+     * @param request the unbind service instance from a route request
+     * @return a completion indicator
+     */
+    Mono<Void> unbindRoute(UnbindRouteServiceInstanceRequest request);
+
     /**
      * Update a service instance
      *

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/services/_UnbindRouteServiceInstanceRequest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.operations.services;
+
+import org.cloudfoundry.Nullable;
+import org.immutables.value.Value;
+
+/**
+ * The request options for the unbind service instance operation
+ */
+@Value.Immutable
+abstract class _UnbindRouteServiceInstanceRequest {
+
+    /**
+     * The domain for the bound route
+     */
+    abstract String getDomainName();
+
+    /**
+     * The hostname for the bound route
+     */
+    @Nullable
+    abstract String getHostname();
+
+    /**
+     * The path for the bound route
+     */
+    @Nullable
+    abstract String getPath();
+
+    /**
+     * The name of the service instance to bind
+     */
+    abstract String getServiceInstanceName();
+
+}

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/BindRouteServiceInstanceRequestTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.operations.services;
+
+import org.junit.Test;
+
+public final class BindRouteServiceInstanceRequestTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noDomainName() {
+        BindRouteServiceInstanceRequest.builder()
+            .serviceInstanceName("test-service-instance-name")
+            .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void noServiceInstanceName() {
+        BindRouteServiceInstanceRequest.builder()
+            .domainName("test-domain-name")
+            .build();
+    }
+
+    @Test
+    public void valid() {
+        BindRouteServiceInstanceRequest.builder()
+            .domainName("test-domain-name")
+            .serviceInstanceName("test-service-instance-name")
+            .build();
+    }
+
+}

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/services/UnbindRouteServiceInstanceRequestTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.operations.services;
+
+import org.junit.Test;
+
+public final class UnbindRouteServiceInstanceRequestTest {
+
+    @Test(expected = IllegalStateException.class)
+    public void noDomainName() {
+        UnbindRouteServiceInstanceRequest.builder()
+            .serviceInstanceName("test-service-instance-name")
+            .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void noServiceInstanceName() {
+        UnbindRouteServiceInstanceRequest.builder()
+            .domainName("test-domain-name")
+            .build();
+    }
+
+    @Test
+    public void valid() {
+        UnbindRouteServiceInstanceRequest.builder()
+            .domainName("test-domain-name")
+            .serviceInstanceName("test-service-instance-name")
+            .build();
+    }
+
+}