adding support for include directive in map #1149
Conversation
manifests/resource/map.pp
Outdated
| @@ -67,6 +76,7 @@ | |||
| Variant[Array, Hash] $mappings, | |||
| Optional[String] $default = undef, | |||
| Enum['absent', 'present'] $ensure = 'present', | |||
| Array[String] $includes = [], | |||
There was a problem hiding this comment.
Will this work if it's an empty array, since you're not checking if it's empty in the template? Will this create an empty includes line?
Maybe this should be Optional[Array[String]] $includes?
There was a problem hiding this comment.
Because there's a default value you can omit it ; it acts as an optional parameter.
So if you pass an empty Array it will be the same as passing nothing and use the default value: it won't iterate nothing into the loop in template so nothing will be written (no empty includes line).
I agree with you since it is finally an optional parameter that declaring it explicitly as Optional would be better (but in that case the test in the template will became mandatory).
|
Can you add spec tests for this? |
|
FWIW, there's a consistency issue here as well, as server resource uses |
|
I much prefer not making it For consistency with I'd be tempted to change the |
… with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly
|
I squash-merged, thanks for the contribution @ceonizm! With the other PRs, if you're able to squash / force-push (or break into logical commits), that would be great. |
* adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses
* adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses
adding support for include directive in map (voxpupuli#1149) * adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses adding support for proxy_cache_bypass and proxy_cache_lock (voxpupuli#1150) * adding support for proxy_cache_bypass and proxy_cache_lock * adding tests and restrict proxy_cache_lock to enum modifié : manifests/resource/location.pp modifié : manifests/resource/map.pp modifié : manifests/resource/server.pp modifié : spec/defines/resource_location_spec.rb modifié : spec/defines/resource_map_spec.rb modifié : templates/conf.d/map.erb modifié : templates/server/locations/proxy.erb
…nd directives adding documentation comments adding support for include directive in map (voxpupuli#1149) * adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses adding support for proxy_cache_bypass and proxy_cache_lock (voxpupuli#1150) * adding support for proxy_cache_bypass and proxy_cache_lock * adding tests and restrict proxy_cache_lock to enum fixing access_log, adding error_log and adding tests access_log: adding format_log to stay consistent with server declaration: when using it just disable logging, error_log: adding error_level to be able to set a different error level per location if needed); passing off disable the error_log changing type to Optional[Variant[Array, String]] for access_log & error_log to handle multiple declaration changing type to Optional[Variant[Array, String]] for access_log & error_log to handle multiple declaration
adding support for include directive in map (voxpupuli#1149) * adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses (cherry picked from commit 2ea5aac)
* adding support for include directive in map * change param name includes to include_files to keep naming consistent with the other manifests adding test to ensure empty value , single and multiple inclusions works correctly * fix rubocop offenses
As requested in previous PR (#1145) I've splitted features in multiples branches and PR:
Hello,
I needed to use the include directive in a map block to handle some redirections that were dynamically generated by an other app. I noticed this feature was missing from your module so I've added it.
Best Regards
François.