Bugfix for broken epp templates #86
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
bastelfreak
reviewed
Aug 30, 2018
| content => epp('fail2ban/common/custom_filter.conf.epp'), | ||
| content => epp('fail2ban/common/custom_filter.conf.epp', | ||
| { | ||
| findtime => $findtime, |
|
Thanks for the fix @cFire ! Can you please add a unit test for this as well? We need at least check if the catalog compiles. |
|
The spec tests I added are pretty basic but they at least verify it compiles and that some of the specified variables actually make it into the config files. |
bastelfreak
reviewed
Aug 31, 2018
spec/classes/init_spec.rb
Outdated
|
|
||
| describe 'fail2ban::jail' do | ||
| it do | ||
| is_expected.to compile |
There was a problem hiding this comment.
can you update it to: compile.with_all_deps ?
bastelfreak
reviewed
Aug 31, 2018
spec/defines/fail2ban_jail_spec.rb
Outdated
| let(:title) { 'spec_test_jail' } | ||
| let(:pre_condition) { 'include fail2ban' } | ||
| let(:facts) do | ||
| { |
There was a problem hiding this comment.
instead of mocking the facts by hand, please use rspec-puppet-facts. An example: https://github.com/voxpupuli/puppet-zabbix/blob/master/spec/classes/web_spec.rb#L18
bastelfreak
reviewed
Aug 31, 2018
spec/defines/fail2ban_jail_spec.rb
Outdated
| end | ||
|
|
||
| it do | ||
| is_expected.to compile |
There was a problem hiding this comment.
can you update it to: compile.with_all_deps ?
|
Thanks! |
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.
Pull Request (PR) description
epp templates for custom jails and filters are broken due to epp not being able to directly reach into the calling class's variable scope. Workaround implemented by passing the required variables into the epp function call in the defined type code.
This Pull Request (PR) fixes the following issues
Fixes #74
Fixes #27