From 74ebc40cfbd89f3c24898e82dd7355aceee1a65f Mon Sep 17 00:00:00 2001 From: Aiden Huynh <115724666+aidehn@users.noreply.github.com> Date: Thu, 5 Mar 2026 10:40:24 +0000 Subject: [PATCH 1/4] remove references to localstack/localstack --- .github/workflows/build.yml | 2 +- src/main/java/cloud/localstack/docker/Container.java | 9 ++------- .../awssdkv1/testcontainers/TestContainersSqsTest.java | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 807feb6..c757b7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - name: Pull Docker containers run: | set -e - nohup docker pull localstack/localstack-ext > /dev/null & + nohup docker pull localstack/localstack-pro > /dev/null & - name: Compile Tests run: | set -e diff --git a/src/main/java/cloud/localstack/docker/Container.java b/src/main/java/cloud/localstack/docker/Container.java index 81ce610..6d13f51 100644 --- a/src/main/java/cloud/localstack/docker/Container.java +++ b/src/main/java/cloud/localstack/docker/Container.java @@ -22,7 +22,6 @@ public class Container { private static final Logger LOG = Logger.getLogger(Container.class.getName()); - private static final String LOCALSTACK_IMAGE = "localstack/localstack"; private static final String LOCALSTACK_PRO_IMAGE = "localstack/localstack-pro"; private static final String LOCALSTACK_IMAGE_TAG = "latest"; private static final String LOCALSTACK_PORT_EDGE = "4566"; @@ -51,7 +50,7 @@ public class Container { * @param pullNewImage determines if docker pull should be run to update to the latest image of the container * @param randomizePorts determines if the container should expose the default local stack ports or if it should expose randomized ports * in order to prevent conflicts with other localstack containers running on the same machine - * @param imageName the name of the image defaults to {@value LOCALSTACK_IMAGE} if null + * @param imageName the name of the image defaults to {@value LOCALSTACK_PRO_IMAGE} if null * @param imageTag the tag of the image to pull, defaults to {@value LOCALSTACK_IMAGE_TAG} if null * @param environmentVariables map of environment variables to be passed to the docker container * @param portMappings port mappings @@ -68,11 +67,7 @@ public static Container createLocalstackContainer( bindMounts = bindMounts == null ? Collections.emptyMap() : bindMounts; portMappings = portMappings == null ? Collections.emptyMap() : portMappings; - String imageNameOrDefault = imageName; - if (StringUtils.isEmpty(imageName)) { - String apiKeyEnv = System.getenv(Constants.ENV_LOCALSTACK_API_KEY); - imageNameOrDefault = !StringUtils.isEmpty(apiKeyEnv) ? LOCALSTACK_PRO_IMAGE : LOCALSTACK_IMAGE; - } + String imageNameOrDefault = !StringUtils.isEmpty(imageName) ? imageName : LOCALSTACK_PRO_IMAGE String fullImageName = imageNameOrDefault + ":" + (imageTag == null ? LOCALSTACK_IMAGE_TAG : imageTag); boolean imageExists = new ListImagesCommand().execute().contains(fullImageName); diff --git a/src/test/java/cloud/localstack/awssdkv1/testcontainers/TestContainersSqsTest.java b/src/test/java/cloud/localstack/awssdkv1/testcontainers/TestContainersSqsTest.java index f36fda0..3c41a86 100644 --- a/src/test/java/cloud/localstack/awssdkv1/testcontainers/TestContainersSqsTest.java +++ b/src/test/java/cloud/localstack/awssdkv1/testcontainers/TestContainersSqsTest.java @@ -36,7 +36,7 @@ */ public class TestContainersSqsTest { - private static final String DOCKER_IMAGE_NAME = "localstack/localstack:latest"; + private static final String DOCKER_IMAGE_NAME = "localstack/localstack-pro:latest"; private AmazonSQS amazonSQS; From aba563e71906cd41be8eda39c0aa99110cb1d094 Mon Sep 17 00:00:00 2001 From: Aiden Huynh <115724666+aidehn@users.noreply.github.com> Date: Fri, 6 Mar 2026 11:43:16 +0000 Subject: [PATCH 2/4] syntax fix --- src/main/java/cloud/localstack/docker/Container.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cloud/localstack/docker/Container.java b/src/main/java/cloud/localstack/docker/Container.java index 6d13f51..f2f4717 100644 --- a/src/main/java/cloud/localstack/docker/Container.java +++ b/src/main/java/cloud/localstack/docker/Container.java @@ -67,7 +67,7 @@ public static Container createLocalstackContainer( bindMounts = bindMounts == null ? Collections.emptyMap() : bindMounts; portMappings = portMappings == null ? Collections.emptyMap() : portMappings; - String imageNameOrDefault = !StringUtils.isEmpty(imageName) ? imageName : LOCALSTACK_PRO_IMAGE + String imageNameOrDefault = !StringUtils.isEmpty(imageName) ? imageName : LOCALSTACK_PRO_IMAGE; String fullImageName = imageNameOrDefault + ":" + (imageTag == null ? LOCALSTACK_IMAGE_TAG : imageTag); boolean imageExists = new ListImagesCommand().execute().contains(fullImageName); From 947305838b9d76df614acb620462cf89955421c0 Mon Sep 17 00:00:00 2001 From: Aiden Huynh <115724666+aidehn@users.noreply.github.com> Date: Fri, 6 Mar 2026 11:47:12 +0000 Subject: [PATCH 3/4] doc updates --- README.md | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3afbe89..e63bc6f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Simply add the following dependency to your `pom.xml` file: cloud.localstack localstack-utils - 0.2.23 + 0.2.24 ``` @@ -114,6 +114,7 @@ To publish a release of the library, the "Maven Release" Github Action can be ma ## Change Log +* v0.2.24: Make localstack/localstack-pro the default image * v0.2.23: Fix S3 endpoints to be compatible with LocalStack v2 * v0.2.22: Fix sqs event mapping for new event format, some test fixes * v0.2.21: Bump version of AWS SDK v1; add AWS SDK v2 sync clients to TestUtils; add docker executable path under homebrew diff --git a/pom.xml b/pom.xml index aa9238d..fe0ce5f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ cloud.localstack localstack-utils jar - 0.2.23 + 0.2.24 localstack-utils Java utilities for the LocalStack platform. From 40e2566a9900ec9276f141351c7baa9463124fe4 Mon Sep 17 00:00:00 2001 From: Aiden Huynh <115724666+aidehn@users.noreply.github.com> Date: Fri, 6 Mar 2026 12:23:09 +0000 Subject: [PATCH 4/4] address pr comments --- .github/workflows/build.yml | 4 ---- README.md | 4 ++-- pom.xml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c757b7c..c8f9fad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,6 @@ jobs: with: distribution: "adopt" java-version: "8" - - name: Pull Docker containers - run: | - set -e - nohup docker pull localstack/localstack-pro > /dev/null & - name: Compile Tests run: | set -e diff --git a/README.md b/README.md index e63bc6f..36baa97 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Simply add the following dependency to your `pom.xml` file: cloud.localstack localstack-utils - 0.2.24 + 0.3.0 ``` @@ -114,7 +114,7 @@ To publish a release of the library, the "Maven Release" Github Action can be ma ## Change Log -* v0.2.24: Make localstack/localstack-pro the default image +* v0.3.0: Makes localstack/localstack-pro the default image. For more information see: https://blog.localstack.cloud/localstack-single-image-next-steps/ * v0.2.23: Fix S3 endpoints to be compatible with LocalStack v2 * v0.2.22: Fix sqs event mapping for new event format, some test fixes * v0.2.21: Bump version of AWS SDK v1; add AWS SDK v2 sync clients to TestUtils; add docker executable path under homebrew diff --git a/pom.xml b/pom.xml index fe0ce5f..02f4d59 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ cloud.localstack localstack-utils jar - 0.2.24 + 0.3.0 localstack-utils Java utilities for the LocalStack platform.