adjust tests for new interfaces

marceljk · marceljk · commit ff88d569c9f6 · 2025-05-22T11:17:32.000+02:00
diff --git a/internal/cmd/beta/alb/list/list_test.go b/internal/cmd/beta/alb/list/list_test.go
@@ -5,12 +5,12 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stackitcloud/stackit-cli/internal/cmd/params"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/print"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/google/uuid"
 	"github.com/stackitcloud/stackit-sdk-go/services/alb"
 )
@@ -49,7 +49,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 }
 
 func fixtureRequest(mods ...func(request *alb.ApiListLoadBalancersRequest)) alb.ApiListLoadBalancersRequest {
-	request := testClient.ListLoadBalancers(context.Background(), testProjectId, testRegion)
+	request := testClient.ListLoadBalancers(testCtx, testProjectId, testRegion)
 	for _, mod := range mods {
 		mod(&request)
 	}
@@ -160,7 +160,6 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(alb.ApiListLoadBalancersRequest{}, "ctx"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/beta/alb/plans/plans_test.go b/internal/cmd/beta/alb/plans/plans_test.go
@@ -156,7 +156,6 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(alb.ApiListLoadBalancersRequest{}, "ctx"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/beta/alb/quotas/quotas_test.go b/internal/cmd/beta/alb/quotas/quotas_test.go
@@ -156,7 +156,6 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(alb.ApiListLoadBalancersRequest{}, "ctx"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/git/create/create_test.go b/internal/cmd/git/create/create_test.go
@@ -184,7 +184,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Name = "new-name"
 			}),
 			expectedRequest: fixtureRequest(func(request *git.ApiCreateInstanceRequest) {
-				*request = request.CreateInstancePayload(fixtureCreatePayload(func(payload *git.CreateInstancePayload) {
+				*request = (*request).CreateInstancePayload(fixtureCreatePayload(func(payload *git.CreateInstancePayload) {
 					payload.Name = utils.Ptr("new-name")
 				}))
 			}),
diff --git a/internal/cmd/image/create/create_test.go b/internal/cmd/image/create/create_test.go
@@ -339,7 +339,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Labels = nil
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
-				*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
+				*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
 					payload.Labels = nil
 				}))
 			}),
@@ -350,7 +350,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Config.CdromBus = utils.Ptr("foobar")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
-				*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
+				*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
 					payload.Config.CdromBus = iaas.NewNullableString(utils.Ptr("foobar"))
 				}))
 			}),
@@ -361,7 +361,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Config.Uefi = false
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
-				*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
+				*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
 					payload.Config.Uefi = utils.Ptr(false)
 				}))
 			}),
diff --git a/internal/cmd/image/list/list_test.go b/internal/cmd/image/list/list_test.go
@@ -184,7 +184,7 @@ func TestBuildRequest(t *testing.T) {
 				model.LabelSelector = utils.Ptr("")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiListImagesRequest) {
-				*request = request.LabelSelector("")
+				*request = (*request).LabelSelector("")
 			}),
 		},
 		{
@@ -193,7 +193,7 @@ func TestBuildRequest(t *testing.T) {
 				model.LabelSelector = utils.Ptr("foo=bar")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiListImagesRequest) {
-				*request = request.LabelSelector("foo=bar")
+				*request = (*request).LabelSelector("foo=bar")
 			}),
 		},
 	}
diff --git a/internal/cmd/image/update/update_test.go b/internal/cmd/image/update/update_test.go
@@ -373,7 +373,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Labels = nil
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
-				*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
+				*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
 					payload.Labels = nil
 				}))
 			}),
@@ -384,7 +384,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Name = utils.Ptr("something else")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
-				*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
+				*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
 					payload.Name = utils.Ptr("something else")
 				}))
 			}),
@@ -395,7 +395,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Config.CdromBus = utils.Ptr("something else")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
-				*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
+				*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
 					payload.Config.CdromBus.Set(utils.Ptr("something else"))
 				}))
 			}),
