Avoid typed nil errors

stbenjam · stbenjam · commit 1e6c579ffa17 · 2023-11-30T12:09:17.000-05:00
https://dave.cheney.net/2017/08/09/typed-nils-in-go-2
diff --git a/pkg/monitortests/imageregistry/disruptionimageregistry/monitortest.go b/pkg/monitortests/imageregistry/disruptionimageregistry/monitortest.go
@@ -34,7 +34,7 @@ type availability struct {
 	imageRegistryRoute *routev1.Route
 
 	disruptionChecker  *disruptionlibrary.Availability
-	notSupportedReason *monitortestframework.NotSupportedError
+	notSupportedReason error
 	suppressJunit      bool
 }
 
diff --git a/pkg/monitortests/kubeapiserver/disruptionlegacyapiservers/monitortest.go b/pkg/monitortests/kubeapiserver/disruptionlegacyapiservers/monitortest.go
@@ -22,7 +22,7 @@ import (
 type availability struct {
 	disruptionCheckers []*disruptionlibrary.Availability
 
-	notSupportedReason *monitortestframework.NotSupportedError
+	notSupportedReason error
 	suppressJunit      bool
 }
 
diff --git a/pkg/monitortests/kubeapiserver/disruptionnewapiserver/monitortest.go b/pkg/monitortests/kubeapiserver/disruptionnewapiserver/monitortest.go
@@ -19,7 +19,7 @@ import (
 
 type newAPIServerDisruptionChecker struct {
 	adminRESTConfig    *rest.Config
-	notSupportedReason *monitortestframework.NotSupportedError
+	notSupportedReason error
 }
 
 func NewDisruptionInvariant() monitortestframework.MonitorTest {
diff --git a/pkg/monitortests/network/disruptionpodnetwork/monitortest.go b/pkg/monitortests/network/disruptionpodnetwork/monitortest.go
@@ -78,7 +78,7 @@ func init() {
 
 type podNetworkAvalibility struct {
 	payloadImagePullSpec string
-	notSupportedReason   *monitortestframework.NotSupportedError
+	notSupportedReason   error
 	namespaceName        string
 	targetService        *corev1.Service
 	kubeClient           kubernetes.Interface
diff --git a/pkg/monitortests/network/disruptionserviceloadbalancer/monitortest.go b/pkg/monitortests/network/disruptionserviceloadbalancer/monitortest.go
@@ -53,7 +53,7 @@ func init() {
 
 type availability struct {
 	namespaceName      string
-	notSupportedReason *monitortestframework.NotSupportedError
+	notSupportedReason error
 	kubeClient         kubernetes.Interface
 
 	disruptionChecker *disruptionlibrary.Availability
diff --git a/pkg/monitortests/testframework/disruptionexternalservicemonitoring/monitortest.go b/pkg/monitortests/testframework/disruptionexternalservicemonitoring/monitortest.go
@@ -34,7 +34,7 @@ type availability struct {
 	imageRegistryRoute *routev1.Route
 
 	disruptionChecker  *disruptionlibrary.Availability
-	notSupportedReason *monitortestframework.NotSupportedError
+	notSupportedReason error
 	suppressJunit      bool
 }
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type availability struct {`
`34`	`34`	`imageRegistryRoute *routev1.Route`
`35`	`35`
`36`	`36`	`disruptionChecker *disruptionlibrary.Availability`
`37`		`- notSupportedReason *monitortestframework.NotSupportedError`
	`37`	`+ notSupportedReason error`
`38`	`38`	`suppressJunit bool`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`type availability struct {`
`23`	`23`	`disruptionCheckers []*disruptionlibrary.Availability`
`24`	`24`
`25`		`- notSupportedReason *monitortestframework.NotSupportedError`
	`25`	`+ notSupportedReason error`
`26`	`26`	`suppressJunit bool`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`
`20`	`20`	`type newAPIServerDisruptionChecker struct {`
`21`	`21`	`adminRESTConfig *rest.Config`
`22`		`- notSupportedReason *monitortestframework.NotSupportedError`
	`22`	`+ notSupportedReason error`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func NewDisruptionInvariant() monitortestframework.MonitorTest {`