feat(map): update to v5 map.jinja
#134
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
|
@baby-gnu I'm really glad that you've provided this PR. It's unfortunate that I'm in a busier patch than usual, so that I'm unable to review it so far. Hopefully, I'll get time over the coming days. Thanks again! |
|
@baby-gnu I finally got a chance to test this on top of the latest changes I've made to the
local:
Data failed to compile:
----------
Rendering SLS 'base:openvpn._mapdata' failed: Jinja error: do_indent() got an unexpected keyword argument 'first'
/tmp/kitchen/var/cache/salt/minion/files/base/openvpn/libmatchers.jinja(61):
---
[...]
"query_method": query_map[_defaults["query_type"]],
"query_delimiter": _defaults["query_delimiter"],
"query": matcher
}
) %}
{%- do salt["log.debug"]( <======================
log_prefix
~ "use built-in defaults for matcher:\n"
~ parsed | yaml(False) | indent(4, first=True)
) %}
.. versionchanged:: 2.10
Blank lines are not indented by default.
Rename the ``indentfirst`` argument to ``first``.
Unfortunately, since |
|
Thanks a lot for this review, I'll look how to make the code compatible with all versions. |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
5eb57cb to
a29fe55
Compare
|
Strange, I thought that the new Any idea @myii? |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
a29fe55 to
5516658
Compare
I sorted the |
Merged
19 tasks
|
I rebased the branch with final version of |
@baby-gnu The changes haven't been pushed here yet, though? |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
5516658 to
746c589
Compare
Yes, I pushed my |
myii
requested changes
Jan 12, 2021
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
2 times, most recently
from
3759287 to
e74a757
Compare
|
Hello @myii. I added:
each file must return a valid YAML content to be merged by I think we could event generalise the process: for each In this formula, this will result in:
If you agree, I can make a new commit to show how this will behave. |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
4 times, most recently
from
0b078a7 to
a2a6548
Compare
|
I made commits to explore the automatic load of sample of debug log |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
a2a6548 to
a734b08
Compare
|
Now, the It can manipulate the {%- do salt["log.debug"]("User defined post map.jinja manipulation") %}Which produce the following log: When no |
|
I need to update the |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
a734b08 to
77c60f2
Compare
|
I updated the documentation, I'll rebase the commits when it's OK to merge. Thanks. |
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
b6ac61b to
39006a0
Compare
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
39006a0 to
01edab6
Compare
BREAKING CHANGE: `map.jinja` now export a generic `mapdata` variable BREAKING CHANGE: The parameters per grains are now under `openvpn/parameters/`
For each `.yaml` file that `map.jinja` try to load, a `.yaml.jinja` Jinja template is tried right after to permit jinja manipulation of values and circumvent yamllint errors when using Jinja in YAML files. At the end of the load of YAML files and Jinja YAML templates, `map.jinja` include an optional `post-map.jinja` for post-processing the `mapdata` variable.
baby-gnu
force-pushed
the
feature/v5-map.jinja
branch
from
722a47a to
4db7d6f
Compare
|
I think I finished the rebase of that PR. |
|
🎉 This PR is included in version 1.0.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
This was referenced Feb 15, 2021
myii
added a commit
to myii/ssf-formula
that referenced
this pull request
Mar 7, 2021
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.
PR progress checklist (to be filled in by reviewers)
What type of PR is this?
Primary type
[build]Changes related to the build system[chore]Changes to the build process or auxiliary tools and libraries such as documentation generation[ci]Changes to the continuous integration configuration[feat]A new feature[fix]A bug fix[perf]A code change that improves performance[refactor]A code change that neither fixes a bug nor adds a feature[revert]A change used to revert a previous commit[style]Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)Secondary type
[docs]Documentation changes[test]Adding missing or correcting existing testsDoes this PR introduce a
BREAKING CHANGE?Yes.
BREAKING CHANGE:
map.jinjanow export a genericmapdatavariableBREAKING CHANGE: The parameters per grains are now under
openvpn/parameters/Related issues and/or pull requests
Describe the changes you're proposing
Use the under reviewing v5
map.jinja:libmatchers.jinja)map.jinjaconfigurable by loading the globalsalt://parameters/map_jinja.yamland the per formulasalt://{{ tplroot }}/parameters/map_jinja.yaml(managed by the newlibmapstack.jinja)libmapstack.jinjamap.jinjaconfiguration to avoid the merge of values fromsalt["config.get"]("openvpn")like it was done previouslyPillar / config required to test the proposed changes
Debug log showing how the proposed changes work
Documentation checklist
README(e.g.Available states).pillar.example.Testing checklist
state_top).Additional context