Skip to content

Commit

Permalink
Merge pull request #1218 from cloudfoundry/1173
Browse files Browse the repository at this point in the history 
PR 1173
  • Loading branch information
@pivotal-david-osullivan
pivotal-david-osullivan authored Feb 14, 2024
2 parents 996a815 + 628c05f commit 891f35d
Show file tree
Hide file tree
Showing 3 changed files with 174 additions and 53 deletions.
112 changes: 85 additions & 27 deletions ...perations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
import org.cloudfoundry.client.v2.OrderDirection;
import org.cloudfoundry.client.v2.applications.AbstractApplicationResource;
import org.cloudfoundry.client.v2.applications.ApplicationEntity;
import org.cloudfoundry.client.v2.applications.ApplicationEnvironmentRequest;
import org.cloudfoundry.client.v2.applications.ApplicationEnvironmentResponse;
import org.cloudfoundry.client.v2.applications.ApplicationInstanceInfo;
import org.cloudfoundry.client.v2.applications.ApplicationInstancesRequest;
import org.cloudfoundry.client.v2.applications.ApplicationInstancesResponse;
Expand Down Expand Up @@ -111,11 +109,17 @@
import org.cloudfoundry.client.v3.Relationship;
import org.cloudfoundry.client.v3.Resource;
import org.cloudfoundry.client.v3.ToOneRelationship;
import org.cloudfoundry.client.v3.applications.ApplicationFeature;
import org.cloudfoundry.client.v3.applications.ApplicationResource;
import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentRequest;
import org.cloudfoundry.client.v3.applications.GetApplicationEnvironmentResponse;
import org.cloudfoundry.client.v3.applications.GetApplicationResponse;
import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledRequest;
import org.cloudfoundry.client.v3.applications.GetApplicationSshEnabledResponse;
import org.cloudfoundry.client.v3.applications.ListApplicationProcessesRequest;
import org.cloudfoundry.client.v3.applications.ListApplicationsRequest;
import org.cloudfoundry.client.v3.applications.SetApplicationCurrentDropletRequest;
import org.cloudfoundry.client.v3.applications.UpdateApplicationFeatureRequest;
import org.cloudfoundry.client.v3.builds.BuildState;
import org.cloudfoundry.client.v3.builds.CreateBuildRequest;
import org.cloudfoundry.client.v3.builds.CreateBuildResponse;
Expand Down Expand Up @@ -202,6 +206,8 @@ public final class DefaultApplications implements Applications {

private static final String STOPPED_STATE = "STOPPED";

private static final String APP_FEATURE_SSH = "ssh";

private final Mono<CloudFoundryClient> cloudFoundryClient;

private final Mono<DopplerClient> dopplerClient;
Expand Down Expand Up @@ -320,11 +326,21 @@ public Mono<Void> disableSsh(DisableApplicationSshRequest request) {
(cloudFoundryClient, spaceId) ->
Mono.zip(
Mono.just(cloudFoundryClient),
getApplicationIdWhere(
getApplicationIdV3(
cloudFoundryClient,
request.getName(),
spaceId,
sshEnabled(true)))))
spaceId))))
.flatMap(
function(
(cloudFoundryClient, applicationId) ->
Mono.zip(
Mono.just(cloudFoundryClient),
Mono.just(applicationId),
getSshEnabled(cloudFoundryClient, applicationId))))
.filter(
predicate(
(cloudFoundryClient, applicationId, sshEnabled) ->
sshEnabled.equals(true)))
.flatMap(
function(
(cloudFoundryClient, applicationId) ->
Expand All @@ -343,11 +359,21 @@ public Mono<Void> enableSsh(EnableApplicationSshRequest request) {
(cloudFoundryClient, spaceId) ->
Mono.zip(
Mono.just(cloudFoundryClient),
getApplicationIdWhere(
getApplicationIdV3(
cloudFoundryClient,
request.getName(),
spaceId,
sshEnabled(false)))))
spaceId))))
.flatMap(
function(
(cloudFoundryClient, applicationId) ->
Mono.zip(
Mono.just(cloudFoundryClient),
Mono.just(applicationId),
getSshEnabled(cloudFoundryClient, applicationId))))
.filter(
predicate(
(cloudFoundryClient, applicationId, sshEnabled) ->
sshEnabled.equals(false)))
.flatMap(
function(
(cloudFoundryClient, applicationId) ->
Expand Down Expand Up @@ -420,7 +446,7 @@ public Mono<ApplicationEnvironments> getEnvironments(
(cloudFoundryClient, spaceId) ->
Mono.zip(
Mono.just(cloudFoundryClient),
getApplicationId(
getApplicationIdV3(
cloudFoundryClient,
request.getName(),
spaceId))))
Expand Down Expand Up @@ -906,15 +932,28 @@ public Mono<Boolean> sshEnabled(ApplicationSshEnabledRequest request) {
.flatMap(
function(
(cloudFoundryClient, spaceId) ->
getApplication(
cloudFoundryClient, request.getName(), spaceId)))
.map(
applicationResource ->
ResourceUtils.getEntity(applicationResource).getEnableSsh())
Mono.zip(
Mono.just(cloudFoundryClient),
getApplicationIdV3(
cloudFoundryClient,
request.getName(),
spaceId))))
.flatMap(function(DefaultApplications::getSshEnabled))
.transform(OperationsLogging.log("Is Application SSH Enabled"))
.checkpoint();
}

