Merge branch '3.x' into main

Author: twoseat

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java

@@ -323,7 +323,8 @@ private static <T> void putIfPresent(Map<String, Object> yaml, String key, T val
 
     @SuppressWarnings("unchecked")
     private static ApplicationManifest.Builder toApplicationManifest(Map<String, Object> application, ApplicationManifest.Builder builder, Path root) {
-        asString(application, "buildpack", builder::buildpack);
+        asListOfString(application, "buildpacks", builder::buildpacks);
+        asString(application, "buildpack", builder::buildpacks);
         asString(application, "command", builder::command);
         asMemoryInteger(application, "disk_quota", builder::disk);
         asDocker(application, "docker", builder::docker);
@@ -358,7 +359,7 @@ private static List<Map<String, String>> toRoutesYaml(List<Route> routes) {
     private static Map<String, Object> toYaml(ApplicationManifest applicationManifest) {
         Map<String, Object> yaml = new TreeMap<>();
 
-        putIfPresent(yaml, "buildpack", applicationManifest.getBuildpack());
+        putIfPresent(yaml, "buildpacks", applicationManifest.getBuildpacks());
         putIfPresent(yaml, "command", applicationManifest.getCommand());
         Integer disk = applicationManifest.getDisk();
         if (null != disk) {

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

@@ -82,8 +82,11 @@
 import org.cloudfoundry.client.v2.stacks.GetStackResponse;
 import org.cloudfoundry.client.v2.stacks.ListStacksRequest;
 import org.cloudfoundry.client.v2.stacks.StackResource;
+import org.cloudfoundry.client.v3.BuildpackData;
+import org.cloudfoundry.client.v3.Lifecycle;
 import org.cloudfoundry.client.v3.Resource;
 import org.cloudfoundry.client.v3.applications.ApplicationResource;
+import org.cloudfoundry.client.v3.applications.GetApplicationResponse;
 import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
 import org.cloudfoundry.client.v3.tasks.CancelTaskRequest;
 import org.cloudfoundry.client.v3.tasks.CancelTaskResponse;
@@ -111,7 +114,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
-import reactor.util.function.Tuple4;
+import reactor.util.function.Tuple5;
 import reactor.util.function.Tuples;
 
 import java.io.IOException;
@@ -132,6 +135,7 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
+import static org.cloudfoundry.client.v3.LifecycleType.BUILDPACK;
 import static org.cloudfoundry.util.DelayUtils.exponentialBackOff;
 import static org.cloudfoundry.util.tuple.TupleUtils.function;
 import static org.cloudfoundry.util.tuple.TupleUtils.predicate;
@@ -269,9 +273,11 @@ public Mono<ApplicationManifest> getApplicationManifest(GetApplicationManifestRe
             )))
             .flatMap(function((cloudFoundryClient, applicationId) -> Mono.zip(
                 Mono.just(cloudFoundryClient),
+                Mono.just(applicationId),
                 requestApplicationSummary(cloudFoundryClient, applicationId)
             )))
-            .flatMap(function((cloudFoundryClient, response) -> Mono.zip(
+            .flatMap(function((cloudFoundryClient, applicationId, response) -> Mono.zip(
+                getApplicationBuildpacks(cloudFoundryClient, applicationId),
                 Mono.just(response),
                 getStackName(cloudFoundryClient, response.getStackId())
             )))
@@ -358,7 +364,7 @@ public Flux<LogMessage> logs(LogsRequest request) {
     @SuppressWarnings("deprecation")
     public Mono<Void> push(PushApplicationRequest request) {
         ApplicationManifest.Builder builder = ApplicationManifest.builder()
-            .buildpack(request.getBuildpack())
+            .buildpacks(request.getBuildpacks())
             .command(request.getCommand())
             .disk(request.getDiskQuota())
             .docker(Docker.builder()
@@ -762,6 +768,19 @@ private static Mono<AbstractApplicationResource> getApplication(CloudFoundryClie
             .onErrorResume(NoSuchElementException.class, t -> ExceptionUtils.illegalArgument("Application %s does not exist", application));
     }
 
+    private static Mono<List<String>> getApplicationBuildpacks(CloudFoundryClient cloudFoundryClient, String applicationId) {
+        return cloudFoundryClient.applicationsV3()
+            .get(org.cloudfoundry.client.v3.applications.GetApplicationRequest.builder()
+                .applicationId(applicationId)
+                .build())
+            .map(GetApplicationResponse::getLifecycle)
+            .filter(lifecycle -> BUILDPACK == lifecycle.getType())
+            .map(Lifecycle::getData)
+            .cast(BuildpackData.class)
+            .map(BuildpackData::getBuildpacks)
+            .defaultIfEmpty(Collections.emptyList());
+    }
+
     private static Mono<String> getApplicationId(CloudFoundryClient cloudFoundryClient, String application, String spaceId) {
         return getApplication(cloudFoundryClient, application, spaceId)
             .map(ResourceUtils::getId);
@@ -822,9 +841,8 @@ private static Mono<ApplicationResource> getApplicationV3(CloudFoundryClient clo
             .onErrorResume(NoSuchElementException.class, t -> ExceptionUtils.illegalArgument("Application %s does not exist", application));
     }
 
-    private static Mono<Tuple4<SummaryApplicationResponse, GetStackResponse, List<InstanceDetail>, List<String>>>
-    getAuxiliaryContent(CloudFoundryClient cloudFoundryClient, AbstractApplicationResource applicationResource) {
-
+    private static Mono<Tuple5<List<String>, SummaryApplicationResponse, GetStackResponse, List<InstanceDetail>, List<String>>> getAuxiliaryContent(CloudFoundryClient cloudFoundryClient,
+                                                                                                                                                    AbstractApplicationResource applicationResource) {
         String applicationId = ResourceUtils.getId(applicationResource);
         String stackId = ResourceUtils.getEntity(applicationResource).getStackId();
 
@@ -835,19 +853,14 @@ private static Mono<ApplicationResource> getApplicationV3(CloudFoundryClient clo
                 getApplicationInstances(cloudFoundryClient, applicationId)
             )
             .flatMap(function((applicationStatisticsResponse, summaryApplicationResponse, applicationInstancesResponse) -> Mono.zip(
+                getApplicationBuildpacks(cloudFoundryClient, applicationId),
                 Mono.just(summaryApplicationResponse),
                 requestStack(cloudFoundryClient, stackId),
                 toInstanceDetailList(applicationInstancesResponse, applicationStatisticsResponse),
                 toUrls(summaryApplicationResponse.getRoutes())
             )));
     }
 
-    private static String getBuildpack(SummaryApplicationResponse response) {
-        return Optional
-            .ofNullable(response.getBuildpack())
-            .orElse(response.getDetectedBuildpack());
-    }
-
     private static Mono<String> getDefaultDomainId(CloudFoundryClient cloudFoundryClient) {
         return requestSharedDomains(cloudFoundryClient)
             .filter(resource -> !Optional.ofNullable(ResourceUtils.getEntity(resource).getInternal()).orElse(false))
@@ -1172,8 +1185,9 @@ private static Flux<Void> pushApplication(CloudFoundryClient cloudFoundryClient,
                 randomWords, spaceId)
                 .thenReturn(Tuples.of(applicationId, matchedResources))))
             .flatMap(function((applicationId, matchedResources) -> Mono.when(
-                uploadApplicationAndWait(cloudFoundryClient, applicationId, manifest.getPath(), matchedResources, request.getStagingTimeout()),
-                bindServices(cloudFoundryClient, applicationId, manifest, spaceId)
+                bindServices(cloudFoundryClient, applicationId, manifest, spaceId),
+                updateBuildpacks(cloudFoundryClient, applicationId, manifest),
+                uploadApplicationAndWait(cloudFoundryClient, applicationId, manifest.getPath(), matchedResources, request.getStagingTimeout())
             )
                 .thenReturn(applicationId)))
             .flatMap(applicationId -> stopAndStartApplication(cloudFoundryClient, applicationId, manifest.getName(), request));
@@ -1283,7 +1297,6 @@ private static Mono<CopyApplicationResponse> requestCopyBits(CloudFoundryClient
 
     private static Mono<CreateApplicationResponse> requestCreateApplication(CloudFoundryClient cloudFoundryClient, ApplicationManifest manifest, String spaceId, String stackId) {
         CreateApplicationRequest.Builder builder = CreateApplicationRequest.builder()
-            .buildpack(manifest.getBuildpack())
             .command(manifest.getCommand())
             .diskQuota(manifest.getDisk())
             .environmentJsons(manifest.getEnvironmentVariables())
@@ -1296,6 +1309,10 @@ private static Mono<CreateApplicationResponse> requestCreateApplication(CloudFou
             .spaceId(spaceId)
             .stackId(stackId);
 
+        if (manifest.getBuildpacks() != null && manifest.getBuildpacks().size() == 1) {
+            builder.buildpack(manifest.getBuildpacks().get(0));
+        }
+
         if (manifest.getDocker() != null) {
             Optional.ofNullable(manifest.getDocker().getImage())
                 .ifPresent(image -> {
@@ -1584,7 +1601,6 @@ private static Mono<AbstractApplicationResource> requestUpdateApplication(CloudF
                                                                               ApplicationManifest manifest, String stackId) {
         return requestUpdateApplication(cloudFoundryClient, applicationId, builder -> {
             builder
-                .buildpack(manifest.getBuildpack())
                 .command(manifest.getCommand())
                 .diskQuota(manifest.getDisk())
                 .environmentJsons(environmentJsons)
@@ -1596,6 +1612,10 @@ private static Mono<AbstractApplicationResource> requestUpdateApplication(CloudF
                 .name(manifest.getName())
                 .stackId(stackId);
 
+            if (manifest.getBuildpacks() != null && manifest.getBuildpacks().size() == 1) {
+                builder.buildpack(manifest.getBuildpacks().get(0));
+            }
+
             if (manifest.getDocker() != null) {
                 Optional.ofNullable(manifest.getDocker().getImage())
                     .ifPresent(image -> {
@@ -1649,8 +1669,8 @@ private static Mono<AbstractApplicationResource> requestUpdateApplicationState(C
         return requestUpdateApplication(cloudFoundryClient, applicationId, builder -> builder.state(state));
     }
 
-    private static Mono<UploadApplicationResponse> requestUploadApplication(CloudFoundryClient cloudFoundryClient, String applicationId, Path application, List<ResourceMatchingUtils
-        .ArtifactMetadata> matchedResources) {
+    private static Mono<UploadApplicationResponse> requestUploadApplication(CloudFoundryClient cloudFoundryClient, String applicationId, Path application,
+                                                                            List<ResourceMatchingUtils.ArtifactMetadata> matchedResources) {
         UploadApplicationRequest request = matchedResources.stream()
             .reduce(UploadApplicationRequest.builder()
                     .application(application)
@@ -1712,10 +1732,14 @@ private static Mono<AbstractApplicationResource> stopApplicationIfNotStopped(Clo
         return isNotIn(resource, STOPPED_STATE) ? stopApplication(cloudFoundryClient, ResourceUtils.getId(resource)) : Mono.just(resource);
     }
 
-    private static ApplicationDetail toApplicationDetail(SummaryApplicationResponse summaryApplicationResponse, GetStackResponse getStackResponse, List<InstanceDetail> instanceDetails,
-                                                         List<String> urls) {
+    private static ApplicationDetail toApplicationDetail(List<String> buildpacks, SummaryApplicationResponse summaryApplicationResponse, GetStackResponse getStackResponse,
+                                                         List<InstanceDetail> instanceDetails, List<String> urls) {
+        if (buildpacks.size() == 0) {
+            buildpacks = Collections.singletonList(summaryApplicationResponse.getDetectedBuildpack());
+        }
+
         return ApplicationDetail.builder()
-            .buildpack(getBuildpack(summaryApplicationResponse))
+            .buildpacks(buildpacks)
             .diskQuota(summaryApplicationResponse.getDiskQuota())
             .id(summaryApplicationResponse.getId())
             .instanceDetails(instanceDetails)
@@ -1739,9 +1763,8 @@ private static ApplicationEnvironments toApplicationEnvironments(ApplicationEnvi
             .build();
     }
 
-    private static Mono<ApplicationManifest> toApplicationManifest(SummaryApplicationResponse response, String stackName) {
-        ApplicationManifest.Builder manifestBuilder = ApplicationManifest.builder()
-            .buildpack(response.getBuildpack())
+    private static Mono<ApplicationManifest> toApplicationManifest(List<String> buildpacks, SummaryApplicationResponse response, String stackName) {
+        ApplicationManifest.Builder builder = ApplicationManifest.builder()
             .command(response.getCommand())
             .disk(response.getDiskQuota())
             .environmentVariables(response.getEnvironmentJsons())
@@ -1754,22 +1777,26 @@ private static Mono<ApplicationManifest> toApplicationManifest(SummaryApplicatio
             .stack(stackName)
             .timeout(response.getHealthCheckTimeout());
 
+        if (buildpacks != null && !buildpacks.isEmpty()) {
+            builder.buildpacks(buildpacks);
+        }
+
         for (org.cloudfoundry.client.v2.routes.Route route : Optional.ofNullable(response.getRoutes()).orElse(Collections.emptyList())) {
-            manifestBuilder.route(Route.builder()
+            builder.route(Route.builder()
                 .route(toUrl(route))
                 .build());
         }
 
         if (Optional.ofNullable(response.getRoutes()).orElse(Collections.emptyList()).isEmpty()) {
-            manifestBuilder.noRoute(true);
+            builder.noRoute(true);
         }
 
         for (ServiceInstance service : Optional.ofNullable(response.getServices()).orElse(Collections.emptyList())) {
-            Optional.ofNullable(service.getName()).ifPresent(manifestBuilder::service);
+            Optional.ofNullable(service.getName()).ifPresent(builder::service);
         }
 
         return Mono
-            .just(manifestBuilder
+            .just(builder
                 .build());
     }
 
@@ -1899,6 +1926,24 @@ private static Mono<List<String>> toUrls(List<org.cloudfoundry.client.v2.routes.
             .collectList();
     }
 
+    private static Mono<Void> updateBuildpacks(CloudFoundryClient cloudFoundryClient, String applicationId, ApplicationManifest manifest) {
+        if (manifest.getBuildpacks() == null || manifest.getBuildpacks().size() < 2) {
+            return Mono.empty();
+        }
+
+        return cloudFoundryClient.applicationsV3()
+            .update(org.cloudfoundry.client.v3.applications.UpdateApplicationRequest.builder()
+                .applicationId(applicationId)
+                .lifecycle(Lifecycle.builder()
+                    .data(BuildpackData.builder()
+                        .addAllBuildpacks(manifest.getBuildpacks())
+                        .build())
+                    .type(BUILDPACK)
+                    .build())
+                .build())
+            .then();
+    }
+
     private static Mono<Void> uploadApplicationAndWait(CloudFoundryClient cloudFoundryClient, String applicationId, Path application, List<ResourceMatchingUtils.ArtifactMetadata> matchedResources,
                                                        Duration stagingTimeout) {
         return Mono

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ApplicationDetail.java

@@ -16,6 +16,7 @@
 
 package org.cloudfoundry.operations.applications;
 
+import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
 
@@ -29,10 +30,11 @@
 abstract class _ApplicationDetail extends AbstractApplicationSummary {
 
     /**
-     * The buildpack, if any, used to stage this application
+     * The buildpacks, if any, used to stage this application
      */
+    @AllowNulls
     @Nullable
-    abstract String getBuildpack();
+    abstract List<String> getBuildpacks();
 
     /**
      * The list of instances

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ApplicationManifest.java

@@ -49,7 +49,7 @@ void check() {
         }
 
         if (getDocker() != null) {
-            if (getDocker().getImage() != null && getBuildpack() != null) {
+            if (getDocker().getImage() != null && getBuildpacks() != null && !getBuildpacks().isEmpty()) {
                 throw new IllegalStateException("docker image and buildpack cannot both be set");
             }
 
@@ -72,10 +72,10 @@ void check() {
     }
 
     /**
-     * The buildpack used by the application
+     * The buildpacks used by the application
      */
     @Nullable
-    abstract String getBuildpack();
+    abstract List<String> getBuildpacks();
 
     /**
      * The command used to execute the application

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_PushApplicationRequest.java

@@ -21,6 +21,7 @@
 
 import java.nio.file.Path;
 import java.time.Duration;
+import java.util.List;
 
 /**
  * The request options for the push application operation
@@ -64,10 +65,10 @@ void check() {
     abstract Path getApplication();
 
     /**
-     * The buildpack for the application
+     * The buildpacks for the application
      */
     @Nullable
-    abstract String getBuildpack();
+    abstract List<String> getBuildpacks();
 
     /**
      * The custom start command for the application