Skip to content

DomainsV3: fix "router_group.id" type #1326

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

Merged
Kehrlann merged 1 commit into from
Dec 11, 2025
+40 −3
Merged

DomainsV3: fix "router_group.id" type #1326

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
6 changes: 6 additions & 0 deletions ...eactor/src/test/java/org/cloudfoundry/reactor/client/v3/domains/ReactorDomainsV3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.cloudfoundry.client.v3.domains.GetDomainResponse;
import org.cloudfoundry.client.v3.domains.ListDomainsRequest;
import org.cloudfoundry.client.v3.domains.ListDomainsResponse;
import org.cloudfoundry.client.v3.domains.RouterGroup;
import org.cloudfoundry.client.v3.domains.ShareDomainRequest;
import org.cloudfoundry.client.v3.domains.ShareDomainResponse;
import org.cloudfoundry.client.v3.domains.UnshareDomainRequest;
Expand Down Expand Up @@ -279,6 +280,11 @@ void list() {
.updatedAt("2019-03-08T01:06:19Z")
.name("test-domain.com")
.isInternal(false)
.routerGroup(
RouterGroup.builder()
.id(
"5806148f-cce6-4d86-7fbd-aa269e3f6f3f")
.build())
.relationships(
DomainRelationships.builder()
.organization(
Expand Down
1 change: 1 addition & 0 deletions cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/domains/GET_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"updated_at": "2019-03-08T01:06:19Z",
"name": "test-domain.com",
"internal": false,
"router_group": { "guid": "5806148f-cce6-4d86-7fbd-aa269e3f6f3f" },
"metadata": {
"labels": {},
"annotations": {}
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/domains/_RouterGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ public abstract class _RouterGroup {
* The id of the desired router group to route tcp traffic through
*/
@JsonProperty("guid")
public abstract List<String> getId();
public abstract String getId();

}
34 changes: 32 additions & 2 deletions integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@

import java.time.Duration;
import org.cloudfoundry.AbstractIntegrationTest;
import org.cloudfoundry.client.CloudFoundryClient;
import org.cloudfoundry.client.v2.ClientV2Exception;
import org.cloudfoundry.client.v3.domains.GetDomainRequest;
import org.cloudfoundry.operations.domains.CreateDomainRequest;
import org.cloudfoundry.operations.domains.CreateSharedDomainRequest;
import org.cloudfoundry.operations.domains.Domain;
import org.cloudfoundry.operations.domains.RouterGroup;
import org.cloudfoundry.operations.domains.ShareDomainRequest;
import org.cloudfoundry.operations.domains.UnshareDomainRequest;
import org.cloudfoundry.operations.organizations.CreateOrganizationRequest;
Expand All @@ -40,6 +43,7 @@ public final class DomainsTest extends AbstractIntegrationTest {
private static final String DEFAULT_ROUTER_GROUP = "default-tcp";

@Autowired private CloudFoundryOperations cloudFoundryOperations;
@Autowired private CloudFoundryClient cloudFoundryClient;

@Autowired private String organizationName;

Expand Down Expand Up @@ -112,9 +116,35 @@ public void createSharedTcp() {
.build())
.thenMany(requestListDomains(this.cloudFoundryOperations))
.filter(domain -> domainName.equals(domain.getName()))
.map(Domain::getType)
.as(StepVerifier::create)
.expectNext("tcp")
.expectNextMatches(domain -> domain.getType().equals("tcp"))
.expectComplete()
.verify(Duration.ofMinutes(5));

this.cloudFoundryOperations
.domains()
.list()
.filter(d -> d.getName().equals(domainName))
.single()
.flatMap(
d ->
this.cloudFoundryClient
.domainsV3()
.get(
GetDomainRequest.builder()
.domainId(d.getId())
.build()))
.map(d -> d.getRouterGroup().getId())
.flatMap(
id ->
this.cloudFoundryOperations
.domains()
.listRouterGroups()
.filter(rg -> rg.getId().equals(id))
.single())
.map(RouterGroup::getName)
.as(StepVerifier::create)
.expectNext(DEFAULT_ROUTER_GROUP)
.expectComplete()
.verify(Duration.ofMinutes(5));
}
Expand Down