>From Ian Maxon <[email protected]>:
Ian Maxon has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20440?usp=email )
Change subject: Merge branch 'phoenix'
......................................................................
Merge branch 'phoenix'
Change-Id: I2812c034a6d002bf906a0dff7a26aa7403717e3c
---
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java
2 files changed, 15 insertions(+), 19 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/40/20440/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 e75ab96..8509aff 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
@@ -43,12 +43,8 @@
import software.amazon.awssdk.services.s3.S3ClientBuilder;
import software.amazon.awssdk.services.s3.S3Configuration;
import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
-<<<<<<< HEAD (3be0c6 [NO-ISSUE][TEST] Update datatype test result.)
-import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
-=======
import software.amazon.awssdk.services.s3.model.HeadBucketRequest;
import software.amazon.awssdk.services.s3.model.NoSuchBucketException;
->>>>>>> BRANCH (698e45 [ASTERIXDB-3654][TEST]Use Azurite in testcontainers)
// This runs Adobe S3Mock in a docker container, with the bucket storage
directory under target/s3mock.
// Search for line "Successfully created {} as root folder" in the info log
file
@@ -102,24 +98,9 @@
URI endpoint = URI.create(s3Mock.getHttpEndpoint()); // endpoint
pointing to S3 mock server
builder.region(Region.of(MOCK_SERVER_REGION)).credentialsProvider(AnonymousCredentialsProvider.create())
.endpointOverride(endpoint);
-<<<<<<< HEAD (3be0c6 [NO-ISSUE][TEST] Update datatype test result.)
- S3Client client = builder.build();
- if (cleanStart) {
- try {
-
client.deleteBucket(DeleteBucketRequest.builder().bucket(CLOUD_STORAGE_BUCKET).build());
- LOGGER.info("Deleted bucket {} for cloud storage",
CLOUD_STORAGE_BUCKET);
- } catch (Exception ex) {
- // do nothing
- }
- }
-
client.createBucket(CreateBucketRequest.builder().bucket(CLOUD_STORAGE_BUCKET).build());
- LOGGER.info("Created bucket {} for cloud storage",
CLOUD_STORAGE_BUCKET);
-
-=======
S3Client client =
builder.serviceConfiguration(S3Configuration.builder().pathStyleAccessEnabled(true).build()).build();
createIfNotExists(CLOUD_STORAGE_BUCKET, client);
->>>>>>> BRANCH (698e45 [ASTERIXDB-3654][TEST]Use Azurite in testcontainers)
if (createPlaygroundContainer) {
createIfNotExists(PLAYGROUND_BUCKET, client);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20440?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: master
Gerrit-Change-Id: I2812c034a6d002bf906a0dff7a26aa7403717e3c
Gerrit-Change-Number: 20440
Gerrit-PatchSet: 1
Gerrit-Owner: Ian Maxon <[email protected]>
