feat: review

Signed-off-by: Ondrej Pokorny <[email protected]>

Author: opokornyy

insights/v1alpha2/Makefile

@@ -1,3 +1,3 @@
 .PHONY: test
 test:
-	make -C ../../tests test GINKGO_EXTRA_ARGS=--focus="insights.openshift.io/v1alpha2"
+	make -C ../../tests test GINKGO_EXTRA_ARGS=--focus="insights.openshift.io/v1alpha2"

insights/v1alpha2/doc.go

@@ -2,7 +2,6 @@
 // +k8s:defaulter-gen=TypeMeta
 // +k8s:openapi-gen=true
 
-// +kubebuilder:validation:Optional
 // +groupName=insights.openshift.io
 // Package v1alpha2 is the v1alpha2 version of the API.
 package v1alpha2

insights/v1alpha2/tests/datagathers.insights.openshift.io/InsightsOnDemandDataGather.yaml

@@ -356,95 +356,7 @@ tests:
               resource: "pods"
               namespace: "openshift-insights"
       expectedStatusError: 'status: Invalid value: "object": cannot remove finishTime attribute from status'
-    - name: dataGatherState cannot be removed from status
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Running
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-           relatedObjects:
-            - name: periodic-job-xyz
-              group: ""
-              resource: "pods"
-              namespace: "openshift-insights"
-      expectedStatusError: 'status: Invalid value: "object": cannot remove dataGatherState attribute from status'
-    - name: dataGatherState cannot transition from Running to Pending
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Running
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Pending
-      expectedStatusError: 'status.dataGatherState: Invalid value: "string": dataGatherState cannot transition from Running to Pending'
-    - name: dataGatherState cannot transition from Completed to Pending
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Completed
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Pending
-      expectedStatusError: 'status.dataGatherState: Invalid value: "string": dataGatherState cannot transition from Completed to Pending'
-    - name: dataGatherState cannot transition from Failed to Pending
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Failed
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Pending
-      expectedStatusError: 'status.dataGatherState: Invalid value: "string": dataGatherState cannot transition from Failed to Pending'
-    - name: dataGatherState cannot transition from Completed to Running
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Completed
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Running
-      expectedStatusError: 'status.dataGatherState: Invalid value: "string": dataGatherState cannot transition from Completed to Running'
-    - name: dataGatherState cannot transition from Failed to Running
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Failed
-      updated: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-        status: 
-          dataGatherState: Running
-      expectedStatusError: 'status.dataGatherState: Invalid value: "string": dataGatherState cannot transition from Failed to Running'
-    - name: lastGatherDuration can be updated with a trailing zero value
+    - name: lastGatherSeconds must be integer
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -456,28 +368,35 @@ tests:
         status:
           gatherers:
           - name: testGatherer
-            lastGatherDuration: 1m0s
+            lastGatherSeconds: 1.1
             conditions:
             - type: Gathered
               status: "True"
               reason: OK
               message: "test message"
               lastTransitionTime: "2024-12-01T08:04:21Z"
-      expected: |
+      expectedStatusError: "gatherers[0].lastGatherSeconds in body must be of type integer"
+    - name: lastGatherSeconds cannot be updated with an invalid value
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha2
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
           gatherers:
           - name: testGatherer
-            lastGatherDuration: 1m0s
+            lastGatherSeconds: 1d2h
             conditions:
             - type: Gathered
               status: "True"
               reason: OK
               message: "test message"
               lastTransitionTime: "2024-12-01T08:04:21Z"
-    - name: lastGatherDuration can be updated with a leading zero value
+      expectedStatusError: 'Invalid value: "string": gatherers[0].lastGatherSeconds in body must be of type integer'
+    - name: lastGatherSeconds cannot be updated with a negative value
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -489,28 +408,28 @@ tests:
         status:
           gatherers:
           - name: testGatherer
-            lastGatherDuration: 0m11s
+            lastGatherSeconds: -5
             conditions:
             - type: Gathered
               status: "True"
               reason: OK
               message: "test message"
               lastTransitionTime: "2024-12-01T08:04:21Z"
