Skip to content
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

Jump to bottom

fix for issue 399 #400

Merged
merged 3 commits into from
Mar 7, 2024
Merged

fix for issue 399 #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a599f7a
fix for issue 399
markjschreiber Mar 6, 2024
d8973e2
fix for issue 399
markjschreiber Mar 6, 2024
12ca299
Fix integration tests where clients were being re-used after they wer…
markjschreiber Mar 6, 2024
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
23 changes: 12 additions & 11 deletions src/integrationTest/java/software/amazon/nio/spi/s3/FilesExistsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,17 @@

package software.amazon.nio.spi.s3;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.BDDAssertions.then;
import static software.amazon.nio.spi.s3.Containers.localStackConnectionEndpoint;
import static software.amazon.nio.spi.s3.Containers.putObject;

import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;

import static org.assertj.core.api.BDDAssertions.then;
import static software.amazon.nio.spi.s3.Containers.localStackConnectionEndpoint;
import static software.amazon.nio.spi.s3.Containers.putObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;

@DisplayName("Files$exists()")
public class FilesExistsTest {
Expand Down Expand Up @@ -44,23 +43,25 @@ public void fileExistsShouldReturnFalseWhenBucketExistsAndFileNotFound() {
@Nested
@DisplayName("should be true")
class FileExists {
String bucketName;

@BeforeEach
public void createBucket() {
Containers.createBucket("sink");
bucketName = "sink"+ System.currentTimeMillis();
Containers.createBucket(bucketName);
}

@Test
@DisplayName("when bucket and file exist")
public void fileExistsShouldReturnTrueWhenBucketExistsAndFileFound() {
final var path = putObject("sink", "sample-file.txt");
final var path = putObject(bucketName, "sample-file.txt");
then(Files.exists(path)).isTrue();
}

@Test
@DisplayName("for bucket path when it exists")
public void fileExistsShouldReturnTrueWhenBucketExists() {
final var path = Paths.get(URI.create(localStackConnectionEndpoint() + "/sink/"));
final var path = Paths.get(URI.create(localStackConnectionEndpoint() + "/"+bucketName+"/"));
then(Files.exists(path)).isTrue();
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/integrationTest/java/software/amazon/nio/spi/s3/FilesReadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@

package software.amazon.nio.spi.s3;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import static org.assertj.core.api.BDDAssertions.then;
import static software.amazon.nio.spi.s3.Containers.putObject;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;

import static org.assertj.core.api.BDDAssertions.then;
import static software.amazon.nio.spi.s3.Containers.putObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;

@DisplayName("Files$read* should load file contents from localstack")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class FilesReadTest {
private Path path;

@BeforeAll
@BeforeEach
public void createBucketAndFile(){
Containers.createBucket("sink");
path = putObject("sink", "files-read.txt", "some content");
String containerName = "sink"+ System.currentTimeMillis();
Containers.createBucket(containerName);
path = putObject(containerName, "files-read.txt", "some content");
}

@Test
Expand Down
26 changes: 14 additions & 12 deletions src/integrationTest/java/software/amazon/nio/spi/s3/FilesWriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,36 @@

package software.amazon.nio.spi.s3;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static software.amazon.nio.spi.s3.Containers.localStackConnectionEndpoint;
import static software.amazon.nio.spi.s3.Containers.putObject;

import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;

import static org.assertj.core.api.Assertions.assertThat;
import static software.amazon.nio.spi.s3.Containers.localStackConnectionEndpoint;
import static software.amazon.nio.spi.s3.Containers.putObject;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;

@DisplayName("Files$write* should write file contents on s3 service")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class FilesWriteTest {

@BeforeAll
String bucketName;

@BeforeEach
public void createBucket() {
Containers.createBucket("write-bucket");
bucketName = "write-bucket"+ System.currentTimeMillis();
Containers.createBucket(bucketName);
}

@Test
@DisplayName("append to an existing file")
public void writeToExistingFile() throws IOException {
final var path = putObject("write-bucket", "existing-file.txt", "some content");
final var path = putObject(bucketName, "existing-file.txt", "some content");

Files.writeString(path, " more content", StandardOpenOption.APPEND);

Expand All @@ -42,7 +44,7 @@ public void writeToExistingFile() throws IOException {
@Test
@DisplayName("to a new file")
public void writeToNewFile() throws IOException {
final var path = Paths.get(URI.create(localStackConnectionEndpoint() + "/write-bucket/new-file.txt"));
final var path = Paths.get(URI.create(localStackConnectionEndpoint() + "/"+bucketName+"/new-file.txt"));

Files.writeString(path, "content of new file", StandardOpenOption.CREATE_NEW);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/software/amazon/nio/spi/s3/S3ClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private S3AsyncClient configureClientForRegion(

private S3AsyncClient configureCrtClientForRegion(String regionName) {
var region = getRegionFromRegionName(regionName);
logger.debug("bucket region is: '{}'", region.id());
logger.debug("bucket region is: '{}'", region);

var endpointUri = configuration.endpointUri();
if (endpointUri != null) {
Expand All @@ -299,7 +299,7 @@ private S3AsyncClient configureCrtClientForRegion(String regionName) {
}

private static Region getRegionFromRegionName(String regionName) {
return (regionName == null || regionName.isBlank()) ? Region.US_EAST_1 : Region.of(regionName);
return (regionName == null || regionName.isBlank()) ? null : Region.of(regionName);
}

}
3 changes: 1 addition & 2 deletions src/main/java/software/amazon/nio/spi/s3/S3SeekableByteChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,8 @@ private S3SeekableByteChannel(S3Path s3Path, S3AsyncClient s3Client, long startA
position = 0L;
} else if (options.contains(StandardOpenOption.READ) || options.isEmpty()) {
LOGGER.debug("using S3ReadAheadByteChannel as read delegate for path '{}'", s3Path.toUri());
var readClient = s3Path.getFileSystem().readClient();
readDelegate =
new S3ReadAheadByteChannel(s3Path, config.getMaxFragmentSize(), config.getMaxFragmentNumber(), readClient, this,
new S3ReadAheadByteChannel(s3Path, config.getMaxFragmentSize(), config.getMaxFragmentNumber(), s3Client, this,
timeout, timeUnit);
writeDelegate = null;
} else {
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/software/amazon/nio/spi/s3/S3ClientProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.mockito.junit.jupiter.MockitoExtension;
import software.amazon.awssdk.awscore.exception.AwsErrorDetails;
import software.amazon.awssdk.http.SdkHttpResponse;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3AsyncClient;
import software.amazon.awssdk.services.s3.model.GetBucketLocationResponse;
import software.amazon.awssdk.services.s3.model.HeadBucketResponse;
Expand Down Expand Up @@ -165,7 +164,7 @@ public void generateAsyncClientByEndpointBucketCredentials() {

// THEN
verify(BUILDER, times(1)).endpointOverride(URI.create("https://endpoint1:1010"));
verify(BUILDER, times(1)).region(Region.US_EAST_1);
verify(BUILDER, times(1)).region(null);

// GIVEN
BUILDER = spy(S3AsyncClient.crtBuilder());
Expand All @@ -177,6 +176,6 @@ public void generateAsyncClientByEndpointBucketCredentials() {

// THEN
verify(BUILDER, times(1)).endpointOverride(URI.create("https://endpoint2:2020"));
verify(BUILDER, times(1)).region(Region.US_EAST_1);
verify(BUILDER, times(1)).region(null);
}
}