Merge branch 'main' into add-cnb

Author: s-yonkov-yonkov

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/organizations/ReactorOrganizationsV3Test.java

@@ -401,6 +401,12 @@ void getUsageSummary() {
                                         UsageSummary.builder()
                                                 .startedInstances(3)
                                                 .memoryInMb(50)
+                                                .routes(0)
+                                                .serviceInstances(0)
+                                                .reservedPorts(0)
+                                                .perAppTasks(2)
+                                                .domains(2)
+                                                .serviceKeys(0)
                                                 .build())
                                 .link(
                                         "self",

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/uaa/authorizations/ReactorAuthorizationsTest.java

@@ -367,6 +367,7 @@ void getOpenIdProviderConfigurationRequest() {
                                 .supportedUiLocale(Locale.US)
                                 .tokenEndpoint("http://localhost/oauth/token")
                                 .userInfoEndpoint("http://localhost/userinfo")
+                                .endSessionEndpoint("http://localhost/logout.do")
                                 .build())
                 .expectComplete()
                 .verify(Duration.ofSeconds(5));

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/organizations/GET_{id}_usage_summary_response.json

@@ -1,7 +1,13 @@
 {
   "usage_summary": {
     "started_instances": 3,
-    "memory_in_mb": 50
+    "memory_in_mb": 50,
+    "routes": 0,
+    "service_instances": 0,
+    "reserved_ports": 0,
+    "per_app_tasks": 2,
+    "domains": 2,
+    "service_keys": 0
   },
   "links": {
     "self": {

cloudfoundry-client-reactor/src/test/resources/fixtures/uaa/authorizations/GET_response.json

@@ -66,6 +66,7 @@
   ],
   "claims_parameter_supported": false,
   "service_documentation": "http://docs.cloudfoundry.org/api/uaa/",
+  "end_session_endpoint": "http://localhost/logout.do",
   "ui_locales_supported": [
     "en-US"
   ]

cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java

@@ -81,7 +81,7 @@ public interface CloudFoundryClient {
     /**
      * The currently supported Cloud Controller API version
      */
-    String SUPPORTED_API_VERSION = "2.186.0";
+    String SUPPORTED_API_VERSION = "2.233.0";
 
     /**
      * Main entry point to the Cloud Foundry Application Usage Events Client API

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_ApplicationEntity.java

@@ -121,4 +121,11 @@ abstract class _ApplicationEntity extends AbstractApplicationEntity {
     @Nullable
     abstract String getVersion();
 
+    /**
+     * The log rate limit
+     */
+    @JsonProperty("log_rate_limit")
+    @Nullable
+    abstract Integer getLogRateLimit();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_ApplicationInstanceInfo.java

@@ -84,4 +84,11 @@ abstract class _ApplicationInstanceInfo {
     @Nullable
     abstract Long getUptime();
 
+    /**
+     * Routable
+     */
+    @JsonProperty("routable")
+    @Nullable
+    abstract String getRoutable();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_InstanceStatistics.java

@@ -46,4 +46,11 @@ abstract class _InstanceStatistics {
     @Nullable
     abstract Statistics getStatistics();
 
+     /**
+     * Routable
+     */
+    @JsonProperty("routable")
+    @Nullable
+    abstract String getRoutable();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_RestageApplicationEntity.java

@@ -79,4 +79,11 @@ abstract class _RestageApplicationEntity extends AbstractApplicationEntity {
     @Nullable
     abstract String getVersion();
 
+    /** 
+    * The log rate limit
+    */
+   @JsonProperty("log_rate_limit")
+   @Nullable
+   abstract Integer getLogRateLimit();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/applications/_Statistics.java

@@ -97,4 +97,11 @@ abstract class _Statistics {
     @Nullable
     abstract Usage getUsage();
 
+    /** 
+    * The log rate limit
+    */
+   @JsonProperty("log_rate_limit")
+   @Nullable
+   abstract Integer getLogRateLimit();
+
 }