Skip to content

Commit e6910a5

Browse files
scylla-operator-bot[bot]scylla-operator-bot[bot]
authored
Merge pull request #2598 from mflendrich/nilslice-errorlist
Refactor ErrorLists into nil slices
2 parents 3043cb2 + 3e6be47 commit e6910a5

10 files changed

+99
-99
lines changed

‎pkg/api/scylla/validation/cluster_validation.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func ValidateScyllaCluster(c *scyllav1.ScyllaCluster) field.ErrorList {
4545
}
4646

4747
func ValidateUserManagedTLSCertificateOptions(opts *scyllav1.UserManagedTLSCertificateOptions, fldPath *field.Path) field.ErrorList {
48-
allErrs := field.ErrorList{}
48+
var allErrs field.ErrorList
4949

5050
if len(opts.SecretName) == 0 {
5151
allErrs = append(allErrs, field.Required(fldPath.Child("secretName"), ""))
@@ -59,7 +59,7 @@ func ValidateUserManagedTLSCertificateOptions(opts *scyllav1.UserManagedTLSCerti
5959
}
6060

6161
func ValidateOperatorManagedTLSCertificateOptions(opts *scyllav1.OperatorManagedTLSCertificateOptions, fldPath *field.Path) field.ErrorList {
62-
allErrs := field.ErrorList{}
62+
var allErrs field.ErrorList
6363

6464
for _, dnsName := range opts.AdditionalDNSNames {
6565
for _, msg := range apimachineryutilvalidation.IsDNS1123Subdomain(dnsName) {
@@ -77,7 +77,7 @@ func ValidateOperatorManagedTLSCertificateOptions(opts *scyllav1.OperatorManaged
7777
}
7878

7979
func ValidateTLSCertificate(cert *scyllav1.TLSCertificate, fldPath *field.Path) field.ErrorList {
80-
allErrs := field.ErrorList{}
80+
var allErrs field.ErrorList
8181

8282
switch cert.Type {
8383
case scyllav1.TLSCertificateTypeOperatorManaged:
@@ -120,7 +120,7 @@ func ValidateTLSCertificate(cert *scyllav1.TLSCertificate, fldPath *field.Path)
120120
}
121121

122122
func ValidateAlternatorSpec(alternator *scyllav1.AlternatorSpec, fldPath *field.Path) field.ErrorList {
123-
allErrs := field.ErrorList{}
123+
var allErrs field.ErrorList
124124

125125
if alternator.WriteIsolation != "" {
126126
found := slices.ContainsItem(AlternatorSupportedWriteIsolation, alternator.WriteIsolation)
@@ -150,7 +150,7 @@ func ValidateAlternatorSpec(alternator *scyllav1.AlternatorSpec, fldPath *field.
150150
}
151151

152152
func ValidateScyllaClusterSpec(spec *scyllav1.ScyllaClusterSpec, fldPath *field.Path) field.ErrorList {
153-
allErrs := field.ErrorList{}
153+
var allErrs field.ErrorList
154154

155155
rackNames := sets.NewString()
156156

@@ -214,7 +214,7 @@ func ValidateScyllaClusterSpec(spec *scyllav1.ScyllaClusterSpec, fldPath *field.
214214
}
215215

216216
func ValidateRepairTaskSpec(repairTaskSpec *scyllav1.RepairTaskSpec, fldPath *field.Path) field.ErrorList {
217-
allErrs := field.ErrorList{}
217+
var allErrs field.ErrorList
218218

219219
_, err := strconv.ParseFloat(repairTaskSpec.Intensity, 64)
220220
if err != nil {
@@ -227,23 +227,23 @@ func ValidateRepairTaskSpec(repairTaskSpec *scyllav1.RepairTaskSpec, fldPath *fi
227227
}
228228

229229
func ValidateBackupTaskSpec(backupTaskSpec *scyllav1.BackupTaskSpec, fldPath *field.Path) field.ErrorList {
230-
allErrs := field.ErrorList{}
230+
var allErrs field.ErrorList
231231

232232
allErrs = append(allErrs, ValidateTaskSpec(&backupTaskSpec.TaskSpec, fldPath)...)
233233

234234
return allErrs
235235
}
236236

237237
func ValidateTaskSpec(taskSpec *scyllav1.TaskSpec, fldPath *field.Path) field.ErrorList {
238-
allErrs := field.ErrorList{}
238+
var allErrs field.ErrorList
239239

240240
allErrs = append(allErrs, ValidateSchedulerTaskSpec(&taskSpec.SchedulerTaskSpec, fldPath)...)
241241

242242
return allErrs
243243
}
244244

245245
func ValidateSchedulerTaskSpec(schedulerTaskSpec *scyllav1.SchedulerTaskSpec, fldPath *field.Path) field.ErrorList {
246-
allErrs := field.ErrorList{}
246+
var allErrs field.ErrorList
247247

248248
if schedulerTaskSpec.Cron != nil {
249249
_, err := cron.NewParser(schedulerTaskSpecCronParseOptions).Parse(*schedulerTaskSpec.Cron)
@@ -281,7 +281,7 @@ func ValidateSchedulerTaskSpec(schedulerTaskSpec *scyllav1.SchedulerTaskSpec, fl
281281
}
282282

283283
func ValidateExposeOptions(options *scyllav1.ExposeOptions, fldPath *field.Path) field.ErrorList {
284-
allErrs := field.ErrorList{}
284+
var allErrs field.ErrorList
285285

286286
if options.CQL != nil && options.CQL.Ingress != nil {
287287
allErrs = append(allErrs, ValidateIngressOptions(options.CQL.Ingress, fldPath.Child("cql", "ingress"))...)
@@ -299,7 +299,7 @@ func ValidateExposeOptions(options *scyllav1.ExposeOptions, fldPath *field.Path)
299299
}
300300

301301
func ValidateNodeBroadcastOptions(options *scyllav1.NodeBroadcastOptions, nodeService *scyllav1.NodeServiceTemplate, fldPath *field.Path) field.ErrorList {
302-
allErrs := field.ErrorList{}
302+
var allErrs field.ErrorList
303303

304304
allErrs = append(allErrs, ValidateBroadcastOptions(options.Clients, nodeService, fldPath.Child("clients"))...)
305305
allErrs = append(allErrs, ValidateBroadcastOptions(options.Nodes, nodeService, fldPath.Child("nodes"))...)
@@ -308,7 +308,7 @@ func ValidateNodeBroadcastOptions(options *scyllav1.NodeBroadcastOptions, nodeSe
308308
}
309309

310310
func ValidateBroadcastOptions(options scyllav1.BroadcastOptions, nodeService *scyllav1.NodeServiceTemplate, fldPath *field.Path) field.ErrorList {
311-
allErrs := field.ErrorList{}
311+
var allErrs field.ErrorList
312312

313313
if !slices.ContainsItem(SupportedScyllaV1BroadcastAddressTypes, options.Type) {
314314
allErrs = append(allErrs, field.NotSupported(fldPath.Child("type"), options.Type, slices.ConvertSlice(SupportedScyllaV1BroadcastAddressTypes, slices.ToString[scyllav1.BroadcastAddressType])))
@@ -344,7 +344,7 @@ func ValidateBroadcastOptions(options scyllav1.BroadcastOptions, nodeService *sc
344344
}
345345

346346
func ValidateNodeService(nodeService *scyllav1.NodeServiceTemplate, fldPath *field.Path) field.ErrorList {
347-
allErrs := field.ErrorList{}
347+
var allErrs field.ErrorList
348348

349349
var supportedServiceTypes = []scyllav1.NodeServiceType{
350350
scyllav1.NodeServiceTypeHeadless,
@@ -370,7 +370,7 @@ func ValidateNodeService(nodeService *scyllav1.NodeServiceTemplate, fldPath *fie
370370
}
371371

372372
func ValidateIngressOptions(options *scyllav1.IngressOptions, fldPath *field.Path) field.ErrorList {
373-
allErrs := field.ErrorList{}
373+
var allErrs field.ErrorList
374374

375375
if len(options.IngressClassName) != 0 {
376376
for _, msg := range apimachineryvalidation.NameIsDNSSubdomain(options.IngressClassName, false) {
@@ -386,7 +386,7 @@ func ValidateIngressOptions(options *scyllav1.IngressOptions, fldPath *field.Pat
386386
}
387387

388388
func ValidateScyllaClusterRackSpec(rack scyllav1.RackSpec, rackNames sets.String, fldPath *field.Path) field.ErrorList {
389-
allErrs := field.ErrorList{}
389+
var allErrs field.ErrorList
390390

391391
// Check that no two racks have the same name
392392
if rackNames.Has(rack.Name) {
@@ -410,7 +410,7 @@ func ValidateScyllaClusterUpdate(new, old *scyllav1.ScyllaCluster) field.ErrorLi
410410
}
411411

412412
func ValidateScyllaClusterSpecUpdate(new, old *scyllav1.ScyllaCluster, fldPath *field.Path) field.ErrorList {
413-
allErrs := field.ErrorList{}
413+
var allErrs field.ErrorList
414414

415415
// Check that the datacenter name didn't change
416416
if old.Spec.Datacenter.Name != new.Spec.Datacenter.Name {

‎pkg/api/scylla/validation/cluster_validation_test.go

+23-23
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestValidateScyllaCluster(t *testing.T) {
3434
{
3535
name: "valid",
3636
cluster: validCluster.DeepCopy(),
37-
expectedErrorList: field.ErrorList{},
37+
expectedErrorList: nil,
3838
expectedErrorString: "",
3939
},
4040
{
@@ -85,7 +85,7 @@ func TestValidateScyllaCluster(t *testing.T) {
8585
}
8686
return cluster
8787
}(),
88-
expectedErrorList: field.ErrorList{},
88+
expectedErrorList: nil,
8989
expectedErrorString: "",
9090
},
9191
{
@@ -334,7 +334,7 @@ func TestValidateScyllaCluster(t *testing.T) {
334334
})
335335
return cluster
336336
}(),
337-
expectedErrorList: field.ErrorList{},
337+
expectedErrorList: nil,
338338
expectedErrorString: "",
339339
},
340340
{
@@ -352,7 +352,7 @@ func TestValidateScyllaCluster(t *testing.T) {
352352
})
353353
return cluster
354354
}(),
355-
expectedErrorList: field.ErrorList{},
355+
expectedErrorList: nil,
356356
expectedErrorString: "",
357357
},
358358
{
@@ -371,7 +371,7 @@ func TestValidateScyllaCluster(t *testing.T) {
371371
})
372372
return cluster
373373
}(),
374-
expectedErrorList: field.ErrorList{},
374+
expectedErrorList: nil,
375375
expectedErrorString: "",
376376
},
377377
{
@@ -389,7 +389,7 @@ func TestValidateScyllaCluster(t *testing.T) {
389389
})
390390
return cluster
391391
}(),
392-
expectedErrorList: field.ErrorList{},
392+
expectedErrorList: nil,
393393
expectedErrorString: "",
394394
},
395395
{
@@ -408,7 +408,7 @@ func TestValidateScyllaCluster(t *testing.T) {
408408
})
409409
return cluster
410410
}(),
411-
expectedErrorList: field.ErrorList{},
411+
expectedErrorList: nil,
412412
expectedErrorString: "",
413413
},
414414
{
@@ -426,7 +426,7 @@ func TestValidateScyllaCluster(t *testing.T) {
426426
})
427427
return cluster
428428
}(),
429-
expectedErrorList: field.ErrorList{},
429+
expectedErrorList: nil,
430430
expectedErrorString: "",
431431
},
432432
{
@@ -508,7 +508,7 @@ func TestValidateScyllaCluster(t *testing.T) {
508508
}...)
509509
return cluster
510510
}(),
511-
expectedErrorList: field.ErrorList{},
511+
expectedErrorList: nil,
512512
expectedErrorString: "",
513513
},
514514
{
@@ -537,7 +537,7 @@ func TestValidateScyllaCluster(t *testing.T) {
537537
}...)
538538
return cluster
539539
}(),
540-
expectedErrorList: field.ErrorList{},
540+
expectedErrorList: nil,
541541
expectedErrorString: "",
542542
},
543543
{
@@ -721,7 +721,7 @@ func TestValidateScyllaCluster(t *testing.T) {
721721

722722
return cluster
723723
}(),
724-
expectedErrorList: field.ErrorList{},
724+
expectedErrorList: nil,
725725
expectedErrorString: "",
726726
},
727727
{
@@ -884,7 +884,7 @@ func TestValidateScyllaCluster(t *testing.T) {
884884
cluster.Spec.Alternator = &scyllav1.AlternatorSpec{}
885885
return cluster
886886
}(),
887-
expectedErrorList: field.ErrorList{},
887+
expectedErrorList: nil,
888888
expectedErrorString: "",
889889
},
890890
{
@@ -901,7 +901,7 @@ func TestValidateScyllaCluster(t *testing.T) {
901901
}
902902
return cluster
903903
}(),
904-
expectedErrorList: field.ErrorList{},
904+
expectedErrorList: nil,
905905
expectedErrorString: "",
906906
},
907907
{
@@ -934,7 +934,7 @@ func TestValidateScyllaCluster(t *testing.T) {
934934
}
935935
return cluster
936936
}(),
937-
expectedErrorList: field.ErrorList{},
937+
expectedErrorList: nil,
938938
expectedErrorString: "",
939939
},
940940
{
@@ -970,7 +970,7 @@ func TestValidateScyllaCluster(t *testing.T) {
970970
}
971971
return cluster
972972
}(),
973-
expectedErrorList: field.ErrorList{},
973+
expectedErrorList: nil,
974974
expectedErrorString: "",
975975
},
976976
{
@@ -1026,35 +1026,35 @@ func TestValidateScyllaClusterUpdate(t *testing.T) {
10261026
name: "same as old",
10271027
old: unit.NewSingleRackCluster(3),
10281028
new: unit.NewSingleRackCluster(3),
1029-
expectedErrorList: field.ErrorList{},
1029+
expectedErrorList: nil,
10301030
expectedErrorString: "",
10311031
},
10321032
{
10331033
name: "major version changed",
10341034
old: unit.NewSingleRackCluster(3),
10351035
new: unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "repo", "3.3.1", "test-dc", "test-rack", 3),
1036-
expectedErrorList: field.ErrorList{},
1036+
expectedErrorList: nil,
10371037
expectedErrorString: "",
10381038
},
10391039
{
10401040
name: "minor version changed",
10411041
old: unit.NewSingleRackCluster(3),
10421042
new: unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "repo", "2.4.2", "test-dc", "test-rack", 3),
1043-
expectedErrorList: field.ErrorList{},
1043+
expectedErrorList: nil,
10441044
expectedErrorString: "",
10451045
},
10461046
{
10471047
name: "patch version changed",
10481048
old: unit.NewSingleRackCluster(3),
10491049
new: unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "repo", "2.3.2", "test-dc", "test-rack", 3),
1050-
expectedErrorList: field.ErrorList{},
1050+
expectedErrorList: nil,
10511051
expectedErrorString: "",
10521052
},
10531053
{
10541054
name: "repo changed",
10551055
old: unit.NewSingleRackCluster(3),
10561056
new: unit.NewDetailedSingleRackCluster("test-cluster", "test-ns", "new-repo", "2.3.2", "test-dc", "test-rack", 3),
1057-
expectedErrorList: field.ErrorList{},
1057+
expectedErrorList: nil,
10581058
expectedErrorString: "",
10591059
},
10601060
{
@@ -1070,7 +1070,7 @@ func TestValidateScyllaClusterUpdate(t *testing.T) {
10701070
name: "rackPlacement changed",
10711071
old: unit.NewSingleRackCluster(3),
10721072
new: placementChanged(unit.NewSingleRackCluster(3)),
1073-
expectedErrorList: field.ErrorList{},
1073+
expectedErrorList: nil,
10741074
expectedErrorString: "",
10751075
},
10761076
{
@@ -1086,14 +1086,14 @@ func TestValidateScyllaClusterUpdate(t *testing.T) {
10861086
name: "rackResources changed",
10871087
old: unit.NewSingleRackCluster(3),
10881088
new: resourceChanged(unit.NewSingleRackCluster(3)),
1089-
expectedErrorList: field.ErrorList{},
1089+
expectedErrorList: nil,
10901090
expectedErrorString: "",
10911091
},
10921092
{
10931093
name: "empty rack removed",
10941094
old: unit.NewSingleRackCluster(0),
10951095
new: racksDeleted(unit.NewSingleRackCluster(0)),
1096-
expectedErrorList: field.ErrorList{},
1096+
expectedErrorList: nil,
10971097
expectedErrorString: "",
10981098
},
10991099
{

‎pkg/api/scylla/validation/nodeconfig_validation.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func ValidateNodeConfig(nc *scyllav1alpha1.NodeConfig) field.ErrorList {
1414
}
1515

1616
func ValidateNodeConfigSpec(spec *scyllav1alpha1.NodeConfigSpec, fldPath *field.Path) field.ErrorList {
17-
allErrs := field.ErrorList{}
17+
var allErrs field.ErrorList
1818

1919
if spec.LocalDiskSetup != nil {
2020
allErrs = append(allErrs, ValidateLocalDiskSetup(spec.LocalDiskSetup, fldPath.Child("localDiskSetup"))...)
@@ -24,7 +24,7 @@ func ValidateNodeConfigSpec(spec *scyllav1alpha1.NodeConfigSpec, fldPath *field.
2424
}
2525

2626
func ValidateLocalDiskSetup(lds *scyllav1alpha1.LocalDiskSetup, fldPath *field.Path) field.ErrorList {
27-
allErrs := field.ErrorList{}
27+
var allErrs field.ErrorList
2828

2929
allErrs = append(allErrs, ValidateLocalDiskSetupFilesystems(lds.Filesystems, fldPath.Child("filesystems"))...)
3030

@@ -36,13 +36,13 @@ func ValidateLocalDiskSetup(lds *scyllav1alpha1.LocalDiskSetup, fldPath *field.P
3636
}
3737

3838
func ValidateLocalDiskSetupFilesystems(fcs []scyllav1alpha1.FilesystemConfiguration, fldPath *field.Path) field.ErrorList {
39-
allErrs := field.ErrorList{}
39+
var allErrs field.ErrorList
4040

4141
return allErrs
4242
}
4343

4444
func ValidateLocalDiskSetupMounts(mcs []scyllav1alpha1.MountConfiguration, fldPath *field.Path) field.ErrorList {
45-
allErrs := field.ErrorList{}
45+
var allErrs field.ErrorList
4646

4747
mountPoints := map[string]struct{}{}
4848

@@ -58,7 +58,7 @@ func ValidateLocalDiskSetupMounts(mcs []scyllav1alpha1.MountConfiguration, fldPa
5858
}
5959

6060
func ValidateLocalDiskSetupRAIDs(rcs []scyllav1alpha1.RAIDConfiguration, fldPath *field.Path) field.ErrorList {
61-
allErrs := field.ErrorList{}
61+
var allErrs field.ErrorList
6262

6363
names := map[string]struct{}{}
6464

@@ -90,7 +90,7 @@ func ValidateNodeConfigUpdate(new, old *scyllav1alpha1.NodeConfig) field.ErrorLi
9090
}
9191

9292
func ValidateNodeConfigSpecUpdate(new, old *scyllav1alpha1.NodeConfig, fldPath *field.Path) field.ErrorList {
93-
allErrs := field.ErrorList{}
93+
var allErrs field.ErrorList
9494

9595
oldLoopDevicesSizes := make(map[string]resource.Quantity)
9696
if old.Spec.LocalDiskSetup != nil {

0 commit comments

Comments
 (0)