diff --git a/images/virtualization-artifact/pkg/audit/events/module/module_control.go b/images/virtualization-artifact/pkg/audit/events/module/module_control.go index 0411fc701f..f53a717af1 100644 --- a/images/virtualization-artifact/pkg/audit/events/module/module_control.go +++ b/images/virtualization-artifact/pkg/audit/events/module/module_control.go @@ -85,7 +85,7 @@ func (m *ModuleControl) Fill() error { return nil } - if (m.event.Verb == "patch" || m.event.Verb == "update") && !*moduleConfig.Spec.Enabled { + if (m.event.Verb == "patch" || m.event.Verb == "update") && (moduleConfig.Spec.Enabled != nil && !*moduleConfig.Spec.Enabled) { m.eventLog.Name = "Module disabled" m.eventLog.Level = "warn" } diff --git a/images/virtualization-artifact/pkg/audit/events/module/module_control_test.go b/images/virtualization-artifact/pkg/audit/events/module/module_control_test.go index 4cb68eb160..d08213e253 100644 --- a/images/virtualization-artifact/pkg/audit/events/module/module_control_test.go +++ b/images/virtualization-artifact/pkg/audit/events/module/module_control_test.go @@ -47,6 +47,7 @@ type moduleControlTestArgs struct { customObjectRefNil bool customStage audit.Stage customDisabledModule bool + customNilEnabledModule bool shouldFailMatch bool } @@ -78,7 +79,7 @@ var _ = Describe("Module control Events", func() { modConfig = &mcapi.ModuleConfig{ ObjectMeta: metav1.ObjectMeta{Name: "test-moduleconfig", Namespace: "test", UID: "0000-0000-4567"}, Spec: mcapi.ModuleConfigSpec{ - Enabled: ptr.To(true), + Enabled: nil, }, } @@ -151,6 +152,10 @@ var _ = Describe("Module control Events", func() { return } + if args.customNilEnabledModule { + modConfig.Spec.Enabled = nil + } + Expect(eventLog.IsMatched()).To(BeTrue()) Expect(eventLog.Fill()).To(BeNil()) @@ -242,5 +247,12 @@ var _ = Describe("Module control Events", func() { expectedActionType: "delete", shouldLostModule: true, }), + Entry("Module Control event shouldn't failed fill with null enabled", moduleControlTestArgs{ + eventVerb: "delete", + expectedName: "Module deletion", + expectedLevel: "warn", + expectedActionType: "delete", + customNilEnabledModule: true, + }), ) })