-      expected: |
+      expectedStatusError: "lastGatherSeconds in body should be greater than or equal to 0"
+    - name: should not be updated with URL that is not HTTPS
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha2
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
-          gatherers:
-          - name: testGatherer
-            lastGatherDuration: 0m11s
-            conditions:
-            - type: Gathered
-              status: "True"
-              reason: OK
-              message: "test message"
-              lastTransitionTime: "2024-12-01T08:04:21Z"
-    - name: lastGatherDuration can be updated with a decimal number value
+          insightsReport:
+            uri: http://example.com
+      expectedStatusError: 'status.insightsReport.uri: Invalid value: "string": URI must be a valid HTTPS URL (e.g., https://example.com)'
+    - name: should be updated with a valid HTTPS URL
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -520,30 +439,16 @@ tests:
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
-          gatherers:
-          - name: testGatherer
-            lastGatherDuration: 1m0.77s
-            conditions:
-            - type: Gathered
-              status: "True"
-              reason: OK
-              message: "test message"
-              lastTransitionTime: "2024-12-01T08:04:21Z"
+          insightsReport:
+            uri: https://example.com
       expected: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
-          gatherers:
-          - name: testGatherer
-            lastGatherDuration: 1m0.77s
-            conditions:
-            - type: Gathered
-              status: "True"
-              reason: OK
-              message: "test message"
-              lastTransitionTime: "2024-12-01T08:04:21Z"
-    - name: lastGatherDuration cannot be updated with an invalid value
+          insightsReport:
+            uri: https://example.com
+    - name: should be updated with a valid totalRisk
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -553,37 +458,22 @@ tests:
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
-          gatherers:
-          - name: testGatherer
-            lastGatherDuration: 1d2h
-            conditions:
-            - type: Gathered
-              status: "True"
-              reason: OK
-              message: "test message"
-              lastTransitionTime: "2024-12-01T08:04:21Z"
-      expectedStatusError: "Invalid value: \"1d2h\": gatherers[0].lastGatherDuration in body should match '^(([0-9]+(?:\\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$'"
-    - name: lastGatherDuration cannot be updated with a negative value
-      initial: |
-        apiVersion: insights.openshift.io/v1alpha2
-        kind: DataGather
-        spec: {} # No spec is required for a DataGather
-      updated: |
+          insightsReport:
+            healthChecks:
+              - description: Low risk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+      expected: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
-          gatherers:
-          - name: testGatherer
-            lastGatherDuration: -0m5s
-            conditions:
-            - type: Gathered
-              status: "True"
-              reason: OK
-              message: "test message"
-              lastTransitionTime: "2024-12-01T08:04:21Z"
-      expectedStatusError: "Invalid value: \"-0m5s\": gatherers[0].lastGatherDuration in body should match '^(([0-9]+(?:\\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$'"
-    - name: should not be updated with URL that is not HTTPS
+          insightsReport:
+            healthChecks:
+              - description: Low risk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+    - name: should not be updated with invalid totalRisk value
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -594,9 +484,12 @@ tests:
         spec: {} # No spec is required for a DataGather
         status:
           insightsReport:
-            uri: http://example.com
-      expectedStatusError: 'status.insightsReport.uri: Invalid value: "string": URI must be a valid HTTPS URL (e.g., https://example.com)'
-    - name: should be updated with a valid HTTPS URL
+            healthChecks:
+              - description:  NoRisk update test
+                totalRisk: NoRisk
+                advisorURI: https://example.com
+      expectedStatusError: 'totalRisk: Unsupported value: "NoRisk": supported values: "Low", "Moderate", "Important", "Critical"'
+    - name: should pass
       initial: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
@@ -607,11 +500,42 @@ tests:
         spec: {} # No spec is required for a DataGather
         status:
           insightsReport:
-            uri: https://example.com
+            healthChecks:
+              - description:  NoRisk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+              - description:  NoRisk update test
+                totalRisk: Important
+                advisorURI: https://example.com
       expected: |
         apiVersion: insights.openshift.io/v1alpha2
         kind: DataGather
         spec: {} # No spec is required for a DataGather
         status:
           insightsReport:
-            uri: https://example.com
+            healthChecks:
+              - description:  NoRisk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+              - description:  NoRisk update test
+                totalRisk: Important
+                advisorURI: https://example.com
+    - name: no duplicates
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha2
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha2
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+        status:
+          insightsReport:
+            healthChecks:
+              - description:  Low risk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+              - description:  Low risk update test
+                totalRisk: Low
+                advisorURI: https://example.com
+      expectedStatusError: "invalid: status.insightsReport.healthChecks[1]: Duplicate value"