Skip to content

SuppressJsonDiff supports json array #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

SuppressJsonDiff supports json array #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3c7c2
SuppressJsonDiff supports json array
magodo Nov 15, 2022
0256ba4
Add test
magodo Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions helper/structure/suppress_json_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
package structure

import (
"encoding/json"
"reflect"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func SuppressJsonDiff(k, oldValue, newValue string, d *schema.ResourceData) bool {
oldMap, err := ExpandJsonFromString(oldValue)
if err != nil {
var o, n interface{}
if err := json.Unmarshal([]byte(oldValue), &o); err != nil {
return false
}

newMap, err := ExpandJsonFromString(newValue)
if err != nil {
if err := json.Unmarshal([]byte(newValue), &n); err != nil {
return false
}

return reflect.DeepEqual(oldMap, newMap)
return reflect.DeepEqual(o, n)
}
27 changes: 27 additions & 0 deletions helper/structure/suppress_json_diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,33 @@ func TestSuppressJsonDiff(t *testing.T) {
newValue: `{ "enabled": true }`,
expected: true,
},
"different-structure (array)": {
oldValue: `[{ "enabled": true }]`,
newValue: `[{ "enabled": true, "world": "round" }]`,
expected: false,
},
"different-value (array)": {
oldValue: `[{ "enabled": true }]`,
newValue: `[{ "enabled": false }]`,
expected: false,
},
"different order (array)": {
oldValue: `[{ "enabled": true }, { "enabled": false }]`,
newValue: `[{ "enabled": false }, { "enabled": true }]`,
expected: false,
},
"same (array)": {
oldValue: `[{ "enabled": true }]`,
newValue: `[{ "enabled": true }]`,
expected: true,
},
"same-whitespace (array)": {
oldValue: `[{
"enabled": true
}]`,
newValue: `[{ "enabled": true }]`,
expected: true,
},
}

for name, testCase := range testCases {
Expand Down