Skip to content

Commit

Permalink
Upgrade LocalStack to 3.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
maciejwalkowiak committed Sep 18, 2024
1 parent cdfdaa8 commit 92cd5a8
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/testing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class LocalstackAwsClientFactoryTest {
@Container
private LocalStackContainer localStackContainer = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));
@Test
void aTest() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ParameterStoreConfigDataLoaderIntegrationTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@BeforeAll
static void beforeAll() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import java.time.Duration;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -74,7 +75,7 @@ class SecretsManagerConfigDataLoaderIntegrationTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@TempDir
static Path tokenTempDir;
Expand Down Expand Up @@ -147,14 +148,16 @@ void resolvesPropertyFromSecretsManager_PlainTextSecret_endingWithSlash() {
}

@Test
@Disabled
void resolvesPropertyFromSecretsManager_SecretBinary() {
SpringApplication application = new SpringApplication(App.class);
application.setWebApplicationType(WebApplicationType.NONE);

try (ConfigurableApplicationContext context = runApplication(application,
"aws-secretsmanager:/blob/byte_certificate")) {
assertThat(context.getEnvironment().getProperty("byte_certificate", byte[].class))
.isEqualTo("My certificate".getBytes(StandardCharsets.UTF_8));
byte[] byteCertificates = context.getEnvironment().getProperty("byte_certificate", byte[].class);
System.out.println(new String(byteCertificates, StandardCharsets.UTF_8));
assertThat(byteCertificates).isEqualTo("My certificate".getBytes(StandardCharsets.UTF_8));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class CloudWatchExportAutoConfigurationIntegrationTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@DynamicPropertySource
static void registerProperties(DynamicPropertyRegistry registry) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class SqsAutoConfigurationIntegrationTest {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

static {
localstack.start();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class DynamoDbTemplateIntegrationTest {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@BeforeAll
public static void createTable() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ static class TestConfiguration {
@Bean
LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) {

var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0"));
var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2"));

registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static class TestConfiguration {
@Bean
LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) {

var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0"));
var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2"));

registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class S3PathMatchingResourcePatternResolverTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

private static ResourcePatternResolver resourceLoader;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class S3ResourceIntegrationTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

private static S3Client client;
private static S3AsyncClient asyncClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class S3TemplateIntegrationTests {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

private static S3Client client;

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-aws-samples/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"
services:
localstack:
container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}"
image: localstack/localstack:3.2.0
image: localstack/localstack:3.7.2
ports:
- "127.0.0.1:4566:4566" # LocalStack Gateway
- "127.0.0.1:4510-4559:4510-4559" # external services port range
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static class AppConfiguration {
@Bean
@ServiceConnection
LocalStackContainer localStackContainer() {
return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0"));
return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2"));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class SnsTemplateIntegrationTest {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@BeforeAll
public static void createSnsTemplate() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SnsSmsTemplateIntegrationTest {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0")).withEnv("DEBUG", "1");
DockerImageName.parse("localstack/localstack:3.7.2")).withEnv("DEBUG", "1");

@BeforeAll
public static void createSnsTemplate() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ abstract class BaseSqsIntegrationTest {

protected static boolean waitForPurge = false;

private static final String LOCAL_STACK_VERSION = "localstack/localstack:3.2.0";
private static final String LOCAL_STACK_VERSION = "localstack/localstack:3.7.2";

static LocalStackContainer localstack = new LocalStackContainer(DockerImageName.parse(LOCAL_STACK_VERSION));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ abstract class BaseSqsIntegrationTest {

@Container
static LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@BeforeAll
static void beforeAll() throws IOException, InterruptedException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AwsContainerConnectionDetailsFactoryTest {
@Container
@ServiceConnection
static final LocalStackContainer localstack = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@Autowired(required = false)
private AwsConnectionDetails connectionDetails;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class LocalstackAwsClientFactoryTest {

@Container
private LocalStackContainer localStackContainer = new LocalStackContainer(
DockerImageName.parse("localstack/localstack:3.2.0"));
DockerImageName.parse("localstack/localstack:3.7.2"));

@Test
void createsClient() {
Expand Down

0 comments on commit 92cd5a8

Please sign in to comment.