[S] Change in asterixdb[lumina]: [NO ISSUE][TEST]Avoid named testcontainers

[AsterixDB Code Review]

>From Ian Maxon <ima...@apache.org>:

Ian Maxon has uploaded this change for review. ( 
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21229?usp=email )


Change subject: [NO ISSUE][TEST]Avoid named testcontainers
......................................................................

[NO ISSUE][TEST]Avoid named testcontainers

Change-Id: I5c94e464af0eda9d4293c607f1746ecfc95791a2
---
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
M 
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
2 files changed, 4 insertions(+), 8 deletions(-)



  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/29/21229/1

diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
index 9b366da..65b1bfc 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
@@ -55,14 +55,13 @@
 public class LocalCloudUtilAdobeMock {

     private static final Logger LOGGER = LogManager.getLogger();
-    private static final String S3MOCK_CONTAINER_NAME = "adobe-s3-mock";

     public static final String CLOUD_STORAGE_BUCKET = 
"cloud-storage-container";
     public static final String S3MOCK_VERSION_TAG = "4.7.0";
     public static final String PLAYGROUND_BUCKET = "playground";
     public static final String CLOUD_URL_KEY = "cloudUrl";
     private static S3MockContainer s3Mock;
-    public static String DOCKER_ADOBE_S3_MOCK_URI;
+    public static String dockerAdobeS3MockUri;

     private LocalCloudUtilAdobeMock() {
         throw new AssertionError("Do not instantiate");
@@ -89,8 +88,7 @@
         }
         // Starting S3 mock server to be used instead of real S3 server
         LOGGER.info("Starting S3 mock server");
-        s3Mock = new 
S3MockContainer(S3MOCK_VERSION_TAG).withRetainFilesOnExit(!cleanStart)
-                .withCreateContainerCmdModifier(cmd -> 
cmd.withName(S3MOCK_CONTAINER_NAME));
+        s3Mock = new 
S3MockContainer(S3MOCK_VERSION_TAG).withRetainFilesOnExit(!cleanStart);
         if (!cleanStart) {
             Path s3MockDataDir = Path.of("target", "s3mock");
             boolean existingData = s3MockDataDir.toFile().exists();
@@ -103,7 +101,7 @@
         }
         s3Mock.start();
         LOGGER.info("S3 mock server started successfully");
-        DOCKER_ADOBE_S3_MOCK_URI = MOCK_SERVER_HOSTNAME_FRAGMENT + 
s3Mock.getHttpServerPort();
+        dockerAdobeS3MockUri = MOCK_SERVER_HOSTNAME_FRAGMENT + 
s3Mock.getHttpServerPort();

         S3ClientBuilder builder = S3Client.builder();
         URI endpoint = URI.create(s3Mock.getHttpEndpoint()); // endpoint 
pointing to S3 mock server
diff --git 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
index 4a0b451..b32c482 100644
--- 
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
+++ 
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/iceberg/IcebergTest.java
@@ -124,7 +124,6 @@
     private static S3MockContainer s3Mock;

     // Nessie config
-    private static final String NESSIE_CONTAINER_NAME = "iceberg-nessie";
     private static GenericContainer<?> nessie;
     private static final DockerImageName NESSIE_IMAGE = 
DockerImageName.parse("ghcr.io/projectnessie/nessie:0.107.5");
     private static final int NESSIE_PORT = 19120;
@@ -145,8 +144,7 @@
         final TestExecutor testExecutor = new TestExecutor();
         LOGGER.info("Starting S3 mock and Nessie containers");
         s3Mock = LocalCloudUtilAdobeMock.startS3CloudEnvironment(true);
-        nessie = new 
GenericContainer<>(NESSIE_IMAGE).withExposedPorts(NESSIE_PORT)
-                .withCreateContainerCmdModifier(cmd -> 
cmd.withName(NESSIE_CONTAINER_NAME));
+        nessie = new 
GenericContainer<>(NESSIE_IMAGE).withExposedPorts(NESSIE_PORT);
         nessie.setPortBindings(List.of(NESSIE_PORT + ":" + NESSIE_PORT));
         nessie.start();


--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21229?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://asterix-gerrit.ics.uci.edu/settings?usp=email

Gerrit-MessageType: newchange
Gerrit-Project: asterixdb
Gerrit-Branch: lumina
Gerrit-Change-Id: I5c94e464af0eda9d4293c607f1746ecfc95791a2
Gerrit-Change-Number: 21229
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <ima...@apache.org>