diff --git a/internal/cmd/load-balancer/observability-credentials/add/add_test.go b/internal/cmd/load-balancer/observability-credentials/add/add_test.go
@@ -189,7 +189,7 @@ func TestBuildRequest(t *testing.T) {
 			diff := cmp.Diff(request, tt.expectedRequest,
 				cmp.AllowUnexported(tt.expectedRequest),
 				cmpopts.EquateComparable(testCtx),
-				cmpopts.IgnoreFields(loadbalancer.ApiCreateCredentialsRequest{}, "xRequestID"),
+				cmpopts.IgnoreFields(loadbalancer.CreateCredentialsRequest{}, "xRequestID"),
 			)
 			if diff != "" {
 				t.Fatalf("Data does not match: %s", diff)
diff --git a/internal/cmd/load-balancer/target-pool/add-target/add_target_test.go b/internal/cmd/load-balancer/target-pool/add-target/add_target_test.go
@@ -338,7 +338,7 @@ func TestBuildRequest(t *testing.T) {
 						},
 					}
 				})
-				*request = request.UpdateTargetPoolPayload(*payload)
+				*request = (*request).UpdateTargetPoolPayload(*payload)
 			}),
 		},
 		{
@@ -357,7 +357,7 @@ func TestBuildRequest(t *testing.T) {
 						},
 					}
 				})
-				*request = request.UpdateTargetPoolPayload(*payload)
+				*request = (*request).UpdateTargetPoolPayload(*payload)
 			}),
 		},
 		{
@@ -376,7 +376,7 @@ func TestBuildRequest(t *testing.T) {
 						},
 					}
 				})
-				*request = request.UpdateTargetPoolPayload(*payload)
+				*request = (*request).UpdateTargetPoolPayload(*payload)
 			}),
 		},
 		{
diff --git a/internal/cmd/load-balancer/target-pool/remove-target/remove_target_test.go b/internal/cmd/load-balancer/target-pool/remove-target/remove_target_test.go
@@ -320,7 +320,7 @@ func TestBuildRequest(t *testing.T) {
 				payload := fixturePayload(func(payload *loadbalancer.UpdateTargetPoolPayload) {
 					payload.Targets = utils.Ptr((*payload.Targets)[1:])
 				})
-				*request = request.UpdateTargetPoolPayload(*payload)
+				*request = (*request).UpdateTargetPoolPayload(*payload)
 			}),
 		},
 		{
diff --git a/internal/cmd/network-area/route/create/create_test.go b/internal/cmd/network-area/route/create/create_test.go
@@ -241,7 +241,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Labels = utils.Ptr(map[string]string{"key": "value"})
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateNetworkAreaRouteRequest) {
-				*request = request.CreateNetworkAreaRoutePayload(fixturePayload(func(payload *iaas.CreateNetworkAreaRoutePayload) {
+				*request = (*request).CreateNetworkAreaRoutePayload(fixturePayload(func(payload *iaas.CreateNetworkAreaRoutePayload) {
 					(*payload.Ipv4)[0].Labels = utils.Ptr(map[string]interface{}{"key": "value"})
 				}))
 			}),
diff --git a/internal/cmd/observability/grafana/public-read-access/disable/disable_test.go b/internal/cmd/observability/grafana/public-read-access/disable/disable_test.go
@@ -262,7 +262,7 @@ func TestBuildRequest(t *testing.T) {
 			}),
 			isValid: true,
 			expectedRequest: fixtureRequest(func(request *observability.ApiUpdateGrafanaConfigsRequest) {
-				*request = request.UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
+				*request = (*request).UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
 					payload.GenericOauth = nil
 				}))
 			}),
diff --git a/internal/cmd/observability/grafana/public-read-access/enable/enable_test.go b/internal/cmd/observability/grafana/public-read-access/enable/enable_test.go
@@ -262,7 +262,7 @@ func TestBuildRequest(t *testing.T) {
 			}),
 			isValid: true,
 			expectedRequest: fixtureRequest(func(request *observability.ApiUpdateGrafanaConfigsRequest) {
-				*request = request.UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
+				*request = (*request).UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
 					payload.GenericOauth = nil
 				}))
 			}),
