SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes merge mistakes

Browse Source
This commit is contained in:
spencergibb
2021-03-29 17:08:11 -04:00
parent 81585fe09e
commit b884f2088c
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>2.2.7.BUILD-SNAPSHOT</version>
<version>3.0.4-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

8
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/authentication/PcfClientAuthenticationProvider.java
View File

@@ -52,10 +52,6 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
else {
builder.instanceCertificate(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_CERT")));
}
else {
builder.instanceCertificate(new ResourceCredentialSupplier(
resolveEnvVariable("CF_INSTANCE_CERT")));
}
if (pcfProperties.getInstanceKey() != null) {
builder.instanceKey(new ResourceCredentialSupplier(pcfProperties.getInstanceKey()));
@@ -63,10 +59,6 @@ public class PcfClientAuthenticationProvider extends SpringVaultClientAuthentica
else {
builder.instanceKey(new ResourceCredentialSupplier(resolveEnvVariable("CF_INSTANCE_KEY")));
}
else {
builder.instanceKey(new ResourceCredentialSupplier(
resolveEnvVariable("CF_INSTANCE_KEY")));
}
return new PcfAuthentication(builder.build(), vaultRestOperations);
}