From 4c78466d33b1a6d3362468a930035b20820430d4 Mon Sep 17 00:00:00 2001 From: Christian Zunker Date: Thu, 16 Nov 2023 18:23:05 +0100 Subject: [PATCH] Fix unit tests Signed-off-by: Christian Zunker --- controllers/status/operator_status_test.go | 7 +++++++ controllers/status/status_reporter_test.go | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/controllers/status/operator_status_test.go b/controllers/status/operator_status_test.go index e6889bc4a..348ffaaa0 100644 --- a/controllers/status/operator_status_test.go +++ b/controllers/status/operator_status_test.go @@ -45,6 +45,7 @@ func TestReportStatusRequestFromAuditConfig_AllDisabled(t *testing.T) { {Identifier: NodeScanningIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: "Node scanning is disabled"}, {Identifier: AdmissionControllerIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: "Admission controller is disabled"}, {Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: "Scan API is disabled"}, + {Identifier: MondooOperatorIdentifier, Status: mondooclient.MessageStatus_MESSAGE_UNKNOWN, Message: "No status reported yet"}, } assert.ElementsMatch(t, messages, reportStatus.Messages.Messages) } @@ -74,6 +75,7 @@ func TestReportStatusRequestFromAuditConfig_AllEnabled(t *testing.T) { {Message: "Node Scanning is available", Status: v1.ConditionFalse, Type: v1alpha2.NodeScanningDegraded}, {Message: "Admission controller is available", Status: v1.ConditionFalse, Type: v1alpha2.AdmissionDegraded}, {Message: "ScanAPI controller is available", Status: v1.ConditionFalse, Type: v1alpha2.ScanAPIDegraded}, + {Message: "Mondoo Operator controller is available", Status: v1.ConditionFalse, Type: v1alpha2.MondooOperaotrDegraded}, } reportStatus := ReportStatusRequestFromAuditConfig(integrationMrn, m, nodes, v, logger) @@ -101,6 +103,7 @@ func TestReportStatusRequestFromAuditConfig_AllEnabled(t *testing.T) { {Identifier: NodeScanningIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[2].Message}, {Identifier: AdmissionControllerIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[3].Message}, {Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[4].Message}, + {Identifier: MondooOperatorIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[5].Message}, } assert.ElementsMatch(t, messages, reportStatus.Messages.Messages) } @@ -130,6 +133,7 @@ func TestReportStatusRequestFromAuditConfig_AllEnabled_DeprecatedFields(t *testi {Message: "Node Scanning is available", Status: v1.ConditionFalse, Type: v1alpha2.NodeScanningDegraded}, {Message: "Admission controller is available", Status: v1.ConditionFalse, Type: v1alpha2.AdmissionDegraded}, {Message: "ScanAPI controller is available", Status: v1.ConditionFalse, Type: v1alpha2.ScanAPIDegraded}, + {Message: "Mondoo Operator controller is available", Status: v1.ConditionFalse, Type: v1alpha2.MondooOperaotrDegraded}, } reportStatus := ReportStatusRequestFromAuditConfig(integrationMrn, m, nodes, v, logger) @@ -157,6 +161,7 @@ func TestReportStatusRequestFromAuditConfig_AllEnabled_DeprecatedFields(t *testi {Identifier: NodeScanningIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[2].Message}, {Identifier: AdmissionControllerIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[3].Message}, {Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[4].Message}, + {Identifier: MondooOperatorIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, Message: m.Status.Conditions[5].Message}, } assert.ElementsMatch(t, messages, reportStatus.Messages.Messages) } @@ -182,6 +187,7 @@ func TestReportStatusRequestFromAuditConfig_AllError(t *testing.T) { {Message: "Node Scanning error", Status: v1.ConditionTrue, Type: v1alpha2.NodeScanningDegraded}, {Message: "Admission controller error", Status: v1.ConditionTrue, Type: v1alpha2.AdmissionDegraded}, {Message: "ScanAPI controller error", Status: v1.ConditionTrue, Type: v1alpha2.ScanAPIDegraded}, + {Message: "Mondoo Operator controller is unavailable", Status: v1.ConditionTrue, Type: v1alpha2.MondooOperaotrDegraded}, } reportStatus := ReportStatusRequestFromAuditConfig(integrationMrn, m, nodes, v, logger) @@ -204,6 +210,7 @@ func TestReportStatusRequestFromAuditConfig_AllError(t *testing.T) { {Identifier: NodeScanningIdentifier, Status: mondooclient.MessageStatus_MESSAGE_ERROR, Message: m.Status.Conditions[2].Message}, {Identifier: AdmissionControllerIdentifier, Status: mondooclient.MessageStatus_MESSAGE_ERROR, Message: m.Status.Conditions[3].Message}, {Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_ERROR, Message: m.Status.Conditions[4].Message}, + {Identifier: MondooOperatorIdentifier, Status: mondooclient.MessageStatus_MESSAGE_ERROR, Message: m.Status.Conditions[5].Message}, } assert.ElementsMatch(t, messages, reportStatus.Messages.Messages) } diff --git a/controllers/status/status_reporter_test.go b/controllers/status/status_reporter_test.go index 3ac9d88c8..fec093ea7 100644 --- a/controllers/status/status_reporter_test.go +++ b/controllers/status/status_reporter_test.go @@ -110,6 +110,11 @@ func (s *StatusReporterSuite) TestReport() { Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, }, + { + Message: "No status reported yet", + Identifier: MondooOperatorIdentifier, + Status: mondooclient.MessageStatus_MESSAGE_UNKNOWN, + }, }, }, LastState: OperatorCustomState{ @@ -179,6 +184,11 @@ func (s *StatusReporterSuite) TestReport_StatusChange() { Identifier: ScanApiIdentifier, Status: mondooclient.MessageStatus_MESSAGE_INFO, }, + { + Message: "No status reported yet", + Identifier: MondooOperatorIdentifier, + Status: mondooclient.MessageStatus_MESSAGE_UNKNOWN, + }, }, }, LastState: operatorState,