From ab93555c4007dc73343dcb0c4b038e6e21f133de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Dec 2024 12:02:03 -0600 Subject: [PATCH] Drop references to vectorized/redpanda image Image is no longer available. Fixes #9621 --- .../testcontainers/redpanda/RedpandaContainer.java | 11 ++--------- .../testcontainers/redpanda/CompatibleImageTest.java | 2 +- .../redpanda/RedpandaContainerTest.java | 7 ------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java index a7cfc245d95..e8655beec45 100644 --- a/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java +++ b/modules/redpanda/src/main/java/org/testcontainers/redpanda/RedpandaContainer.java @@ -45,16 +45,10 @@ public class RedpandaContainer extends GenericContainer { private static final String IMAGE_NAME = "redpandadata/redpanda"; - @Deprecated - private static final String REDPANDA_OLD_FULL_IMAGE_NAME = "docker.redpanda.com/vectorized/redpanda"; - private static final DockerImageName REDPANDA_IMAGE = DockerImageName.parse(REDPANDA_FULL_IMAGE_NAME); private static final DockerImageName IMAGE = DockerImageName.parse(IMAGE_NAME); - @Deprecated - private static final DockerImageName REDPANDA_OLD_IMAGE = DockerImageName.parse(REDPANDA_OLD_FULL_IMAGE_NAME); - private static final int REDPANDA_PORT = 9092; private static final int REDPANDA_ADMIN_PORT = 9644; @@ -82,13 +76,12 @@ public RedpandaContainer(String image) { public RedpandaContainer(DockerImageName imageName) { super(imageName); - imageName.assertCompatibleWith(REDPANDA_OLD_IMAGE, REDPANDA_IMAGE, IMAGE); + imageName.assertCompatibleWith(REDPANDA_IMAGE, IMAGE); boolean isLessThanBaseVersion = new ComparableVersion(imageName.getVersionPart()).isLessThan("v22.2.1"); boolean isPublicCompatibleImage = REDPANDA_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()) || - IMAGE_NAME.equals(imageName.getUnversionedPart()) || - REDPANDA_OLD_FULL_IMAGE_NAME.equals(imageName.getUnversionedPart()); + IMAGE_NAME.equals(imageName.getUnversionedPart()); if (isPublicCompatibleImage && isLessThanBaseVersion) { throw new IllegalArgumentException("Redpanda version must be >= v22.2.1"); } diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java index cdb2af6a291..478d6e7efbc 100644 --- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java +++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/CompatibleImageTest.java @@ -15,7 +15,7 @@ public CompatibleImageTest(String image) { @Parameterized.Parameters(name = "{0}") public static String[] image() { - return new String[] { "docker.redpanda.com/vectorized/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" }; + return new String[] { "docker.redpanda.com/redpandadata/redpanda:v22.2.1", "redpandadata/redpanda:v22.2.1" }; } @Test diff --git a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java index dcdaad4da28..605ad76510a 100644 --- a/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java +++ b/modules/redpanda/src/test/java/org/testcontainers/redpanda/RedpandaContainerTest.java @@ -67,13 +67,6 @@ public void testNotCompatibleVersion() { .hasMessageContaining("Redpanda version must be >= v22.2.1"); } - @Test - public void vectorizedRedpandaImageVersion2221ShouldNotBeCompatible() { - assertThatThrownBy(() -> new RedpandaContainer("docker.redpanda.com/vectorized/redpanda:v21.11.19")) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("Redpanda version must be >= v22.2.1"); - } - @Test public void redpandadataRedpandaImageVersion2221ShouldNotBeCompatible() { assertThatThrownBy(() -> new RedpandaContainer("redpandadata/redpanda:v21.11.19"))