Skip to content

Anthony health check #1256

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

Closed
anthonydahanne wants to merge 5 commits into from
Closed

Anthony health check #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92a410d
adds missing v3 fields & supported version
Nov 13, 2024
828d2ba
add readiness health check support in client
Yavor16 Dec 6, 2024
b325ba9
healthcheck polishing
Nov 14, 2024
70bcf92
bump supported API
Apr 2, 2024
882146e
spotless plugin changes
Dec 3, 2024
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"
17 changes: 17 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,17 @@
<?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="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<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>
</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
52 changes: 52 additions & 0 deletions ...ctor/src/test/java/org/cloudfoundry/reactor/client/v3/processes/ReactorProcessesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,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.processes.ScaleProcessRequest;
import org.cloudfoundry.client.v3.processes.ScaleProcessResponse;
import org.cloudfoundry.client.v3.processes.TerminateProcessInstanceRequest;
Expand Down Expand Up @@ -121,6 +123,16 @@ void get() {
.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 @@ -309,6 +321,16 @@ void list() {
.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 @@ -367,6 +389,16 @@ void list() {
.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 @@ -458,6 +490,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 Expand Up @@ -545,6 +587,16 @@ void update() {
.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
16 changes: 16 additions & 0 deletions ...lient-reactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_processes_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down Expand Up @@ -68,6 +76,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
8 changes: 8 additions & 0 deletions ...eactor/src/test/resources/fixtures/client/v3/apps/GET_{id}_processes_{type}_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
8 changes: 8 additions & 0 deletions ...t/resources/fixtures/client/v3/apps/PUT_{id}_processes_{type}_actions_scale_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
16 changes: 16 additions & 0 deletions ...dfoundry-client-reactor/src/test/resources/fixtures/client/v3/processes/GET_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down Expand Up @@ -68,6 +76,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
8 changes: 8 additions & 0 deletions ...dry-client-reactor/src/test/resources/fixtures/client/v3/processes/GET_{id}_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
8 changes: 8 additions & 0 deletions ...y-client-reactor/src/test/resources/fixtures/client/v3/processes/PATCH_{id}_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
8 changes: 8 additions & 0 deletions ...tor/src/test/resources/fixtures/client/v3/processes/POST_{id}_actions_scale_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
"endpoint": null
}
},
"readiness_health_check": {
"type": "port",
"data": {
"interval": null,
"endpoint": null,
"invocation_timeout": null
}
},
"metadata": {
"annotations": {},
"labels": {}
Expand Down
6 changes: 6 additions & 0 deletions cloudfoundry-client/cloudfoundry-client.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="SonarLintModuleSettings">
<option name="uniqueId" value="6952b678-8bcc-4c5b-8657-ca35139935e3" />
</component>
</module>
2 changes: 1 addition & 1 deletion cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public interface CloudFoundryClient {
/**
* The currently supported Cloud Controller API version
*/
String SUPPORTED_API_VERSION = "2.233.0";
String SUPPORTED_API_VERSION = "2.245.0";

/**
* Main entry point to the Cloud Foundry Application Usage Events Client API
Expand Down
4 changes: 4 additions & 0 deletions ...ndry-client/src/main/java/org/cloudfoundry/client/v2/applications/_ApplicationEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ abstract class _ApplicationEntity extends AbstractApplicationEntity {
@Nullable
abstract String getEventsUrl();

@JsonProperty("log_rate_limit")
@Nullable
abstract String getLogRateLimit();

/**
* The package state
*/
Expand Down
4 changes: 4 additions & 0 deletions ...lient/src/main/java/org/cloudfoundry/client/v2/applications/_ApplicationInstanceInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ abstract class _ApplicationInstanceInfo {
@Nullable
abstract Integer getDebugPort();

@JsonProperty("routable")
@Nullable
abstract Boolean getRoutable();

/**
* The details
*/
Expand Down
3 changes: 3 additions & 0 deletions ...dry-client/src/main/java/org/cloudfoundry/client/v2/applications/_InstanceStatistics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ abstract class _InstanceStatistics {
@Nullable
abstract Statistics getStatistics();

@JsonProperty("routable")
@Nullable
abstract Boolean getLogRate();
/**
* Routable
*/
Expand Down
Loading
Loading