Implement Manifest V3 objects and deployment

Author: schulzh

.idea/misc.xml

@@ -61,6 +61,7 @@
 import org.cloudfoundry.client.v3.organizations.OrganizationsV3;
 import org.cloudfoundry.client.v3.packages.Packages;
 import org.cloudfoundry.client.v3.processes.Processes;
+import org.cloudfoundry.client.v3.resourcematch.ResourceMatchV3;
 import org.cloudfoundry.client.v3.roles.RolesV3;
 import org.cloudfoundry.client.v3.routes.RoutesV3;
 import org.cloudfoundry.client.v3.serviceinstances.ServiceInstancesV3;
@@ -117,6 +118,7 @@
 import org.cloudfoundry.reactor.client.v3.organizations.ReactorOrganizationsV3;
 import org.cloudfoundry.reactor.client.v3.packages.ReactorPackages;
 import org.cloudfoundry.reactor.client.v3.processes.ReactorProcesses;
+import org.cloudfoundry.reactor.client.v3.resourcematch.ReactorResourceMatchV3;
 import org.cloudfoundry.reactor.client.v3.roles.ReactorRolesV3;
 import org.cloudfoundry.reactor.client.v3.routes.ReactorRoutesV3;
 import org.cloudfoundry.reactor.client.v3.servicebindings.ReactorServiceBindingsV3;
@@ -307,6 +309,12 @@ public ResourceMatch resourceMatch() {
         return new ReactorResourceMatch(getConnectionContext(), getRootV2(), getTokenProvider(), getRequestTags());
     }
 
+    @Override
+    @Value.Derived
+    public ResourceMatchV3 resourceMatchV3() {
+        return new ReactorResourceMatchV3(getConnectionContext(), getRootV3(), getTokenProvider(), getRequestTags());
+    }
+
     @Override
     @Value.Derived
     public RolesV3 rolesV3() {

.idea/runConfigurations.xml

@@ -37,6 +37,7 @@
 import reactor.netty.http.client.HttpClientRequest;
 import reactor.netty.http.client.HttpClientResponse;
 
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
@@ -149,6 +150,21 @@ protected final <T> Mono<HttpClientResponseWithParsedBody<T>> postWithResponse(O
                 .response()
                 .parseBodyWithResponse(responseType));
     }
