From 2bcc215cf72c75defa1d96b680191cddcb0696cb Mon Sep 17 00:00:00 2001 From: Georg Lokowandt Date: Tue, 29 Oct 2024 16:58:10 +0100 Subject: [PATCH] more changes to make integration tests run These changes are required to make this call succeed: ./mvnw -Pintegration-test clean test -Dtest=org.cloudfoundry.operations.ApplicationsTest#pushNoRoute I did not run the complete integration test suite. --- .../_IdentityZoneConfiguration.java | 7 ++ .../IntegrationTestConfiguration.java | 70 ++++++++++++------- 2 files changed, 51 insertions(+), 26 deletions(-) diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java index 0c98a54a24..87a7544c66 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java +++ b/cloudfoundry-client/src/main/java/org/cloudfoundry/uaa/identityzones/_IdentityZoneConfiguration.java @@ -65,6 +65,13 @@ abstract class _IdentityZoneConfiguration { @Nullable abstract CorsPolicy getCorsPolicy(); + /** + * The default identity provider + */ + @JsonProperty("defaultIdentityProvider") + @Nullable + abstract String getDefaultIdentityProvider(); + /** * The issuer of this zone */ diff --git a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java index 5aed533645..4b37fee3da 100644 --- a/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java +++ b/integration-test/src/test/java/org/cloudfoundry/IntegrationTestConfiguration.java @@ -196,7 +196,9 @@ ReactorUaaClient adminUaaClient( @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono> client( - @Qualifier("admin") UaaClient uaaClient, String clientId, String clientSecret) { + @Qualifier("admin") UaaClient uaaClient, + @Qualifier("clientId") String clientId, + @Qualifier("clientSecret") String clientSecret) { return uaaClient .clients() .create( @@ -234,7 +236,7 @@ CloudFoundryCleaner cloudFoundryCleaner( @Qualifier("admin") CloudFoundryClient cloudFoundryClient, NameFactory nameFactory, @Qualifier("admin") NetworkingClient networkingClient, - Version serverVersion, + @Qualifier("serverVersion") Version serverVersion, @Qualifier("admin") UaaClient uaaClient) { return new CloudFoundryCleaner( @@ -242,6 +244,7 @@ CloudFoundryCleaner cloudFoundryCleaner( } @Bean + @Qualifier("nonAdmin") ReactorCloudFoundryClient cloudFoundryClient( ConnectionContext connectionContext, TokenProvider tokenProvider) { return ReactorCloudFoundryClient.builder() @@ -252,13 +255,13 @@ ReactorCloudFoundryClient cloudFoundryClient( @Bean DefaultCloudFoundryOperations cloudFoundryOperations( - CloudFoundryClient cloudFoundryClient, + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, DopplerClient dopplerClient, - NetworkingClient networkingClient, + @Qualifier("nonAdmin") NetworkingClient networkingClient, RoutingClient routingClient, - UaaClient uaaClient, - String organizationName, - String spaceName) { + @Qualifier("nonAdmin") UaaClient uaaClient, + @Qualifier("organizationName") String organizationName, + @Qualifier("spaceName") String spaceName) { return DefaultCloudFoundryOperations.builder() .cloudFoundryClient(cloudFoundryClient) .dopplerClient(dopplerClient) @@ -332,7 +335,9 @@ RandomNameFactory nameFactory(Random random) { @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono metricRegistrarServiceInstance( - CloudFoundryClient cloudFoundryClient, Mono spaceId, NameFactory nameFactory) { + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, + @Qualifier("spaceId") Mono spaceId, + NameFactory nameFactory) { return spaceId.flatMap( spaceIdValue -> cloudFoundryClient @@ -348,6 +353,7 @@ Mono metricRegistrarServiceInstance( } @Bean + @Qualifier("nonAdmin") NetworkingClient networkingClient( ConnectionContext connectionContext, TokenProvider tokenProvider) { return ReactorNetworkingClient.builder() @@ -359,10 +365,10 @@ NetworkingClient networkingClient( @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono organizationId( - CloudFoundryClient cloudFoundryClient, - String organizationName, - String organizationQuotaName, - Mono userId) { + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, + @Qualifier("organizationName") String organizationName, + @Qualifier("organizationQuotaName") String organizationQuotaName, + @Qualifier("userId") Mono userId) { return userId.flatMap( userId1 -> cloudFoundryClient @@ -460,12 +466,12 @@ Version serverVersion(@Qualifier("admin") CloudFoundryClient cloudFoundryClient) @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono serviceBrokerId( - CloudFoundryClient cloudFoundryClient, + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, NameFactory nameFactory, - String planName, - String serviceBrokerName, - String serviceName, - Mono spaceId) { + @Qualifier("planName") String planName, + @Qualifier("serviceBrokerName") String serviceBrokerName, + @Qualifier("serviceName") String serviceName, + @Qualifier("spaceId") Mono spaceId) { return spaceId.flatMap( spaceId1 -> ServiceBrokerUtils.createServiceBroker( @@ -502,7 +508,9 @@ String serviceName(NameFactory nameFactory) { @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono spaceId( - CloudFoundryClient cloudFoundryClient, Mono organizationId, String spaceName) { + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, + @Qualifier("organizationId") Mono organizationId, + @Qualifier("spaceName") String spaceName) { return organizationId .flatMap( orgId -> @@ -527,7 +535,9 @@ String spaceName(NameFactory nameFactory) { @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") - Mono stackId(CloudFoundryClient cloudFoundryClient, String stackName) { + Mono stackId( + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, + @Qualifier("stackName") String stackName) { return PaginationUtils.requestClientV2Resources( page -> cloudFoundryClient @@ -553,11 +563,12 @@ String stackName() { @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") Mono testLogCacheApp( - CloudFoundryClient cloudFoundryClient, - Mono spaceId, - Mono metricRegistrarServiceInstance, - String testLogCacheAppName, - String testLogCacheHostName, + @Qualifier("nonAdmin") CloudFoundryClient cloudFoundryClient, + @Qualifier("spaceId") Mono spaceId, + @Qualifier("metricRegistrarServiceInstance") + Mono metricRegistrarServiceInstance, + @Qualifier("testLogCacheAppName") String testLogCacheAppName, + @Qualifier("testLogCacheHostName") String testLogCacheHostName, Path testLogCacheAppbits) { return metricRegistrarServiceInstance .zipWith(spaceId) @@ -604,7 +615,10 @@ String testLogCacheHostName(NameFactory nameFactory) { @Bean @DependsOn({"client", "userId"}) PasswordGrantTokenProvider tokenProvider( - String clientId, String clientSecret, String password, String username) { + @Qualifier("clientId") String clientId, + @Qualifier("clientSecret") String clientSecret, + @Qualifier("password") String password, + @Qualifier("username") String username) { return PasswordGrantTokenProvider.builder() .clientId(clientId) .clientSecret(clientSecret) @@ -614,6 +628,7 @@ PasswordGrantTokenProvider tokenProvider( } @Bean + @Qualifier("nonAdmin") ReactorUaaClient uaaClient(ConnectionContext connectionContext, TokenProvider tokenProvider) { return ReactorUaaClient.builder() .connectionContext(connectionContext) @@ -623,7 +638,10 @@ ReactorUaaClient uaaClient(ConnectionContext connectionContext, TokenProvider to @Bean(initMethod = "block") @DependsOn("cloudFoundryCleaner") - Mono userId(@Qualifier("admin") UaaClient uaaClient, String password, String username) { + Mono userId( + @Qualifier("admin") UaaClient uaaClient, + @Qualifier("password") String password, + @Qualifier("username") String username) { return uaaClient .users() .create(