Skip to content

Commit f10aa3b

Browse files
cgoetz-inovexcgoetz-inovex
committed
update commands
1 parent 39f6590 commit f10aa3b

34 files changed

Lines changed: 252 additions & 251 deletions

File tree

‎internal/cmd/image/update/update.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type inputModel struct {
6060
Id string
6161
Name *string
6262
DiskFormat *string
63-
Labels *map[string]string
63+
Labels map[string]any
6464
Config *imageConfig
6565
MinDiskSize *int64
6666
MinRam *int64
@@ -134,7 +134,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
134134
projectLabel = model.ProjectId
135135
}
136136

137-
imageLabel, err := iaasUtils.GetImageName(ctx, apiClient, model.ProjectId, model.Region, model.Id)
137+
imageLabel, err := iaasUtils.GetImageName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.Id)
138138
if err != nil {
139139
params.Printer.Debug(print.WarningLevel, "cannot retrieve image name: %v", err)
140140
imageLabel = model.Id
@@ -153,7 +153,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
153153
if err != nil {
154154
return fmt.Errorf("update image: %w", err)
155155
}
156-
params.Printer.Info("Updated image \"%v\" for %q\n", utils.PtrString(resp.Name), projectLabel)
156+
params.Printer.Info("Updated image \"%v\" for %q\n", resp.Name, projectLabel)
157157

158158
return nil
159159
},
@@ -203,7 +203,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
203203
Name: flags.FlagToStringPointer(p, cmd, nameFlag),
204204