+    protected <T> Mono<HttpClientResponseWithParsedBody<T>> postRawWithResponse(byte[] requestPayload, String contentType, Class<T> responseType, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
+        return createOperator()
+            .flatMap(operator -> operator.post()
+                .uri(queryTransformer(requestPayload).andThen(uriTransformer))
+                .send((request, outbound) -> {
+                    String contentLength = String.valueOf(requestPayload.length);
+                    Mono<byte[]> body = Mono.just(requestPayload);
+
+                    request.header(HttpHeaderNames.CONTENT_LENGTH, contentLength);
+                    request.header(HttpHeaderNames.CONTENT_TYPE, contentType);
+                    return outbound.sendByteArray(body);
+                })
+                .response()
+                .parseBodyWithResponse(responseType));
+    }
 
     protected final Mono<String> post(Object requestPayload, Function<UriComponentsBuilder, UriComponentsBuilder> uriTransformer) {
         return createOperator()

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java

@@ -56,6 +56,8 @@
 import org.cloudfoundry.client.v3.applications.ListApplicationTasksResponse;
 import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
 import org.cloudfoundry.client.v3.applications.ListApplicationsResponse;
+import org.cloudfoundry.client.v3.applications.RestartApplicationRequest;
+import org.cloudfoundry.client.v3.applications.RestartApplicationResponse;
 import org.cloudfoundry.client.v3.applications.ScaleApplicationRequest;
 import org.cloudfoundry.client.v3.applications.ScaleApplicationResponse;
 import org.cloudfoundry.client.v3.applications.SetApplicationCurrentDropletRequest;
@@ -233,6 +235,12 @@ public Mono<StartApplicationResponse> start(StartApplicationRequest request) {
             .checkpoint();
     }
 
+    @Override
+    public Mono<RestartApplicationResponse> restart(RestartApplicationRequest request) {
+        return post(request, RestartApplicationResponse.class, builder -> builder.pathSegment("apps", request.getApplicationId(), "actions", "restart"))
+            .checkpoint();
+    }
+
     @Override
     public Mono<StopApplicationResponse> stop(StopApplicationRequest request) {
         return post(request, StopApplicationResponse.class, builder -> builder.pathSegment("apps", request.getApplicationId(), "actions", "stop"))

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java

@@ -31,6 +31,7 @@
 import org.cloudfoundry.client.v3.packages.Packages;
 import org.cloudfoundry.client.v3.packages.UploadPackageRequest;
 import org.cloudfoundry.client.v3.packages.UploadPackageResponse;
+import org.cloudfoundry.client.v3.resourcematch.MatchedResource;
 import org.cloudfoundry.reactor.ConnectionContext;
 import org.cloudfoundry.reactor.TokenProvider;
 import org.cloudfoundry.reactor.client.v3.AbstractClientV3Operations;
@@ -44,6 +45,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -129,15 +131,22 @@ public Mono<UploadPackageResponse> upload(UploadPackageRequest request) {
     }
 
     private Mono<UploadPackageResponse> upload(UploadPackageRequest request, Runnable onTerminate) {
-        return post(request, UploadPackageResponse.class, builder -> builder.pathSegment("packages", request.getPackageId(), "upload"), outbound -> upload(request.getBits(), outbound), onTerminate)
+        return post(request, UploadPackageResponse.class, builder -> builder.pathSegment("packages", request.getPackageId(), "upload"), outbound -> upload(request.getBits(), request.getResources(), outbound), onTerminate)
             .checkpoint();
     }
 
-    private void upload(Path bits, MultipartHttpClientRequest r) {
-        r.addPart(part -> part.setName("bits")
-            .setContentType(APPLICATION_ZIP)
-            .sendFile(bits))
-            .done();
-    }
+    private void upload(Path bits, List<MatchedResource> resources, MultipartHttpClientRequest r) {
+        if (bits != null) {
+            r.addPart(part -> part.setName("bits")
+                .setContentType(APPLICATION_ZIP)
+                .sendFile(bits));
+        }
 
+        if (resources != null && !resources.isEmpty()) {
+            r.addPart(part -> part.setName("resources")
+                .send(resources));
+        }
+
+        r.done();
+    }
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013-2021 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.reactor.client.v3.resourcematch;
+
+import org.cloudfoundry.client.v3.resourcematch.ListMatchingResourcesRequest;
+import org.cloudfoundry.client.v3.resourcematch.ListMatchingResourcesResponse;
+import org.cloudfoundry.client.v3.resourcematch.ResourceMatchV3;
+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;
+
+/**
+ * The Reactor-based implementation of {@link ResourceMatchV3}
+ */
+public final class ReactorResourceMatchV3 extends AbstractClientV3Operations implements ResourceMatchV3 {
+
+    /**
+     * Creates an instance
+     *
+     * @param connectionContext the {@link ConnectionContext} to use when communicating with the server
+     * @param root              the root URI of the server. Typically something like {@code https://api.run.pivotal.io}.
+     * @param tokenProvider     the {@link TokenProvider} to use when communicating with the server
+     * @param requestTags       map with custom http headers which will be added to web request
+     */
+    public ReactorResourceMatchV3(ConnectionContext connectionContext, Mono<String> root, TokenProvider tokenProvider, Map<String, String> requestTags) {
+        super(connectionContext, root, tokenProvider, requestTags);
+    }
+
+    @Override
+    public Mono<ListMatchingResourcesResponse> list(ListMatchingResourcesRequest request) {
+        return post(request, ListMatchingResourcesResponse.class, builder -> builder.pathSegment("resource_matches"))
+            .checkpoint();
+    }
+}

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/packages/ReactorPackages.java

@@ -27,7 +27,7 @@
 /**
  * The Reactor-based implementation of {@link RoutesV3}
  */
-public class ReactorRoutesV3 extends AbstractClientV3Operations implements RoutesV3 {
+public class  ReactorRoutesV3 extends AbstractClientV3Operations implements RoutesV3 {
 
     /**
      * Creates an instance

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/resourcematch/ReactorResourceMatchV3.java

@@ -16,6 +16,9 @@
 
 package org.cloudfoundry.reactor.client.v3.spaces;
 
+import org.cloudfoundry.client.v3.servicebrokers.UpdateServiceBrokerResponse;
+import org.cloudfoundry.client.v3.spaces.ApplyManifestRequest;
+import org.cloudfoundry.client.v3.spaces.ApplyManifestResponse;
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentRequest;
 import org.cloudfoundry.client.v3.spaces.AssignSpaceIsolationSegmentResponse;
 import org.cloudfoundry.client.v3.spaces.CreateSpaceRequest;
@@ -37,6 +40,7 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * The Reactor-based implementation of {@link SpacesV3}
@@ -103,4 +107,12 @@ public Mono<UpdateSpaceResponse> update(UpdateSpaceRequest request) {
             .checkpoint();
     }
 
+    @Override
+    public Mono<ApplyManifestResponse> applyManifest(ApplyManifestRequest request) {
+        return postRawWithResponse(request.manifest(), "application/x-yaml", ApplyManifestResponse.class, builder -> builder.pathSegment("spaces", request.getSpaceId(), "actions", "apply_manifest"))
+            .map(responseTuple -> ApplyManifestResponse.builder()
+                .jobId(Optional.ofNullable(
+                    extractJobId(responseTuple.getResponse())))
+                .build());
+    }
 }

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/routes/ReactorRoutesV3.java

@@ -140,6 +140,8 @@ private BiFunction<HttpClientRequest, NettyOutbound, Publisher<Void>> serialized
             return JsonCodec.encode(this.context.getConnectionContext().getObjectMapper(), payload);
         }
 
+        //TODO yaml coded
+
     }
 
     public static class ResponseReceiver extends OperatorContextAware {