Finish conversion to EPP templates #2545
Open
+1,104
−2,447
Commits on Jun 6, 2024
-
This code section is weird. My guess is someone unexpectedly pressed `J` in vi and joined multiple lines.
-
-
Fix apache::vhost::error_documents data type
The template in templates/vhost/_error_document.erb is only functionnal if we pass an array of hashes. This is going to be simplified in a future commit so only accept values that produce working configuration and reject configuration that is invalid and ignored.
-
Make sure we still support ERB templates when provided
`apache::mod::php` allows to pass an ERB template, switching the default template to EPP will require us to change the default value of the `template` parameter which is generally a breaking change. Users who rely on this parameter to provide a custom template are currently using an ERB template, so we must preserve the legacy behavior for them, and detect if the template should be processed as ERB or EPP. For this purpose, we check the file extension in a conservative way (any template whose filename does not end with `.epp` is assumbed to be an ERB template). As a result, this change is backwards-compatible for end-users.
-
A lot of work was done to convert the module templates form ERB to EPP, but a few templates where still to be converted. Along with various benefits, EPP templates offer better detection for access to undefined variables. This refactoring therefore fix a few issues that where reported while converting. Also a bunch of outdated comments about which template use which variable where removed no that this usage is explicit. The extensive test suite helped ensure the conversion was not introducing regressions.
-
A required variable in the template does not exist in the class parameters. Maybe nobody use this and we can just ignore this for the next few weeks RedHat 7 (the only OS exercising this code path) is supported?
-
-
The typing system allows us to build more straightforward type checking, while here replace some conditional constructs to non-conditional ones as we usualy do nowadays.
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.