private static Mono<Boolean> getSshEnabled(
CloudFoundryClient cloudFoundryClient, String applicationId) {
return cloudFoundryClient
.applicationsV3()
.getSshEnabled(
GetApplicationSshEnabledRequest.builder()
.applicationId(applicationId)
.build())
.map(GetApplicationSshEnabledResponse::getEnabled);
}

@Override
public Mono<Void> start(StartApplicationRequest request) {
return Mono.zip(this.cloudFoundryClient, this.spaceId)
Expand Down Expand Up @@ -2086,12 +2125,12 @@ private static Mono<Void> removeServiceBindings(
.then();
}

private static Mono<ApplicationEnvironmentResponse> requestApplicationEnvironment(
private static Mono<GetApplicationEnvironmentResponse> requestApplicationEnvironment(
CloudFoundryClient cloudFoundryClient, String applicationId) {
return cloudFoundryClient
.applicationsV2()
.environment(
ApplicationEnvironmentRequest.builder()
.applicationsV3()
.getEnvironment(
GetApplicationEnvironmentRequest.builder()
.applicationId(applicationId)
.build());
}
Expand Down Expand Up @@ -2662,6 +2701,29 @@ private static Mono<AbstractApplicationResource> requestUpdateApplicationName(
cloudFoundryClient, applicationId, builder -> builder.name(name));
}

private static Mono<ApplicationFeature> requestUpdateApplicationSsh(
CloudFoundryClient cloudFoundryClient, String applicationId, boolean enabled) {
return requestUpdateApplicationFeature(
cloudFoundryClient,
applicationId,
builder -> builder.featureName(APP_FEATURE_SSH).enabled(enabled));
}

private static Mono<ApplicationFeature> requestUpdateApplicationFeature(
CloudFoundryClient cloudFoundryClient,
String applicationId,
UnaryOperator<UpdateApplicationFeatureRequest.Builder> modifier) {
return cloudFoundryClient
.applicationsV3()
.updateFeature(
modifier.apply(
org.cloudfoundry.client.v3.applications
.UpdateApplicationFeatureRequest.builder()
.applicationId(applicationId))
.build())
.cast(ApplicationFeature.class);
}

private static Mono<AbstractApplicationResource> requestUpdateApplicationScale(
CloudFoundryClient cloudFoundryClient,
String applicationId,
Expand Down Expand Up @@ -2773,10 +2835,6 @@ private static boolean shouldStartApplication(PushApplicationManifestRequest req
return !Optional.ofNullable(request.getNoStart()).orElse(false);
}

private static Predicate<AbstractApplicationResource> sshEnabled(Boolean enabled) {
return resource -> enabled.equals(ResourceUtils.getEntity(resource).getEnableSsh());
}

private static Mono<Void> startApplicationAndWait(
CloudFoundryClient cloudFoundryClient,
String application,
Expand Down Expand Up @@ -2853,12 +2911,12 @@ private static ApplicationDetail toApplicationDetail(
}

private static ApplicationEnvironments toApplicationEnvironments(
ApplicationEnvironmentResponse response) {
GetApplicationEnvironmentResponse response) {
return ApplicationEnvironments.builder()
.running(response.getRunningEnvironmentJsons())
.staging(response.getStagingEnvironmentJsons())
.systemProvided(response.getSystemEnvironmentJsons())
.userProvided(response.getEnvironmentJsons())
.running(response.getRunningEnvironmentVariables())
.staging(response.getStagingEnvironmentVariables())
.systemProvided(response.getSystemEnvironmentVariables())
.userProvided(response.getEnvironmentVariables())
.build();
}

Expand Down
2 changes: 2 additions & 0 deletions ...dfoundry-operations/src/test/java/org/cloudfoundry/operations/AbstractOperationsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public abstract class AbstractOperationsTest {

protected static final String TEST_USERNAME = "test-username";

protected static final String APP_FEATURE_SSH = "ssh";

protected final ApplicationsV2 applications = mock(ApplicationsV2.class, RETURNS_SMART_NULLS);

protected final ApplicationsV3 applicationsV3 = mock(ApplicationsV3.class, RETURNS_SMART_NULLS);
Expand Down
Loading

0 comments on commit 891f35d

Please sign in to comment.