Skip to content

Commit a6c8a70

Browse files
committed
fix refactoring with convertStringMapToInterfaceMap util func
1 parent 1b7bdca commit a6c8a70

File tree

5 files changed

+7
-37
lines changed

5 files changed

+7
-37
lines changed

internal/cmd/volume/backup/update/update_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
99
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
10+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1011

1112
"github.com/google/go-cmp/cmp"
1213
"github.com/google/go-cmp/cmp/cmpopts"
@@ -68,12 +69,7 @@ func fixtureRequest(mods ...func(request *iaas.ApiUpdateBackupRequest)) iaas.Api
6869
payload := iaas.NewUpdateBackupPayloadWithDefaults()
6970
payload.Name = &testName
7071

71-
// Convert test labels to map[string]interface{}
72-
labelsMap := map[string]interface{}{}
73-
for k, v := range testLabels {
74-
labelsMap[k] = v
75-
}
76-
payload.Labels = &labelsMap
72+
payload.Labels = utils.ConvertStringMapToInterfaceMap(utils.Ptr(testLabels))
7773

7874
request = request.UpdateBackupPayload(*payload)
7975
for _, mod := range mods {

internal/cmd/volume/snapshot/create/create.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
171171
payload := iaas.NewCreateSnapshotPayloadWithDefaults()
172172
payload.VolumeId = &model.VolumeID
173173
payload.Name = model.Name
174-
175-
// Convert labels to map[string]interface{}
176-
if len(model.Labels) > 0 {
177-
labelsMap := map[string]interface{}{}
178-
for k, v := range model.Labels {
179-
labelsMap[k] = v
180-
}
181-
payload.Labels = &labelsMap
182-
}
174+
payload.Labels = utils.ConvertStringMapToInterfaceMap(utils.Ptr(model.Labels))
183175

184176
req = req.CreateSnapshotPayload(*payload)
185177
return req

internal/cmd/volume/snapshot/create/create_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ func fixtureRequest(mods ...func(request *iaas.ApiCreateSnapshotRequest)) iaas.A
6363
payload.VolumeId = &testVolumeId
6464
payload.Name = utils.Ptr(testName)
6565

66-
// Convert test labels to map[string]interface{}
67-
labelsMap := map[string]interface{}{}
68-
for k, v := range testLabels {
69-
labelsMap[k] = v
70-
}
71-
payload.Labels = &labelsMap
66+
payload.Labels = utils.ConvertStringMapToInterfaceMap(utils.Ptr(testLabels))
7267

7368
request = request.CreateSnapshotPayload(*payload)
7469
for _, mod := range mods {

internal/cmd/volume/snapshot/update/update.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
137137
req := apiClient.UpdateSnapshot(ctx, model.ProjectId, model.SnapshotId)
138138
payload := iaas.NewUpdateSnapshotPayloadWithDefaults()
139139
payload.Name = model.Name
140-
141-
// Convert labels to map[string]interface{}
142-
if len(model.Labels) > 0 {
143-
labelsMap := map[string]interface{}{}
144-
for k, v := range model.Labels {
145-
labelsMap[k] = v
146-
}
147-
payload.Labels = &labelsMap
148-
}
140+
payload.Labels = utils.ConvertStringMapToInterfaceMap(utils.Ptr(model.Labels))
149141

150142
req = req.UpdateSnapshotPayload(*payload)
151143
return req

internal/cmd/volume/snapshot/update/update_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
88
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
99
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
10+
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1011

1112
"github.com/google/go-cmp/cmp"
1213
"github.com/google/go-cmp/cmp/cmpopts"
@@ -67,13 +68,7 @@ func fixtureRequest(mods ...func(request *iaas.ApiUpdateSnapshotRequest)) iaas.A
6768
request := testClient.UpdateSnapshot(testCtx, testProjectId, testSnapshotId)
6869
payload := iaas.NewUpdateSnapshotPayloadWithDefaults()
6970
payload.Name = &testName
70-
71-
// Convert test labels to map[string]interface{}
72-
labelsMap := map[string]interface{}{}
73-
for k, v := range testLabels {
74-
labelsMap[k] = v
75-
}
76-
payload.Labels = &labelsMap
71+
payload.Labels = utils.ConvertStringMapToInterfaceMap(utils.Ptr(testLabels))
7772

7873
request = request.UpdateSnapshotPayload(*payload)
7974
for _, mod := range mods {

0 commit comments

Comments
 (0)