Skip to content

Change MinIO bucket names not to look like S3's #17981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
findepi merged 1 commit into from
Jun 21, 2023
Merged

Change MinIO bucket names not to look like S3's #17981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../trino-delta-lake/src/test/java/io/trino/plugin/deltalake/TestDeltaLakeConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class TestDeltaLakeConnectorTest
{
protected static final String SCHEMA = "test_schema";

protected final String bucketName = "trino-ci-test-" + randomNameSuffix();
protected final String bucketName = "test-bucket-" + randomNameSuffix();
protected MinioClient minioClient;

@Override
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive/src/test/java/io/trino/plugin/hive/s3/TestTrinoS3FileSystemMinio.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class TestTrinoS3FileSystemMinio
extends BaseTestTrinoS3FileSystemObjectStorage
{
private final String bucketName = "trino-ci-test-" + randomNameSuffix();
private final String bucketName = "test-bucket-" + randomNameSuffix();

private Minio minio;

Expand Down
2 changes: 1 addition & 1 deletion .../main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeDeltaLakeOss.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void extendEnvironment(Environment.Builder builder)
FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
Path minioBucketDirectory;
try {
minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
minioBucketDirectory.toFile().deleteOnExit();
}
catch (IOException e) {
Expand Down
4 changes: 2 additions & 2 deletions ...va/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHiveHudiRedirections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class EnvSinglenodeHiveHudiRedirections
private static final int SPARK_THRIFT_PORT = 10213;

private static final String SPARK_CONTAINER_NAME = "spark";
private static final String S3_BUCKET_NAME = "trino-ci-test";
private static final String S3_BUCKET_NAME = "test-bucket";

private final PortBinder portBinder;
private final String hadoopImagesVersion;
Expand Down Expand Up @@ -91,7 +91,7 @@ public void extendEnvironment(Environment.Builder builder)
FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
Path minioBucketDirectory;
try {
minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
minioBucketDirectory.toFile().deleteOnExit();
}
catch (IOException e) {
Expand Down
4 changes: 2 additions & 2 deletions ...cher/src/main/java/io/trino/tests/product/launcher/env/environment/EnvSinglenodeHudi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class EnvSinglenodeHudi
private static final int SPARK_THRIFT_PORT = 10213;

private static final String SPARK_CONTAINER_NAME = "spark";
private static final String S3_BUCKET_NAME = "trino-ci-test";
private static final String S3_BUCKET_NAME = "test-bucket";

private final PortBinder portBinder;
private final String hadoopImagesVersion;
Expand Down Expand Up @@ -101,7 +101,7 @@ public void extendEnvironment(Environment.Builder builder)
FileAttribute<Set<PosixFilePermission>> posixFilePermissions = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-r--r--"));
Path minioBucketDirectory;
try {
minioBucketDirectory = Files.createTempDirectory("trino-ci-test", posixFilePermissions);
minioBucketDirectory = Files.createTempDirectory("test-bucket-contents", posixFilePermissions);
minioBucketDirectory.toFile().deleteOnExit();
}
catch (IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion ...no-product-tests/src/main/java/io/trino/tests/product/hive/TestHiveRedirectionToHudi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class TestHiveRedirectionToHudi
@BeforeMethodWithContext
public void setUp()
{
bucketName = System.getenv().getOrDefault("S3_BUCKET", "trino-ci-test");
bucketName = System.getenv().getOrDefault("S3_BUCKET", "test-bucket");
}

@DataProvider
Expand Down