diff: fix secret redaction for secrets with stringData #407
Conversation
This file contains hidden or 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
I observed that `go test ./diff` works, but `go test .diff -run TestManifests` fails because TestManifests silently relies on TestPrintDiffWithContext to call ansi.DisableColors().
Fixes databus23#302. redactSecrets() uses `stringData` as a behind-the-scenes crutch for holding redacted values from `data`. To ensure that secrets using `secretData` diff correctly, this change moves all `secretData` values into `data` before performing the redaction. Moving `secretData` into `data` is the same rewrite that the k8s apiserver does [1]. We follow the same precedence rules as k8s: A value in `stringData` takes precedence over a value with the same key in `data`. [1] https://kubernetes.io/docs/concepts/configuration/secret/#restriction-names-data
databus23
approved these changes
Sep 22, 2022
|
Thanks! |
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.
Fixes #302.
This is a better alternative to #393, with the following differences:
stringDatatodatadoes not do an incorrect second Base64 encoding (the Base64 encoding is handled within k8s/client-go during YAML marshalling). For reference, this is the equivalent code in the k8s apiserver.dataorstringDatasections.