adutra commented on code in PR #3663:
URL: https://github.com/apache/polaris/pull/3663#discussion_r2763272820
##########
tools/rustfs-testcontainer/src/main/java/org/apache/polaris/test/rustfs/RustfsContainer.java:
##########
@@ -43,27 +43,27 @@
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
// CODE_COPIED_TO_POLARIS from Project Nessie 0.104.2
-public final class MinioContainer extends GenericContainer<MinioContainer>
- implements MinioAccess, AutoCloseable {
+public final class RustfsContainer extends GenericContainer<RustfsContainer>
+ implements RustfsAccess, AutoCloseable {
- private static final Logger LOGGER =
LoggerFactory.getLogger(MinioContainer.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(RustfsContainer.class);
- private static final int DEFAULT_PORT = 9000;
+ private static final int S3_API_PORT = 9000;
+ private static final int CONSOLE_PORT = 9001;
- private static final String MINIO_ACCESS_KEY = "MINIO_ROOT_USER";
- private static final String MINIO_SECRET_KEY = "MINIO_ROOT_PASSWORD";
- private static final String MINIO_DOMAIN = "MINIO_DOMAIN";
+ private static final String RUSTFS_ACCESS_KEY = "RUSTFS_ACCESS_KEY";
+ private static final String RUSTFS_SECRET_KEY = "RUSTFS_SECRET_KEY";
+ private static final String RUSTFS_SERVER_DOMAINS = "RUSTFS_SERVER_DOMAINS";
Review Comment:
nit: why "DOMAINS" in the plural?
##########
tools/rustfs-testcontainer/src/main/java/org/apache/polaris/test/rustfs/RustfsContainer.java:
##########
@@ -126,39 +126,39 @@ private static String validateBucketHost(String
bucketName) {
private Optional<String> region;
@SuppressWarnings("unused")
- public MinioContainer() {
+ public RustfsContainer() {
this(null, null, null, null, null);
}
@SuppressWarnings("resource")
- public MinioContainer(
+ public RustfsContainer(
String image, String accessKey, String secretKey, String bucket, String
region) {
super(
- ContainerSpecHelper.containerSpecHelper("minio", MinioContainer.class)
+ ContainerSpecHelper.containerSpecHelper("rustfs",
RustfsContainer.class)
.dockerImageName(image));
- withNetworkAliases(randomString("minio"));
- withLogConsumer(new
Slf4jLogConsumer(LoggerFactory.getLogger(MinioContainer.class)));
- addExposedPort(DEFAULT_PORT);
+ withNetworkAliases(randomString("rustfs"));
+ withLogConsumer(new
Slf4jLogConsumer(LoggerFactory.getLogger(RustfsContainer.class)));
+ addFixedExposedPort(S3_API_PORT, S3_API_PORT);
Review Comment:
Hmm I see, it's explained here:
https://lists.apache.org/thread/5cvgk6m83hnsoly9gq4bxdchcc69f3l0
That's unfortunate, because it could cause test failures especially for devs
(not so much for CI imho).
##########
tools/rustfs-testcontainer/src/main/java/org/apache/polaris/test/rustfs/RustfsContainer.java:
##########
@@ -126,39 +126,39 @@ private static String validateBucketHost(String
bucketName) {
private Optional<String> region;
@SuppressWarnings("unused")
- public MinioContainer() {
+ public RustfsContainer() {
this(null, null, null, null, null);
}
@SuppressWarnings("resource")
- public MinioContainer(
+ public RustfsContainer(
String image, String accessKey, String secretKey, String bucket, String
region) {
super(
- ContainerSpecHelper.containerSpecHelper("minio", MinioContainer.class)
+ ContainerSpecHelper.containerSpecHelper("rustfs",
RustfsContainer.class)
.dockerImageName(image));
- withNetworkAliases(randomString("minio"));
- withLogConsumer(new
Slf4jLogConsumer(LoggerFactory.getLogger(MinioContainer.class)));
- addExposedPort(DEFAULT_PORT);
+ withNetworkAliases(randomString("rustfs"));
+ withLogConsumer(new
Slf4jLogConsumer(LoggerFactory.getLogger(RustfsContainer.class)));
+ addFixedExposedPort(S3_API_PORT, S3_API_PORT);
Review Comment:
Do we really need fixed ports?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
