Skip to content

Commit df37d67

Browse files
committed
make typed in IaaS client mock
1 parent 34cd84b commit df37d67

3 files changed

Lines changed: 733 additions & 61 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ mocks: $(MOCKGEN)
136136
# client mocks
137137
@$(MOCKGEN) -destination ./pkg/stackit/metadata/metadata_mock.go -package metadata ./pkg/stackit/metadata IMetadata
138138
@$(MOCKGEN) -destination ./pkg/csi/util/mount/mount_mock.go -package mount ./pkg/csi/util/mount IMount
139-
@$(MOCKGEN) -destination ./pkg/stackit/client/mock/iaas_mock.go -package client ./pkg/stackit/client IaaSClient
139+
@$(MOCKGEN) -destination ./pkg/stackit/client/mock/iaas_mock.go -typed -package client ./pkg/stackit/client IaaSClient
140140
@$(MOCKGEN) -destination ./pkg/stackit/client/mock/loadbalancer_mock.go -package client ./pkg/stackit/client LoadBalancingClient
141141
@$(MOCKGEN) -destination ./pkg/stackit/client/mock/mock.go -package client ./pkg/stackit/client Factory
142142

pkg/csi/blockstorage/sanity_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ var _ = Describe("CSI sanity test", Ordered, func() {
124124

125125
iaasClient.EXPECT().ListVolumes(
126126
gomock.Any(), gomock.Any(), gomock.Eq(""),
127-
).DoAndReturn(func(_ context.Context, _ int, _ string) ([]iaas.Volume, string, error) {
127+
).DoAndReturn(func(_ context.Context, _ int, _ string) ([]iaas.Volume, error) {
128128
var volList []iaas.Volume
129129
for _, vol := range createdVolumes {
130130
volList = append(volList, *vol) // Append the value
131131
}
132-
return volList, "", nil
132+
return volList, nil
133133
}).AnyTimes()
134134

135135
iaasClient.EXPECT().DeleteVolume(
@@ -162,7 +162,7 @@ var _ = Describe("CSI sanity test", Ordered, func() {
162162
iaasClient.EXPECT().CreateSnapshot(
163163
gomock.Any(), // context
164164
gomock.Any(), // payload
165-
).DoAndReturn(func(_ context.Context, name string, volID string, _ map[string]string) (*iaas.Snapshot, error) {
165+
).DoAndReturn(func(_ context.Context, payload *iaas.CreateSnapshotPayload) (*iaas.Snapshot, error) {
166166
newSnap := &iaas.Snapshot{
167167
Id: new(uuid.New().String()),
168168
Name: new(name),

0 commit comments

Comments
 (0)