DNM - Extend hidden_fields to allow more complicated field definitions #880
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
|
Merge Failed. This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset. |
This allows us to ignore e.g. the last-applied-configuration annotation by specifying `metadata.annotations[kubectl.kubernetes.io/last-applied-configuration]`
Needed to cope with multiple levels of bracketed keys e.g. spec.template.spec[securityContext][runAsUser] and implementing that lead to a much simpler version that finds the first key and the rest, and deals with just those two. Added more tests to cover some of the new supported cases.
Ensure test correctly captures that hidden fields should be hidden in diffs too
example: @yurnov ➜ /workspaces/kubernetes.core (hide-fields) $ flake8 plugins/ @yurnov ➜ /workspaces/kubernetes.core (hide-fields) $ black --diff plugins/ --- /workspaces/kubernetes.core/plugins/module_utils/k8s/service.py 2025-02-03 09:02:53.501654+00:00 +++ /workspaces/kubernetes.core/plugins/module_utils/k8s/service.py 2025-02-03 09:03:33.328340+00:00 @@ -653,14 +653,14 @@ rbracket = hidden_field.find("]") dot = hidden_field.find(".") if lbracket == 0: # skip past right bracket and any following dot - rest = hidden_field[rbracket + 1:] + rest = hidden_field[rbracket + 1 :] if rest and rest[0] == ".": rest = rest[1:] - return (hidden_field[lbracket + 1: rbracket], rest) + return (hidden_field[lbracket + 1 : rbracket], rest) if lbracket != -1 and (dot == -1 or lbracket < dot): return (hidden_field[:lbracket], hidden_field[lbracket:]) split = hidden_field.split(".", 1) would reformat /workspaces/kubernetes.core/plugins/module_utils/k8s/service.py All done! ✨ 🍰 ✨ 1 file would be reformatted, 73 files would be left unchanged. @yurnov ➜ /workspaces/kubernetes.core (hide-fields) $ black plugins/ reformatted /workspaces/kubernetes.core/plugins/module_utils/k8s/service.py All done! ✨ 🍰 ✨ 1 file reformatted, 73 files left unchanged. @yurnov ➜ /workspaces/kubernetes.core (hide-fields) $ flake8 plugins/ plugins/module_utils/k8s/service.py:658:41: E203 whitespace before ':' plugins/module_utils/k8s/service.py:661:42: E203 whitespace before ':' @yurnov ➜ /workspaces/kubernetes.core (hide-fields) $
…-lint and yamllint close ansible-collections#874
abikouo
force-pushed
the
ab_hidden_fields_20250213
branch
from
ac4781d to
28a8e38
Compare
|
Build succeeded. ✔️ ansible-galaxy-importer SUCCESS in 3m 38s |
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.
SUMMARY
Fixes corner case from #872
ISSUE TYPE