MODULES-3699 Deprecation spec fix 2#646
Merged
bmjen merged 1 commit intopuppetlabs:masterfrom Sep 1, 2016
Merged
Conversation
Contributor
eputnam
commented
Sep 1, 2016
- The manifest containing the deprecation function needed to be modified (surrounded in double quotes) to work as a puppet apply command on windows.
- "exist" was not working on Solaris 10 because the underlying command doesn't actually exist on Solaris 10, so I changed it to "be_file" which works just fine for this.
- Added conditional logic to accommodate Windows paths.
fee6697 to
9b2a65f
Compare
| test_file = "/tmp/deprecation" | ||
| end | ||
|
|
||
| add_file_manifest = "\"deprecation('key', 'message') file { '#{test_file}': ensure => present, content => 'test', }\"" |
Contributor
There was a problem hiding this comment.
can you make this look like this instead:
add_file_manifest = <<-EOS
deprecation('key', 'message')
file { '#{test_file}':
ensure => present,
content => 'test',
}
EOS
It's just easier to read and maintain.
Same with remove_file_manifest.
Contributor
Author
There was a problem hiding this comment.
It'd be totally easier to read and maintain that way, but since it's run on the command line (puppet apply -e style) instead of with apply_manifest, Windows seems to need it formatted this way.
3875b7f to
d2296c9
Compare
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
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.