Skip to content

Commit 2d14ea2

Browse files
lukasznyrcmaciejwalkowiak
authored andcommitted
Rename config properties in ContextCredentialsAutoConfiguration to kebab case to enable Spring Boot relaxed binding.
Fixes spring-attic#406 Closes spring-attic#407
1 parent 3f4ad74 commit 2d14ea2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/context/ContextCredentialsAutoConfiguration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,28 +83,28 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
8383
}
8484

8585
Boolean useDefaultCredentialsChain = this.environment.getProperty(
86-
AWS_CREDENTIALS_PROPERTY_PREFIX + ".useDefaultAwsCredentialsChain",
86+
AWS_CREDENTIALS_PROPERTY_PREFIX + ".use-default-aws-credentials-chain",
8787
Boolean.class, false);
8888
String accessKey = this.environment
89-
.getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".accessKey");
89+
.getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".access-key");
9090
String secretKey = this.environment
91-
.getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".secretKey");
91+
.getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".secret-key");
9292
if (useDefaultCredentialsChain && (StringUtils.isEmpty(accessKey)
9393
|| StringUtils.isEmpty(secretKey))) {
9494
registerDefaultAWSCredentialsProvider(registry);
9595
}
9696
else {
9797
registerCredentialsProvider(registry, accessKey, secretKey,
9898
this.environment.getProperty(
99-
AWS_CREDENTIALS_PROPERTY_PREFIX + ".instanceProfile",
99+
AWS_CREDENTIALS_PROPERTY_PREFIX + ".instance-profile",
100100
Boolean.class, true)
101101
&& !this.environment.containsProperty(
102-
AWS_CREDENTIALS_PROPERTY_PREFIX + ".accessKey"),
102+
AWS_CREDENTIALS_PROPERTY_PREFIX + ".access-key"),
103103
this.environment.getProperty(
104-
AWS_CREDENTIALS_PROPERTY_PREFIX + ".profileName",
104+
AWS_CREDENTIALS_PROPERTY_PREFIX + ".profile-name",
105105
DEFAULT_PROFILE_NAME),
106106
this.environment.getProperty(
107-
AWS_CREDENTIALS_PROPERTY_PREFIX + ".profilePath"));
107+
AWS_CREDENTIALS_PROPERTY_PREFIX + ".profile-path"));
108108
}
109109
}
110110

0 commit comments

Comments
 (0)