fix(okms_secret): detect drift on data change #1162
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
alexGNX
force-pushed
the
dev/agagneux/okms_secret_fix
branch
from
ac54557 to
d1f97a1
Compare
Signed-off-by: alexGNX <[email protected]>
alexGNX
force-pushed
the
dev/agagneux/okms_secret_fix
branch
from
d1f97a1 to
f1ff375
Compare
jrm-d
requested changes
Dec 11, 2025
Comment on lines
+294
to
+321
| // semanticJSONEqual compares two JSON strings for semantic equality, | ||
| // ignoring formatting differences like whitespace and key ordering. | ||
| func semanticJSONEqual(a, b string) bool { | ||
| var objA, objB interface{} | ||
|
|
||
| // Try to parse both as JSON | ||
| if err := json.Unmarshal([]byte(a), &objA); err != nil { | ||
| // Not valid JSON, fall back to string comparison | ||
| return a == b | ||
| } | ||
| if err := json.Unmarshal([]byte(b), &objB); err != nil { | ||
| // Not valid JSON, fall back to string comparison | ||
| return a == b | ||
| } | ||
|
|
||
| // Re-marshal both in canonical form and compare | ||
| normalizedA, err := json.Marshal(objA) | ||
| if err != nil { | ||
| return a == b | ||
| } | ||
| normalizedB, err := json.Marshal(objB) | ||
| if err != nil { | ||
| return a == b | ||
| } | ||
|
|
||
| return string(normalizedA) == string(normalizedB) | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
Maybe we could reduce the amount of []byte <--> string conversions here, for example:
func semanticJSONEqual(a, b []byte) bool {
var objA, objB any
// Try to parse both as JSON
if err := json.Unmarshal(a, &objA); err != nil {
// Not valid JSON, fall back to []byte comparison
return slices.Equal(a, b)
}
if err := json.Unmarshal(b, &objB); err != nil {
return false
}
return reflect.DeepEqual(objA, objB)
}
you would only have to convert input parameters as []byte to call this func
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
The fix is about detecting changes made to an
okms_secretresource outside of terraform and reconcile the states.Fixes #1147 (issue)
Type of change
How Has This Been Tested?
Checklist:
go mod vendorif I added or modifygo.modfile