From efca87a50839085bd06509bf3443b5340cf43a67 Mon Sep 17 00:00:00 2001 From: Lukasz Nyrc Date: Tue, 18 Jun 2019 17:15:39 +0200 Subject: [PATCH] Rename config properties in ContextCredentialsAutoConfiguration to kebab case to enable Spring Boot relaxed binding - resolves gh #406 --- .../ContextCredentialsAutoConfiguration.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/context/ContextCredentialsAutoConfiguration.java b/spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/context/ContextCredentialsAutoConfiguration.java index 7df2d24e0..813041af1 100644 --- a/spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/context/ContextCredentialsAutoConfiguration.java +++ b/spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/context/ContextCredentialsAutoConfiguration.java @@ -83,12 +83,12 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, } Boolean useDefaultCredentialsChain = this.environment.getProperty( - AWS_CREDENTIALS_PROPERTY_PREFIX + ".useDefaultAwsCredentialsChain", + AWS_CREDENTIALS_PROPERTY_PREFIX + ".use-default-aws-credentials-chain", Boolean.class, false); String accessKey = this.environment - .getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".accessKey"); + .getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".access-key"); String secretKey = this.environment - .getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".secretKey"); + .getProperty(AWS_CREDENTIALS_PROPERTY_PREFIX + ".secret-key"); if (useDefaultCredentialsChain && (StringUtils.isEmpty(accessKey) || StringUtils.isEmpty(secretKey))) { registerDefaultAWSCredentialsProvider(registry); @@ -96,15 +96,15 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, else { registerCredentialsProvider(registry, accessKey, secretKey, this.environment.getProperty( - AWS_CREDENTIALS_PROPERTY_PREFIX + ".instanceProfile", + AWS_CREDENTIALS_PROPERTY_PREFIX + ".instance-profile", Boolean.class, true) && !this.environment.containsProperty( - AWS_CREDENTIALS_PROPERTY_PREFIX + ".accessKey"), + AWS_CREDENTIALS_PROPERTY_PREFIX + ".access-key"), this.environment.getProperty( - AWS_CREDENTIALS_PROPERTY_PREFIX + ".profileName", + AWS_CREDENTIALS_PROPERTY_PREFIX + ".profile-name", DEFAULT_PROFILE_NAME), this.environment.getProperty( - AWS_CREDENTIALS_PROPERTY_PREFIX + ".profilePath")); + AWS_CREDENTIALS_PROPERTY_PREFIX + ".profile-path")); } }