From 0005235ee5e6f3f1ecf6f20e44e42c14f4dfbd66 Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Wed, 11 Nov 2026 11:30:46 +0100 Subject: [PATCH 1/6] fix error handling in FeatureFlagsV3Test, #1400 --- .../client/v3/FeatureFlagsV3Test.java | 61 +++++-------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/FeatureFlagsV3Test.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/FeatureFlagsV3Test.java index 45289e4de5..4b6ae89428 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/FeatureFlagsV3Test.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/FeatureFlagsV3Test.java @@ -178,12 +178,8 @@ public void update() { .name(FLAG_NAME) .enabled(!original.getEnabled()) .build()) - .map( + .flatMap( toggled -> - toggled.getEnabled() - != original.getEnabled()) - .doFinally( - signal -> this.cloudFoundryClient .featureFlagsV3() .update( @@ -194,17 +190,10 @@ public void update() { original .getEnabled()) .build()) - .as(StepVerifier::create) - .consumeNextWith( - r -> - assertThat( - r - .getEnabled()) - .isEqualTo( - original - .getEnabled())) - .expectComplete() - .verify(Duration.ofMinutes(5)))) + .thenReturn( + toggled.getEnabled() + != original + .getEnabled()))) .as(StepVerifier::create) .expectNext(true) .expectComplete() @@ -227,9 +216,8 @@ public void updateMessage() { .name(FLAG_NAME) .customErrorMessage(newMessage) .build()) - .map(updated -> updated.getCustomErrorMessage()) - .doFinally( - signal -> + .flatMap( + updated -> this.cloudFoundryClient .featureFlagsV3() .update( @@ -240,17 +228,9 @@ public void updateMessage() { original .getCustomErrorMessage()) .build()) - .as(StepVerifier::create) - .consumeNextWith( - r -> - assertThat( - r - .getCustomErrorMessage()) - .isEqualTo( - original - .getCustomErrorMessage())) - .expectComplete() - .verify(Duration.ofMinutes(5)))) + .thenReturn( + updated + .getCustomErrorMessage()))) .as(StepVerifier::create) .expectNext(newMessage) .expectComplete() @@ -270,12 +250,8 @@ public void updateNothing() { UpdateFeatureFlagRequest.builder() .name(FLAG_NAME) .build()) - .map( + .flatMap( unchanged -> - unchanged.getEnabled() - == original.getEnabled()) - .doFinally( - signal -> this.cloudFoundryClient .featureFlagsV3() .update( @@ -286,17 +262,10 @@ public void updateNothing() { original .getEnabled()) .build()) - .as(StepVerifier::create) - .consumeNextWith( - r -> - assertThat( - r - .getEnabled()) - .isEqualTo( - original - .getEnabled())) - .expectComplete() - .verify(Duration.ofMinutes(5)))) + .thenReturn( + unchanged.getEnabled() + == original + .getEnabled()))) .as(StepVerifier::create) .expectNext(true) .expectComplete() From de0323992bde762cb32157bb5e194a8fc11cd8a2 Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Wed, 11 Nov 2026 12:00:21 +0100 Subject: [PATCH 2/6] add RoleType SPACE_SUPPORTER, fix #1392 --- .../java/org/cloudfoundry/client/v3/roles/RoleType.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/RoleType.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/RoleType.java index 6b4c75ffba..c165852b7f 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/RoleType.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/RoleType.java @@ -62,7 +62,12 @@ public enum RoleType { /** * space_manager role type */ - SPACE_MANAGER; + SPACE_MANAGER, + + /** + * space_supporter role type + */ + SPACE_SUPPORTER; public static final Set ORGANIZATION_ROLE_TYPES = EnumSet.of( @@ -72,7 +77,7 @@ public enum RoleType { ORGANIZATION_USER); public static final Set SPACE_ROLE_TYPES = - EnumSet.of(SPACE_AUDITOR, SPACE_DEVELOPER, SPACE_MANAGER); + EnumSet.of(SPACE_AUDITOR, SPACE_DEVELOPER, SPACE_MANAGER, SPACE_SUPPORTER); private static final Map NAMES_TO_VALUES = Arrays.stream(RoleType.values()) From bede90d8b231f8efcbe081511a4ee52ee2a7fc21 Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Tue, 17 Nov 2026 00:14:50 +0100 Subject: [PATCH 3/6] Update API Version to latest --- .../main/java/org/cloudfoundry/client/CloudFoundryClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java index ab8353fead..3f4a94896a 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java @@ -86,9 +86,9 @@ public interface CloudFoundryClient { /** * The currently supported Cloud Controller API version */ - String SUPPORTED_API_VERSION = "2.291.0"; + String SUPPORTED_API_VERSION = "2.302.0"; - String SUPPORTED_API_VERSION_V3 = "3.225.0"; + String SUPPORTED_API_VERSION_V3 = "3.237.0"; /** * Main entry point to the Cloud Foundry Application Usage Events Client API From 01772f22e945c41efe5ea6fd15874c314f4e87df Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Tue, 17 Nov 2026 13:40:31 +0100 Subject: [PATCH 4/6] try previous version --- .../main/java/org/cloudfoundry/client/CloudFoundryClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java index 3f4a94896a..f952dc162b 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/CloudFoundryClient.java @@ -86,9 +86,9 @@ public interface CloudFoundryClient { /** * The currently supported Cloud Controller API version */ - String SUPPORTED_API_VERSION = "2.302.0"; + String SUPPORTED_API_VERSION = "2.301.0"; - String SUPPORTED_API_VERSION_V3 = "3.237.0"; + String SUPPORTED_API_VERSION_V3 = "3.236.0"; /** * Main entry point to the Cloud Foundry Application Usage Events Client API From f246e9b44402eedab81093db9edb06e8cd6441cc Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Tue, 17 Nov 2026 13:47:16 +0100 Subject: [PATCH 5/6] update integration-test action to matching version. --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index c27d202142..b92ce61ef8 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -80,7 +80,7 @@ jobs: - name: Write CAPI values override if: ${{ steps.capi.outputs.version != '' }} env: - MIN_CAPI_VERSION: 1.241.0 + MIN_CAPI_VERSION: 1.251.0 MATCHED_CAPI_VERSION: ${{ steps.capi.outputs.version }} run: | version="$(printf '%s\n%s\n' "$MIN_CAPI_VERSION" "$MATCHED_CAPI_VERSION" | sort -V | tail -1)" From f4679c1ac5cb6def4a3363112f80de3a8b953f4d Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Tue, 17 Nov 2026 15:29:23 +0100 Subject: [PATCH 6/6] latest capi version is not supported by v0.26.0 --- .github/workflows/integration-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index b92ce61ef8..f5165a34a0 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -94,9 +94,9 @@ jobs: EOF # Every job gets its own Cloud Foundry on KinD, so the matrix can run in parallel. - name: Set up Cloud Foundry - uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@b42a88a35756595bd4108d2b525ded5b014a9515 # v0.26.0 + uses: cloudfoundry/kind-deployment/.github/actions/setup-cf@main with: - ref: b42a88a35756595bd4108d2b525ded5b014a9515 + ref: main use-latest-versions: ${{ (inputs.preview || github.event_name == 'schedule') }} github-token: ${{ github.token }} additional-values-files: ${{ runner.temp }}/cf-values.yaml