(MODULES-1582) File location placeholder #377
Merged
Conversation
This file contains hidden or 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
| @@ -34,10 +38,17 @@ module Puppet::Parser::Functions | |||
| begin | |||
| tmpfile.write(content) | |||
| tmpfile.close | |||
|
|
|||
| if checkscript.include?('%') | |||
| check_with_correct_location = checkscript.gsub(/%/,tmpfile.path) | |||
There was a problem hiding this comment.
Should we instead check & match /\s%(\s|$)/ ?
There was a problem hiding this comment.
To avoid any validate commands that have %'s in them other than "... % ..."
added 3 commits
December 18, 2014 23:08
This simply `gsub`'s the file path into where the % placeholder is.
These specs are pretty much the same as the originals, but now check that the output has the correct replacement for file location
Avoids any validate commands that have %'s in them other than "... % ..."
hunner
added a commit
that referenced
this pull request
Dec 18, 2014
(MODULES-1582) File location placeholder
petems
added a commit
to petems/puppetlabs-concat
that referenced
this pull request
Feb 12, 2015
Correct command is `test -e $filename` Also % replacement in validate_cmd is not supported in a released version of puppetlabs-stdlib, it's fixed in 4.5.x but not not released yet (See: puppetlabs/puppetlabs-stdlib#377)
petems
added a commit
to petems/puppetlabs-concat
that referenced
this pull request
Feb 12, 2015
Correct command is `test -e $filename` Also % replacement in validate_cmd is not supported in a released version of puppetlabs-stdlib, it's fixed in 4.5.x but not not released yet (See: puppetlabs/puppetlabs-stdlib#377)
petems
added a commit
to petems/puppetlabs-concat
that referenced
this pull request
Feb 18, 2015
Correct command is `test -e $filename` Also % replacement in validate_cmd is not supported in a released version of puppetlabs-stdlib, it's fixed in 4.5.x but not not released yet (See: puppetlabs/puppetlabs-stdlib#377)
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.
This makes the validate_cmd closer to the file implementation, and allows a user to
give a validate_cmd path where the filepath is not at the end of the string.
The example I found was with haproxy, which uses the following command for file validation:
/usr/sbin/haproxy -f /etc/haproxy.cfg -cCurrently this isn't possible to do with stdlib, so I made this PR to fix it! 💃