Use IsNilValue for all Merge() methods (#764)

AleksandarSavchev · web-flow · commit 4ded65eefeef · 2026-07-08T08:20:58.000Z
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1000.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1000.go
@@ -35,7 +35,7 @@ type Extension struct {
 }
 
 func (o *Options1000) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1001.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1001.go
@@ -39,7 +39,7 @@ type Options1001 struct {
 }
 
 func (o *Options1001) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1002.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1002.go
@@ -44,7 +44,7 @@ type MachineImage struct {
 }
 
 func (o *Options1002) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1003.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/1003.go
@@ -43,7 +43,7 @@ type Options1003 struct {
 }
 
 func (o *Options1003) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/2000.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/2000.go
@@ -45,7 +45,7 @@ type AcceptedEndpoint struct {
 }
 
 func (o *Options2000) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/garden/ruleset/securityhardenedshoot/rules/2007.go b/pkg/provider/garden/ruleset/securityhardenedshoot/rules/2007.go
@@ -36,7 +36,7 @@ type Options2007 struct {
 }
 
 func (o *Options2007) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/rules/242400.go b/pkg/provider/gardener/ruleset/disak8sstig/rules/242400.go
@@ -57,7 +57,7 @@ type Options242400 struct {
 }
 
 func (o *Options242400) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/rules/242466.go b/pkg/provider/gardener/ruleset/disak8sstig/rules/242466.go
@@ -55,7 +55,7 @@ type Options242466 struct {
 }
 
 func (o *Options242466) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/gardener/ruleset/disak8sstig/rules/242467.go b/pkg/provider/gardener/ruleset/disak8sstig/rules/242467.go
@@ -55,7 +55,7 @@ type Options242467 struct {
 }
 
 func (o *Options242467) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2000.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2000.go
@@ -80,7 +80,7 @@ type AcceptedTraffic struct {
 // Merge returns a new Options2000 that is the result of merging other into the receiver.
 // AcceptedNamespaces slices are concatenated. If other is not *Options2000, an error is returned.
 func (o *Options2000) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2001.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2001.go
@@ -54,7 +54,7 @@ func (o Options2001) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2001 that is the result of merging other into the receiver.
 // AcceptedPods slices are concatenated. If other is not *Options2001, an error is returned.
 func (o *Options2001) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2002.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2002.go
@@ -51,7 +51,7 @@ func (o Options2002) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2002 that is the result of merging other into the receiver.
 // AcceptedStorageClasses slices are concatenated. If other is not *Options2002, an error is returned.
 func (o *Options2002) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2003.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2003.go
@@ -44,7 +44,7 @@ func (o Options2003) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2003 that is the result of merging other into the receiver.
 // AcceptedPods slices are concatenated. If other is not *Options2003, an error is returned.
 func (o *Options2003) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2004.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2004.go
@@ -51,7 +51,7 @@ func (o Options2004) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2004 that is the result of merging other into the receiver.
 // AcceptedServices slices are concatenated. If other is not *Options2004, an error is returned.
 func (o *Options2004) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2005.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2005.go
@@ -42,7 +42,7 @@ type AllowedImage struct {
 // Merge returns a new Options2005 that is the result of merging other into the receiver.
 // AllowedImages slices are concatenated. If other is not *Options2005, an error is returned.
 func (o *Options2005) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2006.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2006.go
@@ -55,7 +55,7 @@ func (o Options2006) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2006 that is the result of merging other into the receiver.
 // AcceptedRoles and AcceptedClusterRoles slices are concatenated. If other is not *Options2006, an error is returned.
 func (o *Options2006) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2007.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2007.go
@@ -55,7 +55,7 @@ func (o Options2007) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2007 that is the result of merging other into the receiver.
 // AcceptedRoles and AcceptedClusterRoles slices are concatenated. If other is not *Options2007, an error is returned.
 func (o *Options2007) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2008.go b/pkg/provider/managedk8s/ruleset/securityhardenedk8s/rules/2008.go
@@ -50,7 +50,7 @@ func (o Options2008) Validate(fldPath *field.Path) field.ErrorList {
 // Merge returns a new Options2008 that is the result of merging other into the receiver.
 // AcceptedPods slices are concatenated. If other is not *Options2008, an error is returned.
 func (o *Options2008) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
diff --git a/pkg/shared/ruleset/disak8sstig/option/options.go b/pkg/shared/ruleset/disak8sstig/option/options.go
@@ -100,7 +100,7 @@ type AcceptedPods242414 struct {
 
 // Merge implements MergeableOption by concatenating AcceptedPods from both options.
 func (o *Options242414) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 
@@ -156,7 +156,7 @@ type AcceptedPods242415 struct {
 
 // Merge implements MergeableOption by concatenating AcceptedPods from both options.
 func (o *Options242415) Merge(other option.MergeableOption) (option.MergeableOption, error) {
-	if other == nil {
+	if option.IsNilValue(other) {
 		return o, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ type Extension struct {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (o *Options1000) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`38`		`- if other == nil {`
	`38`	`+ if option.IsNilValue(other) {`
`39`	`39`	`return o, nil`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ type Options1001 struct {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`func (o *Options1001) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`42`		`- if other == nil {`
	`42`	`+ if option.IsNilValue(other) {`
`43`	`43`	`return o, nil`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ type MachineImage struct {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func (o *Options1002) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`47`		`- if other == nil {`
	`47`	`+ if option.IsNilValue(other) {`
`48`	`48`	`return o, nil`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ type Options1003 struct {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func (o *Options1003) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`46`		`- if other == nil {`
	`46`	`+ if option.IsNilValue(other) {`
`47`	`47`	`return o, nil`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ type AcceptedEndpoint struct {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (o *Options2000) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`48`		`- if other == nil {`
	`48`	`+ if option.IsNilValue(other) {`
`49`	`49`	`return o, nil`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ type Options2007 struct {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func (o *Options2007) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`39`		`- if other == nil {`
	`39`	`+ if option.IsNilValue(other) {`
`40`	`40`	`return o, nil`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ type Options242400 struct {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func (o *Options242400) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`60`		`- if other == nil {`
	`60`	`+ if option.IsNilValue(other) {`
`61`	`61`	`return o, nil`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ type Options242466 struct {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func (o *Options242466) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`58`		`- if other == nil {`
	`58`	`+ if option.IsNilValue(other) {`
`59`	`59`	`return o, nil`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ type Options242467 struct {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func (o *Options242467) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`58`		`- if other == nil {`
	`58`	`+ if option.IsNilValue(other) {`
`59`	`59`	`return o, nil`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ type AcceptedTraffic struct {`
`80`	`80`	`// Merge returns a new Options2000 that is the result of merging other into the receiver.`
`81`	`81`	`// AcceptedNamespaces slices are concatenated. If other is not *Options2000, an error is returned.`
`82`	`82`	`func (o *Options2000) Merge(other option.MergeableOption) (option.MergeableOption, error) {`
`83`		`- if other == nil {`
	`83`	`+ if option.IsNilValue(other) {`
`84`	`84`	`return o, nil`
`85`	`85`	`}`
`86`	`86`