Skip to content

Commit bd01af7

Browse files
authored
refactor: avoid usage of github.com/go-test/deep (use reflect.DeepEqual instead) (#2427)
1 parent fae643d commit bd01af7

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.22
55
require (
66
github.com/andygrunwald/go-jira/v2 v2.0.0-20240116150243-50d59fe116d6
77
github.com/aws/aws-sdk-go v1.54.19
8-
github.com/go-test/deep v1.1.1
98
github.com/hashicorp/go-changelog v0.0.0-20240318095659-4d68c58a6e7f
109
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
1110
github.com/hashicorp/go-version v1.7.0

internal/common/conversion/encode_state_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package conversion_test
22

33
import (
4+
"reflect"
45
"testing"
56

6-
"github.com/go-test/deep"
77
"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
88
)
99

@@ -16,8 +16,8 @@ func TestEncodeDecodeID(t *testing.T) {
1616

1717
got := conversion.DecodeStateID(conversion.EncodeStateID(expected))
1818

19-
if diff := deep.Equal(expected, got); diff != nil {
20-
t.Fatalf("Bad testEncodeDecodeID return \n got = %#v\nwant = %#v \ndiff = %#v", got, expected, diff)
19+
if !reflect.DeepEqual(expected, got) {
20+
t.Fatalf("Bad testEncodeDecodeID return \n got = %#v\nwant = %#v", got, expected)
2121
}
2222
}
2323

@@ -28,7 +28,7 @@ func TestDecodeID(t *testing.T) {
2828
got := conversion.DecodeStateID(expected)
2929
got2 := conversion.DecodeStateID(expected2)
3030

31-
if diff := deep.Equal(got, got2); diff != nil {
32-
t.Fatalf("Bad TestDecodeID return \n got = %#v\nwant = %#v \ndiff = %#v", got, got2, diff)
31+
if !reflect.DeepEqual(got, got2) {
32+
t.Fatalf("Bad TestDecodeID return \n got = %#v\nwant = %#v", got, got2)
3333
}
3434
}

internal/service/cloudbackupsnapshot/model_cloud_backup_snapshot_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package cloudbackupsnapshot_test
22

33
import (
4+
"reflect"
45
"testing"
56

6-
"github.com/go-test/deep"
77
"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cloudbackupsnapshot"
88
"go.mongodb.org/atlas-sdk/v20240530002/admin"
99
)
@@ -20,8 +20,8 @@ func TestSplitSnapshotImportID(t *testing.T) {
2020
SnapshotId: "5cf5a45a9ccf6400e60981b7",
2121
}
2222

23-
if diff := deep.Equal(expected, got); diff != nil {
24-
t.Errorf("Bad splitSnapshotImportID return \n got = %#v\nwant = %#v \ndiff = %#v", expected, *got, diff)
23+
if !reflect.DeepEqual(expected, got) {
24+
t.Errorf("Bad splitSnapshotImportID return \n got = %#v\nwant = %#v", expected, *got)
2525
}
2626

2727
if _, err := cloudbackupsnapshot.SplitSnapshotImportID("5cf5a45a9ccf6400e60981b6projectname-environment-mongo-global-cluster5cf5a45a9ccf6400e60981b7"); err == nil {

internal/service/eventtrigger/resource_event_trigger.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"fmt"
88
"log"
99
"net/http"
10+
"reflect"
1011
"strings"
1112

12-
"github.com/go-test/deep"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1515
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -118,8 +118,7 @@ func Resource() *schema.Resource {
118118
log.Printf("[ERROR] json.Unmarshal %v", err)
119119
return false
120120
}
121-
if diff := deep.Equal(&j, &j2); diff != nil {
122-
log.Printf("[DEBUG] deep equal not passed: %v", diff)
121+
if !reflect.DeepEqual(&j, &j2) {
123122
return false
124123
}
125124

@@ -140,8 +139,7 @@ func Resource() *schema.Resource {
140139
log.Printf("[ERROR] json.Unmarshal %v", err)
141140
return false
142141
}
143-
if diff := deep.Equal(&j, &j2); diff != nil {
144-
log.Printf("[DEBUG] deep equal not passed: %v", diff)
142+
if !reflect.DeepEqual(&j, &j2) {
145143
return false
146144
}
147145

internal/service/searchindex/model_search_index.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"context"
66
"encoding/json"
77
"log"
8+
"reflect"
89
"strconv"
910

10-
"github.com/go-test/deep"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -131,8 +131,7 @@ func diffSuppressJSON(k, old, newStr string, d *schema.ResourceData) bool {
131131
if err := json.Unmarshal([]byte(newStr), &j2); err != nil {
132132
log.Printf("[ERROR] cannot unmarshal new search index analyzer json %v", err)
133133
}
134-
if diff := deep.Equal(&j, &j2); diff != nil {
135-
log.Printf("[DEBUG] deep equal not passed: %v", diff)
134+
if !reflect.DeepEqual(&j, &j2) {
136135
return false
137136
}
138137

0 commit comments

Comments
 (0)