Merge pull request #1918 from tremes/insights-duration-validation

OCPBUGS-35196: Insights types - fix duration validation

Author: openshift-merge-bot[bot]

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

@@ -257,4 +257,143 @@ tests:
         spec: {} # No spec is required for a DataGather
         status: 
           dataGatherState: Running
-      expectedStatusError: "status.dataGatherState: Invalid value: \"string\": dataGatherState cannot transition from Failed to Running"
+      expectedStatusError: "status.dataGatherState: Invalid value: \"string\": dataGatherState cannot transition from Failed to Running"
+    - name: lastGatherDuration can be updated with a trailing zero value
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+        status:
+          gatherers:
+          - name: testGatherer
+            lastGatherDuration: 1m0s
+            conditions:
+            - type: Gathered
+              status: "True"
+              reason: OK
+              message: "test message"
+              lastTransitionTime: "2024-12-01T08:04:21Z"
+      expected: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+        status:
+          gatherers:
+          - name: testGatherer
+            lastGatherDuration: 1m0s
+            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
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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"
+      expected: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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 
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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"
+      expected: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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 
+      initial: |
+        apiVersion: insights.openshift.io/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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/v1alpha1
+        kind: DataGather
+        spec: {} # No spec is required for a DataGather
+      updated: |
+        apiVersion: insights.openshift.io/v1alpha1
+        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))+)$'"

insights/v1alpha1/types_insights.go

@@ -168,7 +168,7 @@ type GathererStatus struct {
 	// lastGatherDuration represents the time spent gathering.
 	// +required
 	// +kubebuilder:validation:Type=string
-	// +kubebuilder:validation:Pattern="^([1-9][0-9]*(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
+	// +kubebuilder:validation:Pattern="^(([0-9]+(?:\\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$"
 	LastGatherDuration metav1.Duration `json:"lastGatherDuration"`
 }
 

insights/v1alpha1/zz_generated.crd-manifests/0000_10_insights_01_datagathers-CustomNoUpgrade.crd.yaml

@@ -263,7 +263,7 @@ spec:
                       x-kubernetes-list-type: map
                     lastGatherDuration:
                       description: lastGatherDuration represents the time spent gathering.
-                      pattern: ^([1-9][0-9]*(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
+                      pattern: ^(([0-9]+(?:\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$
                       type: string
                     name:
                       description: name is the name of the gatherer.

insights/v1alpha1/zz_generated.crd-manifests/0000_10_insights_01_datagathers-DevPreviewNoUpgrade.crd.yaml

@@ -263,7 +263,7 @@ spec:
                       x-kubernetes-list-type: map
                     lastGatherDuration:
                       description: lastGatherDuration represents the time spent gathering.
-                      pattern: ^([1-9][0-9]*(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
+                      pattern: ^(([0-9]+(?:\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$
                       type: string
                     name:
                       description: name is the name of the gatherer.

insights/v1alpha1/zz_generated.crd-manifests/0000_10_insights_01_datagathers-TechPreviewNoUpgrade.crd.yaml

@@ -263,7 +263,7 @@ spec:
                       x-kubernetes-list-type: map
                     lastGatherDuration:
                       description: lastGatherDuration represents the time spent gathering.
-                      pattern: ^([1-9][0-9]*(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
+                      pattern: ^(([0-9]+(?:\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$
                       type: string
                     name:
                       description: name is the name of the gatherer.

insights/v1alpha1/zz_generated.featuregated-crd-manifests/datagathers.insights.openshift.io/InsightsOnDemandDataGather.yaml

@@ -263,7 +263,7 @@ spec:
                       x-kubernetes-list-type: map
                     lastGatherDuration:
                       description: lastGatherDuration represents the time spent gathering.
-                      pattern: ^([1-9][0-9]*(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
+                      pattern: ^(([0-9]+(?:\.[0-9]+)?(ns|us|µs|μs|ms|s|m|h))+)$
                       type: string
                     name:
                       description: name is the name of the gatherer.