Skip to content

Commit 9529dfd

Browse files
cgoetz-inovexcgoetz-inovex
committed
fix linting error
1 parent a36687d commit 9529dfd

50 files changed

Lines changed: 96 additions & 115 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎internal/cmd/image/create/create_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func TestBuildRequest(t *testing.T) {
308308
model.Labels = nil
309309
}),
310310
expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
311-
*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
311+
*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
312312
payload.Labels = nil
313313
}))
314314
}),
@@ -319,7 +319,7 @@ func TestBuildRequest(t *testing.T) {
319319
model.Config.CdromBus = utils.Ptr("foobar")
320320
}),
321321
expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
322-
*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
322+
*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
323323
payload.Config.CdromBus = *iaas.NewNullableString(utils.Ptr("foobar"))
324324
}))
325325
}),
@@ -330,7 +330,7 @@ func TestBuildRequest(t *testing.T) {
330330
model.Config.Uefi = false
331331
}),
332332
expectedRequest: fixtureRequest(func(request *iaas.ApiCreateImageRequest) {
333-
*request = (*request).CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
333+
*request = request.CreateImagePayload(fixtureCreatePayload(func(payload *iaas.CreateImagePayload) {
334334
payload.Config.Uefi = utils.Ptr(false)
335335
}))
336336
}),