205205
DiskFormat: flags.FlagToStringPointer(p, cmd, diskFormatFlag),
206-
Labels: flags.FlagToStringToStringPointer(p, cmd, labelsFlag),
206+
Labels: flags.FlagToStringToAny(p, cmd, labelsFlag),
207207
Config: &imageConfig{
208208
Architecture: flags.FlagToStringPointer(p, cmd, architectureFlag),
209209
BootMenu: flags.FlagToBoolPointer(p, cmd, bootMenuFlag),
@@ -238,12 +238,12 @@ func parseInput(p *print.Printer, cmd *cobra.Command, cliArgs []string) (*inputM
238238
}
239239

240240
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateImageRequest {
241-
request := apiClient.UpdateImage(ctx, model.ProjectId, model.Region, model.Id)
241+
request := apiClient.DefaultAPI.UpdateImage(ctx, model.ProjectId, model.Region, model.Id)
242242
payload := iaas.NewUpdateImagePayload()
243243

244244
// Config *ImageConfig `json:"config,omitempty"`
245245
payload.DiskFormat = model.DiskFormat
246-
payload.Labels = utils.ConvertStringMapToInterfaceMap(model.Labels)
246+
payload.Labels = model.Labels
247247
payload.MinDiskSize = model.MinDiskSize
248248
payload.MinRam = model.MinRam
249249
payload.Name = model.Name
@@ -256,28 +256,28 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
256256
payload.Config.BootMenu = model.Config.BootMenu
257257
}
258258
if model.Config.CdromBus != nil {
259-
payload.Config.CdromBus = iaas.NewNullableString(model.Config.CdromBus)
259+
payload.Config.CdromBus = *iaas.NewNullableString(model.Config.CdromBus)
260260
}
261261
if model.Config.DiskBus != nil {
262-
payload.Config.DiskBus = iaas.NewNullableString(model.Config.DiskBus)
262+
payload.Config.DiskBus = *iaas.NewNullableString(model.Config.DiskBus)
263263
}
264264
if model.Config.NicModel != nil {
265-
payload.Config.NicModel = iaas.NewNullableString(model.Config.NicModel)
265+
payload.Config.NicModel = *iaas.NewNullableString(model.Config.NicModel)
266266
}
267267
if model.Config.OperatingSystem != nil {
268268
payload.Config.OperatingSystem = model.Config.OperatingSystem
269269
}
270270
if model.Config.OperatingSystemDistro != nil {
271-
payload.Config.OperatingSystemDistro = iaas.NewNullableString(model.Config.OperatingSystemDistro)
271+
payload.Config.OperatingSystemDistro = *iaas.NewNullableString(model.Config.OperatingSystemDistro)
272272
}
273273
if model.Config.OperatingSystemVersion != nil {
274-
payload.Config.OperatingSystemVersion = iaas.NewNullableString(model.Config.OperatingSystemVersion)
274+
payload.Config.OperatingSystemVersion = *iaas.NewNullableString(model.Config.OperatingSystemVersion)
275275
}
276276
if model.Config.RescueBus != nil {
277-
payload.Config.RescueBus = iaas.NewNullableString(model.Config.RescueBus)
277+
payload.Config.RescueBus = *iaas.NewNullableString(model.Config.RescueBus)
278278
}
279279
if model.Config.RescueDevice != nil {
280-
payload.Config.RescueDevice = iaas.NewNullableString(model.Config.RescueDevice)
280+
payload.Config.RescueDevice = *iaas.NewNullableString(model.Config.RescueDevice)
281281
}
282282
if model.Config.SecureBoot != nil {
283283
payload.Config.SecureBoot = model.Config.SecureBoot
@@ -286,7 +286,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
286286
payload.Config.Uefi = model.Config.Uefi
287287
}
288288
if model.Config.VideoModel != nil {
289-
payload.Config.VideoModel = iaas.NewNullableString(model.Config.VideoModel)
289+
payload.Config.VideoModel = *iaas.NewNullableString(model.Config.VideoModel)
290290
}
291291
if model.Config.VirtioScsi != nil {
292292
payload.Config.VirtioScsi = model.Config.VirtioScsi

‎internal/cmd/image/update/update_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
8080
return flagValues
8181
}
8282

83-
func parseLabels(labelstring string) map[string]string {
84-
labels := map[string]string{}
83+
func parseLabels(labelstring string) map[string]any {
84+
labels := map[string]any{}
8585
for _, part := range strings.Split(labelstring, ",") {
8686
v := strings.Split(part, "=")
8787
labels[v[0]] = v[1]
@@ -100,7 +100,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
100100
Id: testImageId[0],
101101
Name: &testName,
102102
DiskFormat: &testDiskFormat,
103-
Labels: utils.Ptr(parseLabels(testLabels)),
103+
Labels: parseLabels(testLabels),
104104
Config: &imageConfig{
105105
BootMenu: &testBootmenu,
106106
CdromBus: &testCdRomBus,
@@ -130,21 +130,21 @@ func fixtureCreatePayload(mods ...func(payload *iaas.UpdateImagePayload)) (paylo
130130
payload = iaas.UpdateImagePayload{
131131
Config: &iaas.ImageConfig{
132132
BootMenu: &testBootmenu,
133-
CdromBus: iaas.NewNullableString(&testCdRomBus),
134-
DiskBus: iaas.NewNullableString(&testDiskBus),
135-
NicModel: iaas.NewNullableString(&testNicModel),
133+
CdromBus: *iaas.NewNullableString(&testCdRomBus),
134+
DiskBus: *iaas.NewNullableString(&testDiskBus),
135+
NicModel: *iaas.NewNullableString(&testNicModel),
136136
OperatingSystem: &testOperatingSystem,
137-
OperatingSystemDistro: iaas.NewNullableString(&testOperatingSystemDistro),
138-
OperatingSystemVersion: iaas.NewNullableString(&testOperatingSystemVersion),
139-
RescueBus: iaas.NewNullableString(&testRescueBus),
140-
RescueDevice: iaas.NewNullableString(&testRescueDevice),
137+
OperatingSystemDistro: *iaas.NewNullableString(&testOperatingSystemDistro),
138+
OperatingSystemVersion: *iaas.NewNullableString(&testOperatingSystemVersion),
139+
RescueBus: *iaas.NewNullableString(&testRescueBus),
140+
RescueDevice: *iaas.NewNullableString(&testRescueDevice),
141141
SecureBoot: &testSecureBoot,
142142
Uefi: &testUefi,
143-
VideoModel: iaas.NewNullableString(&testVideoModel),
143+
VideoModel: *iaas.NewNullableString(&testVideoModel),
144144
VirtioScsi: &testVirtioScsi,
145145
},
146146
DiskFormat: &testDiskFormat,
147-
Labels: &map[string]interface{}{
147+
Labels: map[string]any{
148148
"foo": "FOO",
149149
"bar": "BAR",
150150
"baz": "BAZ",
@@ -161,7 +161,7 @@ func fixtureCreatePayload(mods ...func(payload *iaas.UpdateImagePayload)) (paylo
161161
}
162162

163163
func fixtureRequest(mods ...func(*iaas.ApiUpdateImageRequest)) iaas.ApiUpdateImageRequest {
164-
request := testClient.UpdateImage(testCtx, testProjectId, testRegion, testImageId[0])
164+
request := testClient.DefaultAPI.UpdateImage(testCtx, testProjectId, testRegion, testImageId[0])
165165

166166
request = request.UpdateImagePayload(fixtureCreatePayload())
167167

@@ -253,7 +253,7 @@ func TestParseInput(t *testing.T) {
253253
args: testImageId,
254254
isValid: true,
255255
expectedModel: fixtureInputModel(func(model *inputModel) {
256-
model.Labels = &map[string]string{
256+
model.Labels = map[string]any{
257257
"foo": "bar",
258258
}
259259
}),
@@ -439,7 +439,7 @@ func TestBuildRequest(t *testing.T) {
439439
request := buildRequest(testCtx, tt.model, testClient)
440440
diff := cmp.Diff(request, tt.expectedRequest,
441441
cmp.AllowUnexported(tt.expectedRequest, iaas.NullableString{}),
442-
cmpopts.EquateComparable(testCtx),
442+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
443443
)
444444
if diff != "" {
445445
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/key-pair/update/update.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const (
2525

2626
type inputModel struct {
2727
*globalflags.GlobalFlagModel
28-
Labels *map[string]string
28+
Labels map[string]any
2929
KeyPairName *string
3030
}
3131

@@ -82,10 +82,10 @@ func configureFlags(cmd *cobra.Command) {
8282
}
8383

8484
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateKeyPairRequest {
85-
req := apiClient.UpdateKeyPair(ctx, *model.KeyPairName)
85+
req := apiClient.DefaultAPI.UpdateKeyPair(ctx, *model.KeyPairName)
8686

8787
payload := iaas.UpdateKeyPairPayload{
88-
Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
88+
Labels: model.Labels,
8989
}
9090
return req.UpdateKeyPairPayload(payload)
9191
}
@@ -96,7 +96,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) inputM
9696

9797
model := inputModel{
9898
GlobalFlagModel: globalFlags,
99-
Labels: flags.FlagToStringToStringPointer(p, cmd, labelsFlag),
99+
Labels: flags.FlagToStringToAny(p, cmd, labelsFlag),
100100
KeyPairName: utils.Ptr(keyPairName),
101101
}
102102

‎internal/cmd/key-pair/update/update_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4545
GlobalFlagModel: &globalflags.GlobalFlagModel{
4646
Verbosity: globalflags.VerbosityDefault,
4747
},
48-
Labels: utils.Ptr(map[string]string{
48+
Labels: map[string]any{
4949
"foo": "bar",
50-
}),
50+
},
5151
KeyPairName: utils.Ptr(testKeyPairName),
5252
}
5353
for _, mod := range mods {
@@ -57,7 +57,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5757
}
5858

5959
func fixtureRequest(mods ...func(request *iaas.ApiUpdateKeyPairRequest)) iaas.ApiUpdateKeyPairRequest {
60-
request := testClient.UpdateKeyPair(testCtx, testKeyPairName)
60+
request := testClient.DefaultAPI.UpdateKeyPair(testCtx, testKeyPairName)
6161
request = request.UpdateKeyPairPayload(fixturePayload())
6262
for _, mod := range mods {
6363
mod(&request)
@@ -67,9 +67,9 @@ func fixtureRequest(mods ...func(request *iaas.ApiUpdateKeyPairRequest)) iaas.Ap
6767

6868
func fixturePayload(mods ...func(payload *iaas.UpdateKeyPairPayload)) iaas.UpdateKeyPairPayload {
6969
payload := iaas.UpdateKeyPairPayload{
70-
Labels: utils.Ptr(map[string]interface{}{
70+
Labels: map[string]interface{}{
7171
"foo": "bar",
72-
}),
72+
},
7373
}
7474
for _, mod := range mods {
7575
mod(&payload)
@@ -173,7 +173,7 @@ func TestBuildRequest(t *testing.T) {
173173

174174
diff := cmp.Diff(request, tt.expectedRequest,
175175
cmp.AllowUnexported(tt.expectedRequest),
176-
cmpopts.EquateComparable(testCtx),
176+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
177177
cmp.AllowUnexported(iaas.NullableString{}),
178178
)
179179
if diff != "" {

‎internal/cmd/network-area/region/update/update.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type inputModel struct {
3333
OrganizationId string
3434
NetworkAreaId string
3535

36-
IPv4DefaultNameservers *[]string
36+
IPv4DefaultNameservers []string
3737
IPv4DefaultPrefixLength *int64
3838
IPv4MaxPrefixLength *int64
3939
IPv4MinPrefixLength *int64
@@ -78,7 +78,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7878
}
7979

8080
// Get network area label
81-
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient, model.OrganizationId, model.NetworkAreaId)
81+
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient.DefaultAPI, model.OrganizationId, model.NetworkAreaId)
8282
if err != nil {
8383
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
8484
networkAreaLabel = model.NetworkAreaId
@@ -133,7 +133,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
133133
GlobalFlagModel: globalFlags,
134134
NetworkAreaId: flags.FlagToStringValue(p, cmd, networkAreaIdFlag),
135135
OrganizationId: flags.FlagToStringValue(p, cmd, organizationIdFlag),
136-
IPv4DefaultNameservers: flags.FlagToStringSlicePointer(p, cmd, ipv4DefaultNameservers),
136+
IPv4DefaultNameservers: flags.FlagToStringSliceValue(p, cmd, ipv4DefaultNameservers),
137137
IPv4DefaultPrefixLength: flags.FlagToInt64Pointer(p, cmd, ipv4DefaultPrefixLengthFlag),
138138
IPv4MaxPrefixLength: flags.FlagToInt64Pointer(p, cmd, ipv4MaxPrefixLengthFlag),
139139
IPv4MinPrefixLength: flags.FlagToInt64Pointer(p, cmd, ipv4MinPrefixLengthFlag),
@@ -144,7 +144,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
144144
}
145145

146146
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateNetworkAreaRegionRequest {
147-
req := apiClient.UpdateNetworkAreaRegion(ctx, model.OrganizationId, model.NetworkAreaId, model.Region)
147+
req := apiClient.DefaultAPI.UpdateNetworkAreaRegion(ctx, model.OrganizationId, model.NetworkAreaId, model.Region)
148148

149149
payload := iaas.UpdateNetworkAreaRegionPayload{
150150
Ipv4: &iaas.UpdateRegionalAreaIPv4{

‎internal/cmd/network-area/region/update/update_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6262
},
6363
OrganizationId: testOrgId,
6464
NetworkAreaId: testAreaId,
65-
IPv4DefaultNameservers: utils.Ptr(testDefaultNameservers),
65+
IPv4DefaultNameservers: testDefaultNameservers,
6666
IPv4DefaultPrefixLength: utils.Ptr(testDefaultPrefixLength),
6767
IPv4MaxPrefixLength: utils.Ptr(testMaxPrefixLength),
6868
IPv4MinPrefixLength: utils.Ptr(testMinPrefixLength),
@@ -74,7 +74,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
7474
}
7575

7676
func fixtureRequest(mods ...func(request *iaas.ApiUpdateNetworkAreaRegionRequest)) iaas.ApiUpdateNetworkAreaRegionRequest {
77-
request := testClient.UpdateNetworkAreaRegion(testCtx, testOrgId, testAreaId, testRegion)
77+
request := testClient.DefaultAPI.UpdateNetworkAreaRegion(testCtx, testOrgId, testAreaId, testRegion)
7878
request = request.UpdateNetworkAreaRegionPayload(fixturePayload())
7979
for _, mod := range mods {
8080
mod(&request)
@@ -88,14 +88,14 @@ func fixturePayload(mods ...func(payload *iaas.UpdateNetworkAreaRegionPayload))
8888
networkRange = make([]iaas.NetworkRange, len(testNetworkRanges))
8989
for i := range testNetworkRanges {
9090
networkRange[i] = iaas.NetworkRange{
91-
Prefix: utils.Ptr(testNetworkRanges[i]),
91+
Prefix: testNetworkRanges[i],
9292
}
9393
}
9494
}
9595

9696
payload := iaas.UpdateNetworkAreaRegionPayload{
9797
Ipv4: &iaas.UpdateRegionalAreaIPv4{
98-
DefaultNameservers: utils.Ptr(testDefaultNameservers),
98+
DefaultNameservers: testDefaultNameservers,
9999
DefaultPrefixLen: utils.Ptr(testDefaultPrefixLength),
100100
MaxPrefixLen: utils.Ptr(testMaxPrefixLength),
101101
MinPrefixLen: utils.Ptr(testMinPrefixLength),
@@ -213,7 +213,7 @@ func TestBuildRequest(t *testing.T) {
213213

214214
diff := cmp.Diff(request, tt.expectedRequest,
215215
cmp.AllowUnexported(tt.expectedRequest),
216-
cmpopts.EquateComparable(testCtx),
216+
cmpopts.EquateComparable(testCtx, iaas.DefaultAPIService{}),
217217
)
218218
if diff != "" {
219219
t.Fatalf("Data does not match: %s", diff)

‎internal/cmd/network-area/route/update/update.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type inputModel struct {
3434
OrganizationId *string
3535
NetworkAreaId *string
3636
RouteId string
37-
Labels *map[string]string
37+
Labels map[string]any
3838
}
3939

4040
func NewCmd(params *types.CmdParams) *cobra.Command {
@@ -66,7 +66,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
6666
}
6767

6868
// Get network area label
69-
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId)
69+
networkAreaLabel, err := iaasUtils.GetNetworkAreaName(ctx, apiClient.DefaultAPI, *model.OrganizationId, *model.NetworkAreaId)
7070
if err != nil {
7171
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
7272
networkAreaLabel = *model.NetworkAreaId
@@ -99,7 +99,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9999
routeId := inputArgs[0]
100100
globalFlags := globalflags.Parse(p, cmd)
101101

102-
labels := flags.FlagToStringToStringPointer(p, cmd, labelFlag)
102+
labels := flags.FlagToStringToAny(p, cmd, labelFlag)
103103

104104
if labels == nil {
105105
return nil, &cliErr.EmptyUpdateError{}
@@ -118,10 +118,10 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
118118
}
119119

120120
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiUpdateNetworkAreaRouteRequest {
121-
req := apiClient.UpdateNetworkAreaRoute(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region, model.RouteId)
121+
req := apiClient.DefaultAPI.UpdateNetworkAreaRoute(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region, model.RouteId)
122122

123123
payload := iaas.UpdateNetworkAreaRoutePayload{
124-
Labels: utils.ConvertStringMapToInterfaceMap(model.Labels),
124+
Labels: model.Labels,
125125
}
126126
req = req.UpdateNetworkAreaRoutePayload(payload)
127127

0 commit comments

Comments
 (0)