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

Merge branch '4.1.x' into 4.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-01-23 16:42:00 -05:00
parent fea193733f 122c792d3a
commit 21f0425c7f
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/AwsS3IntegrationTests.java
View File

@@ -64,7 +64,7 @@ public class AwsS3IntegrationTests {
@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:1.3.1"))
DockerImageName.parse("localstack/localstack:4.0.3"))
.withServices(LocalStackContainer.Service.S3);
private static ConfigurableApplicationContext server;

10
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java
View File

@@ -63,7 +63,7 @@ public class AwsParameterStoreEnvironmentRepositoryTests {
@Container
private static final LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:1.3.1"))
DockerImageName.parse("localstack/localstack:4.0.3"))
.withServices(SSM);
private final StaticCredentialsProvider staticCredentialsProvider = StaticCredentialsProvider
@@ -700,8 +700,12 @@ public class AwsParameterStoreEnvironmentRepositoryTests {
String path = StringUtils.delete(ps.getName(), environmentProperties.getOrigin());
Set<Parameter> parameters = getParameters(ps, path, withSlashesForPropertyName);
parameters.forEach(value -> {
ssmClient.putParameter(
PutParameterRequest.builder().name(value.name()).dataType("text").value(value.value()).build());
ssmClient.putParameter(PutParameterRequest.builder()
.name(value.name())
.type("String")
.dataType("text")
.value(value.value())
.build());
toBeRemoved.add(value.name());
});
}

2
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java
View File

@@ -58,7 +58,7 @@ public class AwsS3EnvironmentRepositoryTests {
@Container
private static final LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:1.3.1"))
DockerImageName.parse("localstack/localstack:4.0.3"))
.withServices(S3);
private final ConfigServerProperties server = new ConfigServerProperties();

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

@@ -66,7 +66,7 @@ public class AwsSecretsManagerEnvironmentRepositoryTests {
@Container
private static final LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:1.3.1"))
DockerImageName.parse("localstack/localstack:4.0.3"))
.withServices(SECRETSMANAGER);
private static final Log log = LogFactory.getLog(AwsSecretsManagerEnvironmentRepository.class);