Skip to content

HADOOP-18465. Fix S3A SSE test skip when encryption is disabled #4977

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
steveloughran merged 1 commit into from
Oct 19, 2022
Merged

HADOOP-18465. Fix S3A SSE test skip when encryption is disabled #4977

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
12 changes: 10 additions & 2 deletions ...op-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractTestS3AEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,16 @@ protected void patchConfigurationEncryptionSettings(
0, 1, 2, 3, 4, 5, 254, 255, 256, 257, 2 ^ 12 - 1
};

/**
* Skips the tests if encryption is not enabled in configuration.
*
* @implNote We can use {@link #createConfiguration()} here since
* it does not depend on any per-bucket based configuration.
* Otherwise, we would need to grab the configuration from an
* instance of {@link S3AFileSystem}.
*/
protected void requireEncryptedFileSystem() {
skipIfEncryptionTestsDisabled(getFileSystem().getConf());
skipIfEncryptionTestsDisabled(createConfiguration());
}

/**
Expand All @@ -91,8 +99,8 @@ protected void requireEncryptedFileSystem() {
@Override
public void setup() throws Exception {
try {
super.setup();
requireEncryptedFileSystem();
super.setup();
} catch (AccessDeniedException e) {
skip("Bucket does not allow " + getSSEAlgorithm() + " encryption method");
}
Expand Down