Skip to content

Commit fd99d0b

Browse files
committed
Work around inability to create orgs with client credentials
AT setup was failing due to our use of client credentials in CFJC's `UaaClient`, in combination with cloudfoundry/cf-java-client#939. All AT's passing locally now with this change.
1 parent 13b6b1d commit fd99d0b

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/cf/CloudFoundryClientConfiguration.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class CloudFoundryClientConfiguration {
7575
protected CloudFoundryOperations cloudFoundryOperations(CloudFoundryProperties properties,
7676
CloudFoundryClient client,
7777
DopplerClient dopplerClient,
78-
UaaClient uaaClient) {
78+
@Qualifier("userCredentials") UaaClient uaaClient) {
7979
return DefaultCloudFoundryOperations.builder()
8080
.cloudFoundryClient(client)
8181
.dopplerClient(dopplerClient)
@@ -114,7 +114,18 @@ protected DopplerClient dopplerClient(ConnectionContext connectionContext,
114114
}
115115

116116
@Bean
117-
protected UaaClient uaaClient(ConnectionContext connectionContext,
117+
@Qualifier("userCredentials")
118+
protected UaaClient userCredentialsUaaClient(ConnectionContext connectionContext,
119+
@Qualifier("userCredentials") TokenProvider tokenProvider) {
120+
return ReactorUaaClient.builder()
121+
.connectionContext(connectionContext)
122+
.tokenProvider(tokenProvider)
123+
.build();
124+
}
125+
126+
@Bean
127+
@Qualifier("clientCredentials")
128+
protected UaaClient clientCredentialsUaaClient(ConnectionContext connectionContext,
118129
@Qualifier("clientCredentials") TokenProvider tokenProvider) {
119130
return ReactorUaaClient.builder()
120131
.connectionContext(connectionContext)

spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.slf4j.LoggerFactory;
2727
import reactor.core.publisher.Mono;
2828

29+
import org.springframework.beans.factory.annotation.Qualifier;
2930
import org.springframework.stereotype.Service;
3031

3132
@Service
@@ -35,7 +36,7 @@ public class UaaService {
3536

3637
private final UaaClient uaaClient;
3738

38-
public UaaService(UaaClient uaaClient) {
39+
public UaaService(@Qualifier("clientCredentials") UaaClient uaaClient) {
3940
this.uaaClient = uaaClient;
4041
}
4142

0 commit comments

Comments
 (0)