Merge branch '4.1.x' into 4.2.x

spring-cloud · Jan 23, 2025 · 21f0425 · 21f0425
2 parents fea1937 + 122c792
commit 21f0425
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...g-server/src/test/java/org/springframework/cloud/config/server/AwsS3IntegrationTests.java b/...g-server/src/test/java/org/springframework/cloud/config/server/AwsS3IntegrationTests.java
@@ -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;

diff --git a/...ramework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java b/...ramework/cloud/config/server/environment/AwsParameterStoreEnvironmentRepositoryTests.java
@@ -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 @@ private void putParameters(Environment environment, boolean withSlashesForProper
 			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());
 			});
 		}

diff --git a/.../org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java b/.../org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryTests.java
@@ -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();

diff --git a/...ramework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java b/...ramework/cloud/config/server/environment/AwsSecretsManagerEnvironmentRepositoryTests.java
@@ -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);