This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
commit 7a3f6885c69649d0428269bfc4b86ab130de99e8 Merge: bb319db 5fb21de Author: Jean-Baptiste Onofré <[email protected]> AuthorDate: Mon May 14 14:03:50 2018 +0200 Merge pull request #5244 from iemejia/BEAM-3813-s3-sse [BEAM-3813] Support encryption for S3FileSystem (SSE-S3, SSE-C and SSE-KMS) sdks/java/io/amazon-web-services/build.gradle | 4 +- sdks/java/io/amazon-web-services/pom.xml | 15 +- .../apache/beam/sdk/io/aws/options/AwsModule.java | 19 +- .../apache/beam/sdk/io/aws/options/S3Options.java | 39 ++- .../apache/beam/sdk/io/aws/s3/S3FileSystem.java | 128 +++++----- .../beam/sdk/io/aws/s3/S3FileSystemRegistrar.java | 2 +- .../io/aws/s3/S3ReadableSeekableByteChannel.java | 15 +- .../beam/sdk/io/aws/s3/S3WritableByteChannel.java | 52 +++- .../beam/sdk/io/aws/options/AwsModuleTest.java | 2 +- .../beam/sdk/io/aws/s3/MatchResultMatcher.java | 4 +- .../beam/sdk/io/aws/s3/S3FileSystemTest.java | 262 +++++++++++++++------ .../beam/sdk/io/aws/s3/S3ResourceIdTest.java | 41 ++-- .../org/apache/beam/sdk/io/aws/s3/S3TestUtils.java | 82 +++++++ .../sdk/io/aws/s3/S3WritableByteChannelTest.java | 102 ++++++-- 14 files changed, 561 insertions(+), 206 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