‎internal/cmd/image/list/list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestBuildRequest(t *testing.T) {
157157
model.LabelSelector = utils.Ptr("")
158158
}),
159159
expectedRequest: fixtureRequest(func(request *iaas.ApiListImagesRequest) {
160-
*request = (*request).LabelSelector("")
160+
*request = request.LabelSelector("")
161161
}),
162162
},
163163
{
@@ -166,7 +166,7 @@ func TestBuildRequest(t *testing.T) {
166166
model.LabelSelector = utils.Ptr("foo=bar")
167167
}),
168168
expectedRequest: fixtureRequest(func(request *iaas.ApiListImagesRequest) {
169-
*request = (*request).LabelSelector("foo=bar")
169+
*request = request.LabelSelector("foo=bar")
170170
}),
171171
},
172172
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ func TestBuildRequest(t *testing.T) {
394394
model.Labels = nil
395395
}),
396396
expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
397-
*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
397+
*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
398398
payload.Labels = nil
399399
}))
400400
}),
@@ -405,7 +405,7 @@ func TestBuildRequest(t *testing.T) {
405405
model.Name = utils.Ptr("something else")
406406
}),
407407
expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
408-
*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
408+
*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
409409
payload.Name = utils.Ptr("something else")
410410
}))
411411
}),
@@ -416,7 +416,7 @@ func TestBuildRequest(t *testing.T) {
416416
model.Config.CdromBus = utils.Ptr("something else")
417417
}),
418418
expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
419-
*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
419+
*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
420420
payload.Config.CdromBus.Set(utils.Ptr("something else"))
421421
}))
422422
}),
@@ -427,7 +427,7 @@ func TestBuildRequest(t *testing.T) {
427427
model.Config = nil
428428
}),
429429
expectedRequest: fixtureRequest(func(request *iaas.ApiUpdateImageRequest) {
430-
*request = (*request).UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
430+
*request = request.UpdateImagePayload(fixtureCreatePayload(func(payload *iaas.UpdateImagePayload) {
431431
payload.Config = nil
432432
}))
433433
}),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func outputResult(p *print.Printer, outputFormat string, showOnlyPublicKey bool,
148148
table.AddRow("KEY PAIR NAME", utils.PtrString(keyPair.Name))
149149
table.AddSeparator()
150150

151-
if keyPair.Labels != nil && len(keyPair.Labels) > 0 {
151+
if len(keyPair.Labels) > 0 {
152152
var labels []string
153153
for key, value := range keyPair.Labels {
154154
labels = append(labels, fmt.Sprintf("%s: %s", key, value))

‎internal/cmd/network-area/describe/describe.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func outputResult(p *print.Printer, outputFormat string, networkArea *iaas.Netwo
133133
table.AddSeparator()
134134
table.AddRow("NAME", networkArea.Name)
135135
table.AddSeparator()
136-
if networkArea.Labels != nil && len(networkArea.Labels) > 0 {
136+
if len(networkArea.Labels) > 0 {
137137
var labels []string
138138
for key, value := range networkArea.Labels {
139139
labels = append(labels, fmt.Sprintf("%s: %s", key, value))

‎internal/cmd/network-area/network-range/create/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7878
return fmt.Errorf("create network range: %w", err)
7979
}
8080

81-
if resp.Items == nil || len(resp.Items) == 0 {
81+
if len(resp.Items) == 0 {
8282
return fmt.Errorf("empty response from API")
8383
}
8484

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
109109

110110
func outputResult(p *print.Printer, outputFormat, areaLabel string, regionalArea iaas.RegionalAreaListResponse) error {
111111
return p.OutputResult(outputFormat, regionalArea, func() error {
112-
if regionalArea.Regions == nil || len(regionalArea.Regions) == 0 {
112+
if len(regionalArea.Regions) == 0 {
113113
p.Outputf("No regions found for network area %q\n", areaLabel)
114114
return nil
115115
}
@@ -126,7 +126,7 @@ func outputResult(p *print.Printer, outputFormat, areaLabel string, regionalArea
126126
dnsNames = strings.Join(ipv4.DefaultNameservers, ",")
127127

128128
// Set networkRanges
129-
if ipv4.NetworkRanges != nil && len(ipv4.NetworkRanges) > 0 {
129+
if len(ipv4.NetworkRanges) > 0 {
130130
for _, networkRange := range ipv4.NetworkRanges {
131131
networkRanges = append(networkRanges, networkRange.Prefix)
132132
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
111111
return fmt.Errorf("create static route: %w", err)
112112
}
113113

114-
if resp.Items == nil || len(resp.Items) == 0 {
114+
if len(resp.Items) == 0 {
115115
return fmt.Errorf("empty response from API")
116116
}
117117

@@ -140,7 +140,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
140140
return err
141141
}
142142

143-
return outputResult(params.Printer, model.OutputFormat, networkAreaLabel, route)
143+
return outputResult(params.Printer, model.OutputFormat, networkAreaLabel, &route)
144144
},
145145
}
146146
configureFlags(cmd)
@@ -295,7 +295,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
295295
return req.CreateNetworkAreaRoutePayload(payload)
296296
}
297297

298-
func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, route iaas.Route) error {
298+
func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, route *iaas.Route) error {
299299
return p.OutputResult(outputFormat, route, func() error {
300300
p.Outputf("Created static route for SNA %q.\nStatic route ID: %s\n", networkAreaLabel, utils.PtrString(route.Id))
301301
return nil

‎internal/cmd/network-area/route/create/create_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func TestBuildRequest(t *testing.T) {
239239
model.Labels = map[string]any{"key": "value"}
240240
}),
241241
expectedRequest: fixtureRequest(func(request *iaas.ApiCreateNetworkAreaRouteRequest) {
242-
*request = (*request).CreateNetworkAreaRoutePayload(fixturePayload(func(payload *iaas.CreateNetworkAreaRoutePayload) {
242+
*request = request.CreateNetworkAreaRoutePayload(fixturePayload(func(payload *iaas.CreateNetworkAreaRoutePayload) {
243243
payload.Items[0].Labels = map[string]any{"key": "value"}
244244
}))
245245
}),
@@ -288,7 +288,7 @@ func TestOutputResult(t *testing.T) {
288288
params := testparams.NewTestParams()
289289
for _, tt := range tests {
290290
t.Run(tt.name, func(t *testing.T) {
291-
if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.networkAreaLabel, tt.args.route); (err != nil) != tt.wantErr {
291+
if err := outputResult(params.Printer, tt.args.outputFormat, tt.args.networkAreaLabel, &tt.args.route); (err != nil) != tt.wantErr {
292292
t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr)
293293
}
294294
})

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {
7171
return fmt.Errorf("describe static route: %w", err)
7272
}
7373

74-
return outputResult(params.Printer, model.OutputFormat, *resp)
74+
return outputResult(params.Printer, model.OutputFormat, resp)
7575
},
7676
}
7777
configureFlags(cmd)
@@ -106,7 +106,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
106106
return req
107107
}
108108

109-
func outputResult(p *print.Printer, outputFormat string, route iaas.Route) error {
109+
func outputResult(p *print.Printer, outputFormat string, route *iaas.Route) error {
110110
return p.OutputResult(outputFormat, route, func() error {
111111
table := tables.NewTable()
112112
table.AddRow("ID", utils.PtrString(route.Id))
@@ -141,7 +141,7 @@ func outputResult(p *print.Printer, outputFormat string, route iaas.Route) error
141141
table.AddRow("NEXTHOP TYPE", nexthop.NexthopInternet.Type)
142142
table.AddSeparator()
143143
}
144-
if route.Labels != nil && len(route.Labels) > 0 {
144+
if len(route.Labels) > 0 {
145145
labels := []string{}
146146
for key, value := range route.Labels {
147147
labels = append(labels, fmt.Sprintf("%s: %s", key, value))

0 commit comments

Comments
 (0)