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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2021-07-27 20:48:11 +00:00
parent 523caa83f9
commit fa21f2d02b
5 changed files with 229 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
View File

@@ -104,19 +104,15 @@ import org.springframework.vault.core.VaultTemplate;
* @author Tejas Pandilwar
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties({ SvnKitEnvironmentProperties.class,
CredhubEnvironmentProperties.class, JdbcEnvironmentProperties.class,
NativeEnvironmentProperties.class, VaultEnvironmentProperties.class,
@EnableConfigurationProperties({ SvnKitEnvironmentProperties.class, CredhubEnvironmentProperties.class,
JdbcEnvironmentProperties.class, NativeEnvironmentProperties.class, VaultEnvironmentProperties.class,
RedisEnvironmentProperties.class, AwsS3EnvironmentProperties.class,
AwsSecretsManagerEnvironmentProperties.class })
@Import({ CompositeRepositoryConfiguration.class, JdbcRepositoryConfiguration.class,
VaultConfiguration.class, VaultRepositoryConfiguration.class,
SpringVaultRepositoryConfiguration.class, CredhubConfiguration.class,
CredhubRepositoryConfiguration.class, SvnRepositoryConfiguration.class,
NativeRepositoryConfiguration.class, GitRepositoryConfiguration.class,
RedisRepositoryConfiguration.class, GoogleCloudSourceConfiguration.class,
AwsS3RepositoryConfiguration.class,
AwsSecretsManagerRepositoryConfiguration.class,
@Import({ CompositeRepositoryConfiguration.class, JdbcRepositoryConfiguration.class, VaultConfiguration.class,
VaultRepositoryConfiguration.class, SpringVaultRepositoryConfiguration.class, CredhubConfiguration.class,
CredhubRepositoryConfiguration.class, SvnRepositoryConfiguration.class, NativeRepositoryConfiguration.class,
GitRepositoryConfiguration.class, RedisRepositoryConfiguration.class, GoogleCloudSourceConfiguration.class,
AwsS3RepositoryConfiguration.class, AwsSecretsManagerRepositoryConfiguration.class,
DefaultRepositoryConfiguration.class })
public class EnvironmentRepositoryConfiguration {
@@ -220,8 +216,7 @@ public class EnvironmentRepositoryConfiguration {
@Bean
public AwsSecretsManagerEnvironmentRepositoryFactory awsSecretsManagerEnvironmentRepositoryFactory(
ConfigServerProperties configServerProperties) {
return new AwsSecretsManagerEnvironmentRepositoryFactory(
configServerProperties);
return new AwsSecretsManagerEnvironmentRepositoryFactory(configServerProperties);
}
}

7
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentProperties.java
View File

@@ -27,8 +27,7 @@ import org.springframework.core.Ordered;
* @author Tejas Pandilwar
*/
@ConfigurationProperties("spring.cloud.config.server.aws-secretsmanager")
public class AwsSecretsManagerEnvironmentProperties
implements EnvironmentRepositoryProperties {
public class AwsSecretsManagerEnvironmentProperties implements EnvironmentRepositoryProperties {
static final String DEFAULT_PATH_SEPARATOR = "/";
@@ -44,8 +43,8 @@ public class AwsSecretsManagerEnvironmentProperties
private String region;
/**
* The endpoint to be used by AWS Secrets Manager client.
* This can be used to specify an alternate endpoint for the API requests.
* The endpoint to be used by AWS Secrets Manager client. This can be used to specify
* an alternate endpoint for the API requests.
*/
private String endpoint;

27
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepository.java
View File

@@ -42,8 +42,7 @@ import static org.springframework.cloud.config.server.environment.AwsSecretsMana
*/
public class AwsSecretsManagerEnvironmentRepository implements EnvironmentRepository {
private static final Log log = LogFactory
.getLog(AwsSecretsManagerEnvironmentRepository.class);
private static final Log log = LogFactory.getLog(AwsSecretsManagerEnvironmentRepository.class);
private final ObjectMapper objectMapper;
@@ -64,8 +63,7 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
@Override
public Environment findOne(String application, String profileList, String label) {
final String defaultApplication = configServerProperties
.getDefaultApplicationName();
final String defaultApplication = configServerProperties.getDefaultApplicationName();
final String defaultProfile = configServerProperties.getDefaultProfile();
if (StringUtils.isEmpty(application)) {
@@ -76,10 +74,8 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
profileList = defaultProfile;
}
String[] profiles = StringUtils.trimArrayElements(
StringUtils.commaDelimitedListToStringArray(profileList));
Environment environment = new Environment(application, profiles, label, null,
null);
String[] profiles = StringUtils.trimArrayElements(StringUtils.commaDelimitedListToStringArray(profileList));
Environment environment = new Environment(application, profiles, label, null, null);
Map<String, String> overrides = configServerProperties.getOverrides();
if (!overrides.isEmpty()) {
@@ -97,8 +93,7 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
addPropertySource(environment, application, defaultProfile);
}
if (!Arrays.asList(profiles).contains(defaultProfile)
&& !defaultApplication.equals(application)) {
if (!Arrays.asList(profiles).contains(defaultProfile) && !defaultApplication.equals(application)) {
addPropertySource(environment, defaultApplication, defaultProfile);
}
@@ -111,14 +106,12 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
return environment;
}
private void addPropertySource(Environment environment, String application,
String profile) {
private void addPropertySource(Environment environment, String application, String profile) {
String path = buildPath(application, profile);
Map<Object, Object> properties = findProperties(path);
if (!properties.isEmpty()) {
environment.add(new PropertySource(environmentProperties.getOrigin() + path,
properties));
environment.add(new PropertySource(environmentProperties.getOrigin() + path, properties));
}
}
@@ -130,8 +123,7 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
return prefix + DEFAULT_PATH_SEPARATOR + application + DEFAULT_PATH_SEPARATOR;
}
else {
return prefix + DEFAULT_PATH_SEPARATOR + application + profileSeparator
+ profile + DEFAULT_PATH_SEPARATOR;
return prefix + DEFAULT_PATH_SEPARATOR + application + profileSeparator + profile + DEFAULT_PATH_SEPARATOR;
}
}
@@ -143,8 +135,7 @@ public class AwsSecretsManagerEnvironmentRepository implements EnvironmentReposi
GetSecretValueResult response = awsSmClient.getSecretValue(request);
if (response != null) {
Map<String, Object> secretMap = objectMapper.readValue(
response.getSecretString(),
Map<String, Object> secretMap = objectMapper.readValue(response.getSecretString(),
new TypeReference<Map<String, Object>>() {
});

12
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryFactory.java
View File

@@ -32,16 +32,13 @@ public class AwsSecretsManagerEnvironmentRepositoryFactory implements
private final ConfigServerProperties configServerProperties;
public AwsSecretsManagerEnvironmentRepositoryFactory(
ConfigServerProperties configServerProperties) {
public AwsSecretsManagerEnvironmentRepositoryFactory(ConfigServerProperties configServerProperties) {
this.configServerProperties = configServerProperties;
}
@Override
public AwsSecretsManagerEnvironmentRepository build(
AwsSecretsManagerEnvironmentProperties environmentProperties) {
AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder
.standard();
public AwsSecretsManagerEnvironmentRepository build(AwsSecretsManagerEnvironmentProperties environmentProperties) {
AWSSecretsManagerClientBuilder clientBuilder = AWSSecretsManagerClientBuilder.standard();
String region = environmentProperties.getRegion();
if (!StringUtils.isEmpty(region)) {
@@ -57,8 +54,7 @@ public class AwsSecretsManagerEnvironmentRepositoryFactory implements
}
AWSSecretsManager client = clientBuilder.build();
return new AwsSecretsManagerEnvironmentRepository(client, configServerProperties,
environmentProperties);
return new AwsSecretsManagerEnvironmentRepository(client, configServerProperties, environmentProperties);
}
}

494
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java
View File

@@ -47,11 +47,9 @@ import static org.mockito.Mockito.when;
*/
public class AwsSecretsManagerEnvironmentRepositoryTests {
private static final Log log = LogFactory
.getLog(AwsSecretsManagerEnvironmentRepository.class);
private static final Log log = LogFactory.getLog(AwsSecretsManagerEnvironmentRepository.class);
private final AWSSecretsManager awsSmClientMock = mock(AWSSecretsManager.class,
"aws-sm-client-mock");
private final AWSSecretsManager awsSmClientMock = mock(AWSSecretsManager.class, "aws-sm-client-mock");
private final ConfigServerProperties configServerProperties = new ConfigServerProperties();
@@ -60,8 +58,7 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
private final AwsSecretsManagerEnvironmentRepository repository = new AwsSecretsManagerEnvironmentRepository(
awsSmClientMock, configServerProperties, environmentProperties);
private final ObjectMapper objectMapper = new ObjectMapper()
.configure(SerializationFeature.INDENT_OUTPUT, true);
private final ObjectMapper objectMapper = new ObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, true);
@Test
public void testFindOneWithNullApplicationAndNullProfile() {
@@ -72,24 +69,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(defaultProfile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(defaultApplication, profiles, null,
null, null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(defaultApplication, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -100,24 +94,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(defaultApplication, profiles, null,
null, null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(defaultApplication, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -128,24 +119,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(defaultApplication, profiles, null,
null, null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(defaultApplication, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -156,28 +144,26 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(defaultApplication, profiles, null,
null, null);
expectedEnv.addAll(Arrays.asList(applicationProdProperties,
applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(defaultApplication, profiles, null, null, null);
expectedEnv
.addAll(Arrays.asList(applicationProdProperties, applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -188,24 +174,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(defaultProfile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -215,24 +198,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -242,24 +222,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -269,28 +246,26 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(applicationProdProperties,
applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv
.addAll(Arrays.asList(applicationProdProperties, applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -301,24 +276,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(defaultProfile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -328,24 +300,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -355,24 +324,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(
Arrays.asList(applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -382,28 +348,26 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(applicationProdProperties,
applicationDefaultProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv
.addAll(Arrays.asList(applicationProdProperties, applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -414,32 +378,28 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(defaultProfile);
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
getFooDefaultProperties());
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, getFooDefaultProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties,
applicationDefaultProperties, fooProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties, applicationDefaultProperties, fooProperties,
applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -449,32 +409,28 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
getFooDefaultProperties());
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, getFooDefaultProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties,
applicationDefaultProperties, fooProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties, applicationDefaultProperties, fooProperties,
applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -484,32 +440,28 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
getFooDefaultProperties());
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, getFooDefaultProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties,
applicationDefaultProperties, fooProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooDefaultProperties, applicationDefaultProperties, fooProperties,
applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -519,23 +471,20 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -545,28 +494,24 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, fooProperties,
applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(applicationDefaultProperties, fooProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -576,41 +521,35 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooProdPropertiesName = "aws:secrets:/secret/foo-prod/";
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName,
getFooProdProperties());
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName, getFooProdProperties());
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
getFooDefaultProperties());
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, getFooDefaultProperties());
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties,
fooDefaultProperties, applicationDefaultProperties, fooProperties,
applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties, fooDefaultProperties,
applicationDefaultProperties, fooProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -620,32 +559,28 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooProdPropertiesName = "aws:secrets:/secret/foo-prod/";
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName,
getFooProdProperties());
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName, getFooProdProperties());
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties,
fooProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(
Arrays.asList(fooProdProperties, applicationProdProperties, fooProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -655,49 +590,43 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooProdPropertiesName = "aws:secrets:/secret/foo-prod/";
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName,
getFooProdProperties());
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName, getFooProdProperties());
String fooEastPropertiesName = "aws:secrets:/secret/foo-east/";
PropertySource fooEastProperties = new PropertySource(fooEastPropertiesName,
getFooEastProperties());
PropertySource fooEastProperties = new PropertySource(fooEastPropertiesName, getFooEastProperties());
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String fooDefaultPropertiesName = "aws:secrets:/secret/foo-default/";
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName,
getFooDefaultProperties());
PropertySource fooDefaultProperties = new PropertySource(fooDefaultPropertiesName, getFooDefaultProperties());
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
String applicationEastPropertiesName = "aws:secrets:/secret/application-east/";
PropertySource applicationEastProperties = new PropertySource(
applicationEastPropertiesName, getApplicationEastProperties());
PropertySource applicationEastProperties = new PropertySource(applicationEastPropertiesName,
getApplicationEastProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties,
fooEastProperties, applicationEastProperties, fooDefaultProperties,
applicationDefaultProperties, fooProperties, applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties, fooEastProperties,
applicationEastProperties, fooDefaultProperties, applicationDefaultProperties, fooProperties,
applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -707,41 +636,35 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
String fooProdPropertiesName = "aws:secrets:/secret/foo-prod/";
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName,
getFooProdProperties());
PropertySource fooProdProperties = new PropertySource(fooProdPropertiesName, getFooProdProperties());
String fooEastPropertiesName = "aws:secrets:/secret/foo-east/";
PropertySource fooEastProperties = new PropertySource(fooEastPropertiesName,
getFooEastProperties());
PropertySource fooEastProperties = new PropertySource(fooEastPropertiesName, getFooEastProperties());
String fooPropertiesName = "aws:secrets:/secret/foo/";
PropertySource fooProperties = new PropertySource(fooPropertiesName,
getFooProperties());
PropertySource fooProperties = new PropertySource(fooPropertiesName, getFooProperties());
String applicationProdPropertiesName = "aws:secrets:/secret/application-prod/";
PropertySource applicationProdProperties = new PropertySource(
applicationProdPropertiesName, getApplicationProdProperties());
PropertySource applicationProdProperties = new PropertySource(applicationProdPropertiesName,
getApplicationProdProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
String applicationEastPropertiesName = "aws:secrets:/secret/application-east/";
PropertySource applicationEastProperties = new PropertySource(
applicationEastPropertiesName, getApplicationEastProperties());
PropertySource applicationEastProperties = new PropertySource(applicationEastPropertiesName,
getApplicationEastProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties,
fooEastProperties, applicationEastProperties, fooProperties,
applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(fooProdProperties, applicationProdProperties, fooEastProperties,
applicationEastProperties, fooProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -761,24 +684,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
PropertySource overrideProperties = new PropertySource("overrides", overrides);
String applicationDefaultPropertiesName = "aws:secrets:/secret/application-default/";
PropertySource applicationDefaultProperties = new PropertySource(
applicationDefaultPropertiesName, getApplicationDefaultProperties());
PropertySource applicationDefaultProperties = new PropertySource(applicationDefaultPropertiesName,
getApplicationDefaultProperties());
String applicationPropertiesName = "aws:secrets:/secret/application/";
PropertySource applicationProperties = new PropertySource(
applicationPropertiesName, getApplicationProperties());
PropertySource applicationProperties = new PropertySource(applicationPropertiesName,
getApplicationProperties());
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
expectedEnv.addAll(Arrays.asList(overrideProperties, applicationDefaultProperties,
applicationProperties));
Environment expectedEnv = new Environment(application, profiles, null, null, null);
expectedEnv.addAll(Arrays.asList(overrideProperties, applicationDefaultProperties, applicationProperties));
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
@Test
@@ -787,26 +707,21 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
String profile = configServerProperties.getDefaultProfile();
String[] profiles = StringUtils.commaDelimitedListToStringArray(profile);
Environment expectedEnv = new Environment(application, profiles, null, null,
null);
Environment expectedEnv = new Environment(application, profiles, null, null, null);
setupAwsSmClientMocks(expectedEnv);
Environment resultEnv = repository.findOne(application, profile, null);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking()
.isEqualTo(expectedEnv);
assertThat(resultEnv).usingRecursiveComparison().withStrictTypeChecking().isEqualTo(expectedEnv);
}
private void setupAwsSmClientMocks(Environment environment) {
for (PropertySource ps : environment.getPropertySources()) {
String path = StringUtils.delete(ps.getName(),
environmentProperties.getOrigin());
GetSecretValueRequest request = new GetSecretValueRequest()
.withSecretId(path);
String path = StringUtils.delete(ps.getName(), environmentProperties.getOrigin());
GetSecretValueRequest request = new GetSecretValueRequest().withSecretId(path);
String secrets = getSecrets(ps);
GetSecretValueResult response = new GetSecretValueResult()
.withSecretString(secrets);
GetSecretValueResult response = new GetSecretValueResult().withSecretString(secrets);
when(awsSmClientMock.getSecretValue(eq(request))).thenReturn(response);
}
@@ -894,4 +809,5 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
}
};
}
}