chore(logs): rework cmpopts.EquateComparabl

j1n-o9r · j1n-o9r · commit 0646fb944c44 · 2026-06-24T11:43:02.000+02:00
diff --git a/internal/cmd/logs/access_token/create/create_test.go b/internal/cmd/logs/access_token/create/create_test.go
@@ -86,8 +86,8 @@ func fixturePayload(mods ...func(payload *logs.CreateAccessTokenPayload)) logs.C
 		Description: utils.Ptr(testDescription),
 		Lifetime:    utils.Ptr(int32(0)),
 		Permissions: []logs.PermissionsInner{
-			"read",
-			"write",
+			logs.PERMISSIONSINNER_READ,
+			logs.PERMISSIONSINNER_WRITE,
 		},
 	}
 	for _, mod := range mods {
@@ -215,8 +215,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(tt.expectedRequest, request,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 				cmpopts.EquateEmpty(),
 			)
 			if diff != "" {
@@ -244,8 +243,8 @@ func TestOutputResult(t *testing.T) {
 				accessToken: utils.Ptr(logs.AccessToken{
 					Id: uuid.NewString(),
 					Permissions: []logs.PermissionsInner{
-						"read",
-						"write",
+						logs.PERMISSIONSINNER_READ,
+						logs.PERMISSIONSINNER_WRITE,
 					},
 					DisplayName: "Token",
 					AccessToken: utils.Ptr("Secret access token"),
diff --git a/internal/cmd/logs/access_token/delete/delete_test.go b/internal/cmd/logs/access_token/delete/delete_test.go
@@ -197,7 +197,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/access_token/delete_all/delete_all_test.go b/internal/cmd/logs/access_token/delete_all/delete_all_test.go
@@ -153,7 +153,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired_test.go b/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired_test.go
@@ -153,7 +153,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/access_token/describe/describe_test.go b/internal/cmd/logs/access_token/describe/describe_test.go
@@ -199,7 +199,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/access_token/list/list_test.go b/internal/cmd/logs/access_token/list/list_test.go
@@ -171,7 +171,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/access_token/update/update_test.go b/internal/cmd/logs/access_token/update/update_test.go
@@ -265,8 +265,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/instance/create/create_test.go b/internal/cmd/logs/instance/create/create_test.go
@@ -192,8 +192,7 @@ func TestBuildRequest(t *testing.T) {
 			request := buildRequest(testCtx, tt.model, testClient)
 			diff := cmp.Diff(tt.expectedRequest, request,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 				cmpopts.EquateEmpty(),
 			)
 			if diff != "" {
diff --git a/internal/cmd/logs/instance/delete/delete_test.go b/internal/cmd/logs/instance/delete/delete_test.go
@@ -165,7 +165,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/instance/describe/describe_test.go b/internal/cmd/logs/instance/describe/describe_test.go
@@ -140,7 +140,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logs/instance/update/update_test.go b/internal/cmd/logs/instance/update/update_test.go
@@ -242,7 +242,6 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ func TestBuildRequest(t *testing.T) {`
`197`	`197`
`198`	`198`	`diff := cmp.Diff(request, tt.expectedRequest,`
`199`	`199`	`cmp.AllowUnexported(tt.expectedRequest),`
`200`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`200`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`201`	`201`	`)`
`202`	`202`	`if diff != "" {`
`203`	`203`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func TestBuildRequest(t *testing.T) {`
`153`	`153`
`154`	`154`	`diff := cmp.Diff(request, tt.expectedRequest,`
`155`	`155`	`cmp.AllowUnexported(tt.expectedRequest),`
`156`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`156`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`157`	`157`	`)`
`158`	`158`	`if diff != "" {`
`159`	`159`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func TestBuildRequest(t *testing.T) {`
`199`	`199`
`200`	`200`	`diff := cmp.Diff(request, tt.expectedRequest,`
`201`	`201`	`cmp.AllowUnexported(tt.expectedRequest),`
`202`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`202`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`203`	`203`	`)`
`204`	`204`	`if diff != "" {`
`205`	`205`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ func TestBuildRequest(t *testing.T) {`
`171`	`171`
`172`	`172`	`diff := cmp.Diff(request, tt.expectedRequest,`
`173`	`173`	`cmp.AllowUnexported(tt.expectedRequest),`
`174`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`174`	`+ cmpopts.EquateComparable(testCtx),`
`175`	`175`	`)`
`176`	`176`	`if diff != "" {`
`177`	`177`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -265,8 +265,7 @@ func TestBuildRequest(t *testing.T) {`
`265`	`265`
`266`	`266`	`diff := cmp.Diff(request, tt.expectedRequest,`
`267`	`267`	`cmp.AllowUnexported(tt.expectedRequest),`
`268`		`- cmpopts.EquateComparable(testCtx),`
`269`		`- cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),`
	`268`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`270`	`269`	`)`
`271`	`270`	`if diff != "" {`
`272`	`271`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func TestBuildRequest(t *testing.T) {`
`165`	`165`
`166`	`166`	`diff := cmp.Diff(request, tt.expectedRequest,`
`167`	`167`	`cmp.AllowUnexported(tt.expectedRequest),`
`168`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`168`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`169`	`169`	`)`
`170`	`170`	`if diff != "" {`
`171`	`171`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func TestBuildRequest(t *testing.T) {`
`140`	`140`
`141`	`141`	`diff := cmp.Diff(request, tt.expectedRequest,`
`142`	`142`	`cmp.AllowUnexported(tt.expectedRequest),`
`143`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`143`	`+ cmpopts.EquateComparable(testCtx, logs.DefaultAPIService{}),`
`144`	`144`	`)`
`145`	`145`	`if diff != "" {`
`146`	`146`	`t.Fatalf("Data does not match: %s", diff)`