(MODULES-8404) - Relax Stdlib::Filesource type
#981
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
The previous regex only supported the special `modules` `puppet:///` mount point. Custom mount points should also be accepted. https://puppet.com/docs/puppet/5.5/file_serving.html#whats-a-mount-point-in-a-puppet-uri
alexjfisher
commented
Dec 23, 2018
| @@ -25,8 +46,6 @@ | |||
| '\\Users/hc/wksp/stdlib', | |||
| 'C:noslashes', | |||
| '\\var\\tmp', | |||
| 'puppet:///foo/bar.log', | |||
| 'puppet:///pm.example.com/modules/foo/bar.log', | |||
There was a problem hiding this comment.
At first glance this might not look valid, but I can't see anything that says pm.example.com couldn't be a valid mount point. Unlikely and unusual, yes, but not technically invalid.
bastelfreak
reviewed
Dec 23, 2018
| ['https://hello.com', 'https://notcreative.org', 'https://canstillaccepthttps.co.uk', 'http://anhttp.com', 'http://runningoutofideas.gov', 'file:///hello/bla', 'file:///foo/bar.log', | ||
| 'puppet:///modules/foo/bar.log', 'puppet://pm.example.com/modules/foo/bar.log', 'puppet://192.0.2.1/modules/foo/bar.log', '/usr2/username/bin:/usr/local/bin:/usr/bin:.', 'C:/', 'C:\\', | ||
| 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/var/tmp', '/var/opt/../lib/puppet'].each do |value| | ||
| [ |
There was a problem hiding this comment.
oh thanks for reformatting
There was a problem hiding this comment.
I know it creates noise, but it really was pretty hard to read as was.
bastelfreak
approved these changes
Dec 23, 2018
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.
The previous regex only supported the special
modulespuppet:///mount point. Custom mount points should also be accepted.
https://puppet.com/docs/puppet/5.5/file_serving.html#whats-a-mount-point-in-a-puppet-uri