chore(fix): minor changes due to pr comments

Author: binarycat-dremio

integration-tests/src/main/java/org/apache/polaris/service/it/ext/PolarisSparkIntegrationTestBase.java

@@ -51,10 +51,7 @@
 
 @ExtendWith(PolarisIntegrationTestExtension.class)
 public abstract class PolarisSparkIntegrationTestBase {
-  protected static final String S3_BUCKET_NAMES = "my-bucket,my-old-bucket";
-  protected static final String S3_ACCESS_KEY = "ap1";
-  protected static final String S3_SECRET_KEY = "s3cr3t";
-  protected static S3Mock s3Container;
+  protected static final S3Mock s3Container = new S3Mock();
   protected static SparkSession spark;
   protected PolarisApiEndpoints endpoints;
   protected PolarisClient client;
@@ -68,7 +65,6 @@ public abstract class PolarisSparkIntegrationTestBase {
 
   @BeforeAll
   public static void setup() throws IOException {
-    s3Container = new S3Mock(S3_BUCKET_NAMES);
     s3Container.start();
   }
 
@@ -100,7 +96,7 @@ public void before(
             .setAllowedLocations(List.of("s3://my-old-bucket/path/to/data"))
             .build();
     CatalogProperties props = new CatalogProperties("s3://my-bucket/path/to/data");
-    props.putAll(s3Container.getS3ConfigProperties(S3_ACCESS_KEY, S3_SECRET_KEY));
+    props.putAll(s3Container.getS3ConfigProperties());
     props.put("polaris.config.drop-with-purge.enabled", "true");
     Catalog catalog =
         PolarisCatalog.builder()
@@ -113,7 +109,7 @@ public void before(
     managementApi.createCatalog(catalog);
 
     CatalogProperties externalProps = new CatalogProperties("s3://my-bucket/path/to/data");
-    externalProps.putAll(s3Container.getS3ConfigProperties(S3_ACCESS_KEY, S3_SECRET_KEY));
+    externalProps.putAll(s3Container.getS3ConfigProperties());
     externalProps.put("polaris.config.drop-with-purge.enabled", "true");
     Catalog externalCatalog =
         ExternalCatalog.builder()

plugins/spark/v3.5/integration/src/intTest/java/org/apache/polaris/spark/quarkus/it/SparkIntegrationBase.java

@@ -57,10 +57,7 @@
 
 @ExtendWith(PolarisIntegrationTestExtension.class)
 public abstract class SparkIntegrationBase {
-  protected static final String S3_BUCKET_NAMES = "my-bucket,my-old-bucket";
-  protected static final String S3_ACCESS_KEY = "ap1";
-  protected static final String S3_SECRET_KEY = "s3cr3t";
-  protected static S3Mock s3Container;
+  protected static final S3Mock s3Container = new S3Mock();
   protected static SparkSession spark;
   protected PolarisApiEndpoints endpoints;
   protected PolarisManagementClient client;
@@ -72,7 +69,6 @@ public abstract class SparkIntegrationBase {
 
   @BeforeAll
   public static void setup() throws IOException {
-    s3Container = new S3Mock(S3_BUCKET_NAMES);
     s3Container.start();
   }
 
@@ -102,7 +98,7 @@ public void before(
             .setAllowedLocations(List.of("s3://my-old-bucket/path/to/data"))
             .build();
     CatalogProperties props = new CatalogProperties("s3://my-bucket/path/to/data");
-    props.putAll(s3Container.getS3ConfigProperties(S3_ACCESS_KEY, S3_SECRET_KEY));
+    props.putAll(s3Container.getS3ConfigProperties());
     props.put("polaris.config.drop-with-purge.enabled", "true");
     Catalog catalog =
         PolarisCatalog.builder()

runtime/test-common/src/main/java/org/apache/polaris/test/commons/s3mock/S3Mock.java

@@ -25,25 +25,32 @@
 
 public class S3Mock extends S3MockContainer {
 
+  private static final String DEFAULT_BUCKETS = "my-bucket,my-old-bucket";
+  private static final String DEFAULT_ACCESS_KEY = "ap1";
+  private static final String DEFAULT_SECRET_KEY = "s3cr3t";
+
   public S3Mock() {
-    super(ContainerSpecHelper.containerSpecHelper("s3mock", S3Mock.class).dockerImageName(null));
+    this(DEFAULT_BUCKETS);
   }
 
   public S3Mock(String initialBuckets) {
-    this();
+    super(
+        ContainerSpecHelper.containerSpecHelper("s3mock", S3Mock.class)
+            .dockerImageName(null)
+            .asCompatibleSubstituteFor("adobe/s3mock"));
     this.withInitialBuckets(initialBuckets);
   }
 
-  public Map<String, String> getS3ConfigProperties(String accessKey, String secretKey) {
+  public Map<String, String> getS3ConfigProperties() {
     String endpoint = this.getHttpEndpoint();
     return Map.of(
         "table-default.s3.endpoint", endpoint,
         "table-default.s3.path-style-access", "true",
-        "table-default.s3.access-key-id", accessKey,
-        "table-default.s3.secret-access-key", secretKey,
+        "table-default.s3.access-key-id", DEFAULT_ACCESS_KEY,
+        "table-default.s3.secret-access-key", DEFAULT_SECRET_KEY,
         "s3.endpoint", endpoint,
         "s3.path-style-access", "true",
-        "s3.access-key-id", accessKey,
-        "s3.secret-access-key", secretKey);
+        "s3.access-key-id", DEFAULT_ACCESS_KEY,
+        "s3.secret-access-key", DEFAULT_SECRET_KEY);
   }
 }

runtime/test-common/src/main/resources/org/apache/polaris/test/commons/s3mock/Dockerfile-s3mock-version

@@ -19,4 +19,4 @@
 
 # Dockerfile to provide the image name and tag to a test.
 # Version is managed by Renovate - do not edit.
-FROM adobe/s3mock:4.7.0
+FROM docker.io/adobe/s3mock:4.7.0