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

Add readiness health check support in client #1213

Closed
wants to merge 1 commit into from
Closed

Add readiness health check support in client #1213

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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ bin/
.settings/
.factorypath
.gradle
.history/
.history/
6 changes: 6 additions & 0 deletions ci/tcp-routes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@
path: /product-properties/.cloud_controller.default_quota_memory_limit_mb
value:
value: ((DEFAULT_QUOTA_MEM_MB))
- type: replace
path: /resource-config/compute/instances
value: 4
- type: replace
path: /resource-config/compute/instance_type/id
value: "2xlarge.mem"
121 changes: 121 additions & 0 deletions cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-test-sources/test-annotations" isTestSource="true" generated="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.4.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.4.14" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.3" level="project" />
<orderEntry type="library" name="Maven: com.github.zafarkhaja:java-semver:0.9.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver3-junit5:5.0.0-alpha.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:mockwebserver3:5.0.0-alpha.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp3:okhttp-jvm:5.0.0-alpha.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.3.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.9.21" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.21" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.11.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-impl:0.11.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-jackson:0.11.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.projectreactor:reactor-test:3.6.1" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.6.1" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.1.14" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-core:1.1.14" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-classes-epoll:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-http:1.1.14" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.104.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.104.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.1.14" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty.incubator:netty-incubator-codec-native-quic:linux-x86_64:0.0.54.Final" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.netty.incubator:netty-incubator-codec-classes-quic:0.0.54.Final" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:6.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:6.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:6.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:6.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.8.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:2.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.awaitility:awaitility:4.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:6.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.24.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.14.10" level="project" />
<orderEntry type="module" module-name="cloudfoundry-client" />
<orderEntry type="library" name="Maven: com.squareup.wire:wire-runtime-jvm:4.9.1" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio-jvm:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21" level="project" />
<orderEntry type="module" module-name="cloudfoundry-util" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.24.0" level="project" />
<orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.immutables:value:2.10.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:5.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.14.10" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.3" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:2.0.9" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:2.0.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:6.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:6.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:6.1.2" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.12.1" level="project" />
<orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.12.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:3.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.21.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.21.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:2.0.9" level="project" />
</component>
<component name="SonarLintModuleSettings">
<option name="uniqueId" value="f5c346aa-4363-4168-bd29-983b660b2f36" />
</component>
</module>
42 changes: 42 additions & 0 deletions .../test/java/org/cloudfoundry/reactor/client/v3/applications/ReactorApplicationsV3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
import org.cloudfoundry.client.v3.processes.ProcessState;
import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
import org.cloudfoundry.client.v3.processes.ProcessUsage;
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheck;
import org.cloudfoundry.client.v3.processes.ReadinessHealthCheckType;
import org.cloudfoundry.client.v3.routes.Application;
import org.cloudfoundry.client.v3.routes.Destination;
import org.cloudfoundry.client.v3.routes.Process;
Expand Down Expand Up @@ -807,6 +809,16 @@ void getProcess() {
.endpoint(null)
.build())
.build())
.readinessHealthCheck(
ReadinessHealthCheck.builder()
.type(ReadinessHealthCheckType.PORT)
.data(
Data.builder()
.interval(null)
.timeout(null)
.endpoint(null)
.build())
.build())
.metadata(
Metadata.builder()
.annotations(Collections.emptyMap())
Expand Down Expand Up @@ -1627,6 +1639,16 @@ void listProcesses() {
.endpoint(null)
.build())
.build())
.readinessHealthCheck(
ReadinessHealthCheck.builder()
.type(ReadinessHealthCheckType.PORT)
.data(
Data.builder()
.interval(null)
.timeout(null)
.endpoint(null)
.build())
.build())
.metadata(
Metadata.builder()
.annotations(Collections.emptyMap())
Expand Down Expand Up @@ -1685,6 +1707,16 @@ void listProcesses() {
.endpoint(null)
.build())
.build())
.readinessHealthCheck(
ReadinessHealthCheck.builder()
.type(ReadinessHealthCheckType.PORT)
.data(
Data.builder()
.interval(null)
.timeout(null)
.endpoint(null)
.build())
.build())
.metadata(
Metadata.builder()
.annotations(Collections.emptyMap())
Expand Down Expand Up @@ -2052,6 +2084,16 @@ void scale() {
.endpoint(null)
.build())
.build())
.readinessHealthCheck(
ReadinessHealthCheck.builder()
.type(ReadinessHealthCheckType.PORT)
.data(
Data.builder()
.interval(null)
.timeout(null)
.endpoint(null)
.build())
.build())
.metadata(
Metadata.builder()
.annotations(Collections.emptyMap())
Expand Down
Loading
Loading