-
Notifications
You must be signed in to change notification settings - Fork 303
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
MODULES-1678 - Add show_diff attribute to concat and concat::fragment defined types #368
Conversation
|
Hi, |
a4e41b8
to
501c1d8
Compare
|
@HelenCampbell - I fixed the tests. Please take a look to see if there is anything else I need to fix. |
501c1d8
to
8b85c3d
Compare
|
Found and removed a whitespace change. |
|
@HelenCampbell Do I need to submit a new pull request? |
| @@ -16,6 +16,7 @@ group :development, :unit_tests do | |||
| gem 'simplecov', :require => false | |||
| gem 'puppet_facts', :require => false | |||
| gem 'json', :require => false | |||
| gem 'metadata-json-lint', :require => false | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this not moduleynced?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not know what is meant by 'moduleynced'. I had to add that line in order to get the tests to pass on my local box.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed line locally and retested successfully, so removed line from the commit. Tests are successful.
|
@jdkindy I think a |
|
@bmjen The reason for adding the show_diff parameter to concat::fragment resources is that diffs of the file resources defined as part of concat::fragment are included in the reports. Leaving show_diff out of concat::fragment allows secrets to appear in reports. Puppet runs show diffs of both the resultant concat file resource as well as diffs of the concat::fragment file resources. |
|
I'd like to have this feature as well (for the same "secret" reason ;-) ) |
|
@jdkindy I think I understand the reticence towards show_diff and how it corresponds to the fragment files. However, I am still against the exposure of the show_diff param in the fragment resource, as fragments should be internal resources only. I think an appropriate middle ground would be to remove the show_diff param from the fragment.. and force the fragment file to show_diff=false all the time. Thoughts? |
|
I totally agree ! :-) |
|
@bmjen I intended for the users to be able to choose fragments if they wished. However, if the plan is for concat to move to a native type and the concat::fragment type will not have a show_diff, I am ok with setting it to false for all concat::fragment resources. |
093a51c
to
6b11d3b
Compare
| $owner = undef, | ||
| $group = undef, | ||
| $backup = undef | ||
| $content = undef, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The alignment here needs to be fixed since show_diff was removed.
|
Thanks for the update @jdkindy! A few more comments and we're set for merge! |
6b11d3b
to
a7789fa
Compare
|
@bmjen I think this commit takes care of all of the issues with the previous one. |
|
Awesome. Thanks for all the work @jdkindy ! |
MODULES-1678 - Add show_diff attribute to concat and concat::fragment defined types
|
Thks @jdkindy :-) |
Add show_diff to concat and concat::fragment types.