Skip to content

Commit 9fac576

Browse files
Do not start CloudMap integration for SSM and Secrets Manager tests.
1 parent 31f4c42 commit 9fac576

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() {
189189
"--spring.cloud.aws.endpoint=http://non-existing-host/",
190190
"--spring.cloud.aws.parameterstore.endpoint=" + localstack.getEndpointOverride(SSM).toString(),
191191
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
192-
"--spring.cloud.aws.region.static=eu-west-1",
192+
"--spring.cloud.aws.region.static=eu-west-1", "--spring.cloud.aws.cloudmap.enabled=false",
193193
"--logging.level.io.awspring.cloud.parameterstore=debug")) {
194194
assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests");
195195
}
@@ -204,7 +204,7 @@ void parameterStoreClientUsesGlobalRegion() {
204204
"--spring.config.import=aws-parameterstore:/config/spring/",
205205
"--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(),
206206
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
207-
"--spring.cloud.aws.region.static=" + REGION,
207+
"--spring.cloud.aws.region.static=" + REGION, "--spring.cloud.aws.cloudmap.enabled=false",
208208
"--logging.level.io.awspring.cloud.parameterstore=debug")) {
209209
assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests");
210210
}
@@ -216,7 +216,8 @@ private ConfigurableApplicationContext runApplication(SpringApplication applicat
216216
"--spring.cloud.aws.parameterstore.region=" + REGION,
217217
"--" + endpointProperty + "=" + localstack.getEndpointOverride(SSM).toString(),
218218
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
219-
"--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.parameterstore=debug");
219+
"--spring.cloud.aws.cloudmap.enabled=false", "--spring.cloud.aws.region.static=eu-west-1",
220+
"--logging.level.io.awspring.cloud.parameterstore=debug");
220221
}
221222

222223
private ConfigurableApplicationContext runApplication(SpringApplication application, String springConfigImport) {

spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() {
228228
"--spring.cloud.aws.secretsmanager.endpoint="
229229
+ localstack.getEndpointOverride(SECRETSMANAGER).toString(),
230230
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
231-
"--spring.cloud.aws.region.static=eu-west-1")) {
231+
"--spring.cloud.aws.cloudmap.enabled=false", "--spring.cloud.aws.region.static=eu-west-1")) {
232232
assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests");
233233
}
234234
}
@@ -242,7 +242,7 @@ void secretsManagerClientUsesGlobalRegion() {
242242
"--spring.config.import=aws-secretsmanager:/config/spring;/config/second",
243243
"--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(),
244244
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
245-
"--spring.cloud.aws.region.static=" + REGION)) {
245+
"--spring.cloud.aws.cloudmap.enabled=false", "--spring.cloud.aws.region.static=" + REGION)) {
246246
assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests");
247247
}
248248
}
@@ -257,7 +257,8 @@ private ConfigurableApplicationContext runApplication(SpringApplication applicat
257257
"--spring.cloud.aws.secretsmanager.region=" + REGION,
258258
"--" + endpointProperty + "=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(),
259259
"--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop",
260-
"--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.secretsmanager=debug");
260+
"--spring.cloud.aws.cloudmap.enabled=false", "--spring.cloud.aws.region.static=eu-west-1",
261+
"--logging.level.io.awspring.cloud.secretsmanager=debug");
261262
}
262263

263264
private static void createSecret(LocalStackContainer localstack, String secretName, String parameterValue,

0 commit comments

Comments
 (0)