diff --git a/internal/cmd/observability/grafana/single-sign-on/disable/disable_test.go b/internal/cmd/observability/grafana/single-sign-on/disable/disable_test.go
@@ -262,7 +262,7 @@ func TestBuildRequest(t *testing.T) {
 			}),
 			isValid: true,
 			expectedRequest: fixtureRequest(func(request *observability.ApiUpdateGrafanaConfigsRequest) {
-				*request = request.UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
+				*request = (*request).UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
 					payload.GenericOauth = nil
 				}))
 			}),
diff --git a/internal/cmd/observability/grafana/single-sign-on/enable/enable_test.go b/internal/cmd/observability/grafana/single-sign-on/enable/enable_test.go
@@ -262,7 +262,7 @@ func TestBuildRequest(t *testing.T) {
 			}),
 			isValid: true,
 			expectedRequest: fixtureRequest(func(request *observability.ApiUpdateGrafanaConfigsRequest) {
-				*request = request.UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
+				*request = (*request).UpdateGrafanaConfigsPayload(*fixturePayload(func(payload *observability.UpdateGrafanaConfigsPayload) {
 					payload.GenericOauth = nil
 				}))
 			}),
diff --git a/internal/cmd/project/list/list_test.go b/internal/cmd/project/list/list_test.go
@@ -67,7 +67,7 @@ func fixtureRequest(mods ...func(request *resourcemanager.ApiListProjectsRequest
 
 	testCreationTimeAfter, err := time.Parse(creationTimeAfterFormat, testCreationTimeAfter)
 	if err != nil {
-		return resourcemanager.ApiListProjectsRequest{}
+		return resourcemanager.ListProjectsRequest{}
 	}
 	request = request.CreationTimeStart(testCreationTimeAfter)
 	request = request.Member("member")
diff --git a/internal/cmd/security-group/create/create_test.go b/internal/cmd/security-group/create/create_test.go
@@ -227,7 +227,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Labels = nil
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateSecurityGroupRequest) {
-				*request = request.CreateSecurityGroupPayload(iaas.CreateSecurityGroupPayload{
+				*request = (*request).CreateSecurityGroupPayload(iaas.CreateSecurityGroupPayload{
 					Description: &testDescription,
 					Labels:      nil,
 					Name:        &testName,
@@ -241,7 +241,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Stateful = utils.Ptr(false)
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiCreateSecurityGroupRequest) {
-				*request = request.CreateSecurityGroupPayload(iaas.CreateSecurityGroupPayload{
+				*request = (*request).CreateSecurityGroupPayload(iaas.CreateSecurityGroupPayload{
 					Description: &testDescription,
 					Labels:      utils.Ptr(toStringAnyMapPtr(testLabels)),
 					Name:        &testName,
diff --git a/internal/cmd/security-group/list/list_test.go b/internal/cmd/security-group/list/list_test.go
@@ -178,7 +178,7 @@ func TestBuildRequest(t *testing.T) {
 				model.LabelSelector = utils.Ptr("")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiListSecurityGroupsRequest) {
-				*request = request.LabelSelector("")
+				*request = (*request).LabelSelector("")
 			}),
 		},
 		{
@@ -187,7 +187,7 @@ func TestBuildRequest(t *testing.T) {
 				model.LabelSelector = utils.Ptr("foo=bar")
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiListSecurityGroupsRequest) {
-				*request = request.LabelSelector("foo=bar")
+				*request = (*request).LabelSelector("foo=bar")
 			}),
 		},
 	}
diff --git a/internal/cmd/security-group/update/update_test.go b/internal/cmd/security-group/update/update_test.go
@@ -268,7 +268,7 @@ func TestBuildRequest(t *testing.T) {
 				model.Labels = nil
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateSecurityGroupRequest) {
-				*request = request.UpdateSecurityGroupPayload(iaas.UpdateSecurityGroupPayload{
+				*request = (*request).UpdateSecurityGroupPayload(iaas.UpdateSecurityGroupPayload{
 					Description: &testDescription,
 					Labels:      nil,
 					Name:        &testName,
diff --git a/internal/cmd/server/reboot/reboot_test.go b/internal/cmd/server/reboot/reboot_test.go
@@ -199,7 +199,7 @@ func TestBuildRequest(t *testing.T) {
 				model.HardReboot = true
 			}),
 			expectedRequest: fixtureRequest(func(request *iaas.ApiRebootServerRequest) {
-				*request = request.Action("hard")
+				*request = (*request).Action("hard")
 			}),
 		},
 	}
diff --git a/internal/pkg/services/load-balancer/utils/utils_test.go b/internal/pkg/services/load-balancer/utils/utils_test.go
@@ -56,7 +56,7 @@ func (m *loadBalancerClientMocked) ListLoadBalancersExecute(_ context.Context, _
 }
 
 func (m *loadBalancerClientMocked) UpdateTargetPool(_ context.Context, _, _, _, _ string) loadbalancer.ApiUpdateTargetPoolRequest {
-	return loadbalancer.ApiUpdateTargetPoolRequest{}
+	return loadbalancer.UpdateTargetPoolRequest{}
 }
 
 func fixtureLoadBalancer(mods ...func(*loadbalancer.LoadBalancer)) *loadbalancer.LoadBalancer {

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,6 @@ func TestBuildRequest(t *testing.T) {`
`156`	`156`	`diff := cmp.Diff(request, tt.expectedRequest,`
`157`	`157`	`cmp.AllowUnexported(tt.expectedRequest),`
`158`	`158`	`cmpopts.EquateComparable(testCtx),`
`159`		`- cmpopts.IgnoreFields(alb.ApiListLoadBalancersRequest{}, "ctx"),`
`160`	`159`	`)`
`161`	`160`	`if diff != "" {`
`162`	`161`	`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`	`diff := cmp.Diff(request, tt.expectedRequest,`
`190`	`190`	`cmp.AllowUnexported(tt.expectedRequest),`
`191`	`191`	`cmpopts.EquateComparable(testCtx),`
`192`		`- cmpopts.IgnoreFields(loadbalancer.ApiCreateCredentialsRequest{}, "xRequestID"),`
	`192`	`+ cmpopts.IgnoreFields(loadbalancer.CreateCredentialsRequest{}, "xRequestID"),`
`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
`@@ -338,7 +338,7 @@ func TestBuildRequest(t *testing.T) {`
`338`	`338`	`},`
`339`	`339`	`}`
`340`	`340`	`})`
`341`		`- request = request.UpdateTargetPoolPayload(payload)`
	`341`	`+ request = (request).UpdateTargetPoolPayload(*payload)`
`342`	`342`	`}),`
`343`	`343`	`},`
`344`	`344`	`{`
`@@ -357,7 +357,7 @@ func TestBuildRequest(t *testing.T) {`
`357`	`357`	`},`
`358`	`358`	`}`
`359`	`359`	`})`
`360`		`- request = request.UpdateTargetPoolPayload(payload)`
	`360`	`+ request = (request).UpdateTargetPoolPayload(*payload)`
`361`	`361`	`}),`
`362`	`362`	`},`
`363`	`363`	`{`
`@@ -376,7 +376,7 @@ func TestBuildRequest(t *testing.T) {`
`376`	`376`	`},`
`377`	`377`	`}`
`378`	`378`	`})`
`379`		`- request = request.UpdateTargetPoolPayload(payload)`
	`379`	`+ request = (request).UpdateTargetPoolPayload(*payload)`
`380`	`380`	`}),`
`381`	`381`	`},`
`382`	`382`	`{`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ func TestBuildRequest(t *testing.T) {`
`320`	`320`	`payload := fixturePayload(func(payload *loadbalancer.UpdateTargetPoolPayload) {`
`321`	`321`	`payload.Targets = utils.Ptr((*payload.Targets)[1:])`
`322`	`322`	`})`
`323`		`- request = request.UpdateTargetPoolPayload(payload)`
	`323`	`+ request = (request).UpdateTargetPoolPayload(*payload)`
`324`	`324`	`}),`
`325`	`325`	`},`
`326`	`326`	`{`