Fix expansion of ~ in configured paths #1208
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It does not seem to work with the docker tests |
|
integration tests on docker are fixed. |
konnov
approved these changes
Jan 13, 2022
| object Converters { | ||
| // Provides implicit conversions used when deserializing into configurable values. | ||
| private object Converters { | ||
| import pureconfig.ConvertHelpers._ | ||
|
|
||
| private def expandedFilePath(s: String): Path = { | ||
| Paths.get(if (s.startsWith("~")) s.replaceFirst("~", System.getProperty("user.home")) else s) |
There was a problem hiding this comment.
Shall we check, whether a string is starting with "~" + File.separator. Otherwise, we would misinterpret strings like ~user1, which have a different meaning in shell.
There was a problem hiding this comment.
Sorry. Had this configured for auto merge once approved.
yeah, the expansion is not strictly correct. But that’s not actually introduced in this PR: it’s just a continuation of the initial code from the outputManager.
I’ll address this in a follow up tho.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@Kukovec reported that
~was not be expanded in configured paths correctly.Indeed, this was an oversight on my part. I failed to correctly override
pureconfig's reader for
PathandFiletypes. This PR fixes that mistake.Followup to #1160
make fmt-fix(or had formatting run automatically on all files edited)