PR improvements

Author: Erusso7

api/v1beta1/module_webhook.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"errors"
+	"fmt"
 	"k8s.io/apimachinery/pkg/runtime"
 	"regexp"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -71,8 +71,8 @@ func (r *Module) validateKernelMappingRegex() error {
 	}
 
 	for _, km := range r.Spec.ModuleLoader.Container.KernelMappings {
-		if _, rErr := regexp.Compile(km.Regexp); rErr != nil {
-			return errors.New("invalid regex: " + rErr.Error())
+		if _, err := regexp.Compile(km.Regexp); err != nil {
+			return fmt.Errorf("invalid regexp: %v", err)
 		}
 	}
 

api/v1beta1/module_webhook_test.go

@@ -27,53 +27,95 @@ func TestV1beta1(t *testing.T) {
 	RunSpecs(t, "V1beta1 Suite")
 }
 
-var validKMs = []KernelMapping{
-	{Regexp: "valid-regex"},
-}
-
-var invalidKMs = []KernelMapping{
-	{Regexp: "*-invalid-regex"},
-}
-
-var module = &Module{
-	Spec: ModuleSpec{
-		ModuleLoader: ModuleLoaderSpec{
-			Container: ModuleLoaderContainerSpec{
-				KernelMappings: nil,
-			},
-		},
-	},
-}
-
-var _ = BeforeEach(func() {
-	module.Spec.ModuleLoader.Container.KernelMappings = validKMs
-})
-
 var _ = Describe("ValidateCreate", func() {
 	It("should pass when all conditions are met", func() {
+		module := &Module{
+			Spec: ModuleSpec{
+				ModuleLoader: ModuleLoaderSpec{
+					Container: ModuleLoaderContainerSpec{
+						KernelMappings: []KernelMapping{
+							{Regexp: "valid-regex"},
+						},
+					},
+				},
+			},
+		}
+
 		e := module.ValidateCreate()
 		Expect(e).To(BeNil())
 	})
 
 	It("should fail when an invalid regex is found", func() {
-		m := module
-		m.Spec.ModuleLoader.Container.KernelMappings = invalidKMs
+		module := &Module{
+			Spec: ModuleSpec{
+				ModuleLoader: ModuleLoaderSpec{
+					Container: ModuleLoaderContainerSpec{
+						KernelMappings: []KernelMapping{
+							{Regexp: "*-invalid-regex"},
+						},
+					},
+				},
+			},
+		}
+
 		e := module.ValidateCreate()
 		Expect(e).To(HaveOccurred())
-		Expect(e.Error()).To(ContainSubstring("invalid regex:"))
+		Expect(e.Error()).To(ContainSubstring("invalid regexp"))
 	})
 })
 
 var _ = Describe("ValidateUpdate", func() {
 	It("should pass when all conditions are met", func() {
+		module := &Module{
+			Spec: ModuleSpec{
+				ModuleLoader: ModuleLoaderSpec{
+					Container: ModuleLoaderContainerSpec{
+						KernelMappings: []KernelMapping{
+							{Regexp: "valid-regex"},
+						},
+					},
+				},
+			},
+		}
+
 		e := module.ValidateUpdate(nil)
-		Expect(e).To(BeNil())
+		Expect(e).ToNot(HaveOccurred())
+	})
+
+	It("should fail when an invalid regex is found", func() {
+		module := &Module{
+			Spec: ModuleSpec{
+				ModuleLoader: ModuleLoaderSpec{
+					Container: ModuleLoaderContainerSpec{
+						KernelMappings: []KernelMapping{
+							{Regexp: "*-invalid-regex"},
+						},
+					},
+				},
+			},
+		}
+
+		e := module.ValidateUpdate(nil)
+		Expect(e).To(HaveOccurred())
+		Expect(e.Error()).To(ContainSubstring("invalid regexp"))
 	})
 })
 
 var _ = Describe("ValidateDelete", func() {
 	It("should do nothing and return always nil", func() {
+		module := &Module{
+			Spec: ModuleSpec{
+				ModuleLoader: ModuleLoaderSpec{
+					Container: ModuleLoaderContainerSpec{
+						KernelMappings: []KernelMapping{
+							{Regexp: "valid-regex"},
+						},
+					},
+				},
+			},
+		}
+
 		e := module.ValidateDelete()
-		Expect(e).To(BeNil())
+		Expect(e).ToNot(HaveOccurred())
 	})
 })

cmd/manager/main.go

@@ -179,8 +179,7 @@ func main() {
 	}
 
 	if err = (&v1beta12.Module{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLogger.Error(err, "unable to create webhook", "webhook", "Module")
-		os.Exit(1)
+		cmd.FatalError(setupLogger, err, "unable to create webhook", "webhook", "Module")
 	}
 	//+kubebuilder:scaffold:builder