chore(logs): fix suggestion from related PR

j1n-o9r · j1n-o9r · commit 265d515d0675 · 2026-06-24T13:35:02.000+02:00
diff --git a/internal/cmd/logme/credentials/create/create_test.go b/internal/cmd/logme/credentials/create/create_test.go
@@ -155,7 +155,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/credentials/delete/delete_test.go b/internal/cmd/logme/credentials/delete/delete_test.go
@@ -191,7 +191,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/credentials/describe/describe_test.go b/internal/cmd/logme/credentials/describe/describe_test.go
@@ -189,7 +189,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/credentials/list/list_test.go b/internal/cmd/logme/credentials/list/list_test.go
@@ -163,7 +163,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/instance/create/create_test.go b/internal/cmd/logme/instance/create/create_test.go
@@ -387,11 +387,11 @@ func TestBuildRequest(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			client := mockSettings{
+			settings := mockSettings{
 				returnError:       tt.getOfferingsFails,
 				listOfferingsResp: tt.getOfferingsResp,
 			}
-			request, err := buildRequest(testCtx, tt.model, newAPIMock(client))
+			request, err := buildRequest(testCtx, tt.model, newAPIMock(settings))
 			if err != nil {
 				if !tt.isValid {
 					return
@@ -402,8 +402,8 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
 				cmpopts.EquateEmpty(),
+				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/instance/delete/delete_test.go b/internal/cmd/logme/instance/delete/delete_test.go
@@ -161,7 +161,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/instance/describe/describe_test.go b/internal/cmd/logme/instance/describe/describe_test.go
@@ -162,7 +162,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/instance/list/list_test.go b/internal/cmd/logme/instance/list/list_test.go
@@ -136,7 +136,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/instance/update/update_test.go b/internal/cmd/logme/instance/update/update_test.go
@@ -441,11 +441,11 @@ func TestBuildRequest(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.description, func(t *testing.T) {
-			client := mockSettings{
+			settings := mockSettings{
 				returnError:       tt.getOfferingsFails,
 				listOfferingsResp: tt.listOfferingsResp,
 			}
-			request, err := buildRequest(testCtx, tt.model, newAPIMock(client))
+			request, err := buildRequest(testCtx, tt.model, newAPIMock(settings))
 			if err != nil {
 				if !tt.isValid {
 					return
@@ -456,8 +456,8 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
 				cmpopts.EquateEmpty(),
+				cmpopts.IgnoreFields(tt.expectedRequest, "ApiService"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/logme/plans/plans_test.go b/internal/cmd/logme/plans/plans_test.go
@@ -136,7 +136,7 @@ func TestBuildRequest(t *testing.T) {
 
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
-				cmpopts.EquateComparable(testCtx, tt.expectedRequest),
+				cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func TestBuildRequest(t *testing.T) {`
`155`	`155`
`156`	`156`	`diff := cmp.Diff(request, tt.expectedRequest,`
`157`	`157`	`cmp.AllowUnexported(tt.expectedRequest),`
`158`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`158`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`159`	`159`	`)`
`160`	`160`	`if diff != "" {`
`161`	`161`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func TestBuildRequest(t *testing.T) {`
`191`	`191`
`192`	`192`	`diff := cmp.Diff(request, tt.expectedRequest,`
`193`	`193`	`cmp.AllowUnexported(tt.expectedRequest),`
`194`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`194`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`195`	`195`	`)`
`196`	`196`	`if diff != "" {`
`197`	`197`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ func TestBuildRequest(t *testing.T) {`
`189`	`189`
`190`	`190`	`diff := cmp.Diff(request, tt.expectedRequest,`
`191`	`191`	`cmp.AllowUnexported(tt.expectedRequest),`
`192`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`192`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`193`	`193`	`)`
`194`	`194`	`if diff != "" {`
`195`	`195`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func TestBuildRequest(t *testing.T) {`
`163`	`163`
`164`	`164`	`diff := cmp.Diff(request, tt.expectedRequest,`
`165`	`165`	`cmp.AllowUnexported(tt.expectedRequest),`
`166`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`166`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`167`	`167`	`)`
`168`	`168`	`if diff != "" {`
`169`	`169`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func TestBuildRequest(t *testing.T) {`
`161`	`161`
`162`	`162`	`diff := cmp.Diff(request, tt.expectedRequest,`
`163`	`163`	`cmp.AllowUnexported(tt.expectedRequest),`
`164`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`164`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`165`	`165`	`)`
`166`	`166`	`if diff != "" {`
`167`	`167`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ func TestBuildRequest(t *testing.T) {`
`162`	`162`
`163`	`163`	`diff := cmp.Diff(request, tt.expectedRequest,`
`164`	`164`	`cmp.AllowUnexported(tt.expectedRequest),`
`165`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`165`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`166`	`166`	`)`
`167`	`167`	`if diff != "" {`
`168`	`168`	`t.Fatalf("Data does not match: %s", diff)`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func TestBuildRequest(t *testing.T) {`
`136`	`136`
`137`	`137`	`diff := cmp.Diff(request, tt.expectedRequest,`
`138`	`138`	`cmp.AllowUnexported(tt.expectedRequest),`
`139`		`- cmpopts.EquateComparable(testCtx, tt.expectedRequest),`
	`139`	`+ cmpopts.EquateComparable(testCtx, logme.DefaultAPIService{}),`
`140`	`140`	`)`
`141`	`141`	`if diff != "" {`
`142`	`142`	`t.Fatalf("Data does not match: %s", diff)`