Add "purge_zones" option to delete unmanaged zones #59
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
This introduces a "purge_zones" toggle which, if enabled, ensures zones not managed using the firewalld pillar get deleted. Useful to enforce that only Salt managed zones exist and to clean up pre-Salt data. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
baby-gnu
approved these changes
Feb 7, 2024
firewalld/zones.sls
Outdated
Comment on lines
49
to
51
| {%- for file in salt['file.find']('/etc/firewalld/zones', name='*.xml', print='name', type='f') %} | ||
|
|
||
| {%- if file.replace('.xml', '') not in firewalld.get('zones', {}).keys() %} |
There was a problem hiding this comment.
As a matter of style, I would set a variable to calculate the firewalld.get('zones', {}).keys() once instead of for each file.
There was a problem hiding this comment.
Hi, I concur. I switched the existing loop in the file to a variable as well whilst at it, see 7883127.
Avoid redundant lookups and keys calculations. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
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?No, option is disabled by default.
Related issues and/or pull requests
n/a
Describe the changes you're proposing
This introduces a "purge_zones" toggle which, if enabled, ensures
zones not managed using the firewalld pillar get deleted.
Pillar / 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
Unsure how to have the test suite create a dummy file the absence of which could then be asserted with the pillar option enabled.