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.

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

Do not set scheme if unset #667

Merged
merged 4 commits into from
Mar 3, 2023

Conversation

mswintermeyer
Copy link
Contributor

@mswintermeyer mswintermeyer commented Mar 1, 2023

Before this PR

StandaloneEncryptedFileSystem#setUriSchemeFunc will always set the uri's scheme, even if it's not already set.

After this PR

We only set the scheme if it's already set. This matches the behavior of this class in 2.9.2: https://github.com/palantir/hadoop-crypto/pull/442/files#diff-050a60db63beecf42d4d99e5e9132ee7f6dc68ae9b552e37ff5ccd2a109806d6L166
==COMMIT_MSG==
StandaloneEncryptedFileSystem returns to its old behavior, of only overriding the scheme when the uri uses a scheme
==COMMIT_MSG==

Possible downsides?

@changelog-app
Copy link

changelog-app bot commented Mar 1, 2023

Generate changelog in changelog/@unreleased

Type

  • Feature
  • Improvement
  • Fix
  • Break
  • Deprecation
  • Manual task
  • Migration

Description

StandaloneEncryptedFileSystem returns to its old behavior, of only overriding the scheme when the uri uses a scheme

Check the box to generate changelog(s)

  • Generate changelog entry

@@ -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

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?

@bulldozer-bot bulldozer-bot bot merged commit caeebb0 into develop Mar 3, 2023
@bulldozer-bot bulldozer-bot bot deleted the michaelw/standalone-fs-check-scheme branch March 3, 2023 20:55
@svc-autorelease
Copy link
Collaborator

Released 3.5.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants