fix: Detect unknown fields in invalid specs as OutOfSync #154
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.
There are a couple of spots in
diff.go
that are unmarshalling JSON resource data into k8s structs, but in doing so they are silently tossing (invalid) JSON fields that are not present in that struct. In general, this is due to the use ofjson.Unmarshal(...)
(whose default implementation silently ignores extra fields) in conjunction with k8s structs that do not contain those extra fields.The fix is:
decoder := json.NewDecoder(strings.NewReader(string(data)))
anddecoder.DisallowUnknownFields()
to detect unknown fields whenremarshall
ingapplyPatch
ing against a Kubernetes resource, indirectly apply the result of the scheme default functions to the target JSON, rather than directly marshalling the scheme function results to the k8s resource (which would cause those extra fields to be discarded)See code comments for details.
Fixes argoproj/argo-cd#1787