Skip to content

Do not set scheme if unset #667

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
merged 4 commits into from
Mar 3, 2023
Merged

Do not set scheme if unset #667

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6325c6
Do not set scheme if unset
mswintermeyer Mar 1, 2023
2defbb8
Add generated changelog entries
svc-changelog Mar 1, 2023
3ef5a2b
add test for s3 checkPath validation
mswintermeyer Mar 3, 2023
06e2db1
simpler unit test
mswintermeyer Mar 3, 2023
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
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-667.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: StandaloneEncryptedFileSystem returns to its old behavior, of only
overriding the scheme when the uri uses a scheme
links:
- https://github.com/palantir/hadoop-crypto/pull/667
3 changes: 3 additions & 0 deletions hadoop-crypto/src/main/java/com/palantir/crypto2/hadoop/StandaloneEncryptedFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ private static Function<Path, Path> setSchemeFunc(final String scheme) {

private static Function<URI, URI> setUriSchemeFunc(final String scheme) {
return uri -> {
if (uri.getScheme() == null) {
Copy link
Contributor

@ellisjoe ellisjoe Mar 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two quick things:

  • Do you have an example where things have broken when this scheme is set?
  • Can we write a test that illustrates this behavior in action?

return uri;
}
try {
return new URI(
scheme,
Expand Down