PDOK-18065 Atom-Operator - validation unit-tests

Author: rahmabPublic

api/v3/atom_validation.go

@@ -85,12 +85,12 @@ func ValidateAtomWithoutClusterChecks(atom *Atom, warnings *[]string, allErrs *f
 	var fieldPath *field.Path
 	if strings.Contains(atom.GetName(), "atom") {
 		fieldPath = field.NewPath("metadata").Child("name")
-		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "should not contain atom", atom.GroupVersionKind(), atom.GetName())
+		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "should not contain atom.", atom.GroupVersionKind(), atom.GetName())
 	}
 
 	if atom.ObjectMeta.Labels["pdok.nl/tag"] != "" {
 		fieldPath = field.NewPath("metadata").Child("labels").Child("pdok.nl/tag")
-		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "field is not supposed to be set", atom.GroupVersionKind(), atom.GetName())
+		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "field is not supposed to be set.", atom.GroupVersionKind(), atom.GetName())
 	}
 
 	if atom.ObjectMeta.Labels["pdok.nl/dataset-id"] == "" {
@@ -108,6 +108,12 @@ func ValidateAtomWithoutClusterChecks(atom *Atom, warnings *[]string, allErrs *f
 		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "label is missing.", atom.GroupVersionKind(), atom.GetName())
 	}
 
+	versionLabel, ok := atom.ObjectMeta.Labels["pdok.nl/service-version"]
+	if ok && versionLabel != "" {
+		fieldPath = field.NewPath("metadata").Child("labels").Child("pdok.nl/service-version")
+		smoothoperatorvalidation.AddWarning(warnings, *fieldPath, "field is not supposed to be set.", atom.GroupVersionKind(), atom.GetName())
+	}
+
 	var feedNames []string
 	for i, datasetFeed := range atom.Spec.Service.DatasetFeeds {
 		fieldPath = field.NewPath("spec").Child("service").Child("datasetFeeds").Index(i)

api/v3/atom_validation_test.go

@@ -23,12 +23,12 @@ func TestValidateAtomWithoutClusterChecks(t *testing.T) {
 		},
 		{
 			name:             "no-error-atom-name-warning",
-			expectedWarnings: &[]string{"pdok.nl/v3, Kind=Atom/asis-readonly-prod-atom: metadata.name: should not contain atom"},
+			expectedWarnings: &[]string{"pdok.nl/v3, Kind=Atom/asis-readonly-prod-atom: metadata.name: should not contain atom."},
 			expectedErrors:   &field.ErrorList{},
 		},
 		{
 			name:             "no-error-tag-warning",
-			expectedWarnings: &[]string{"pdok.nl/v3, Kind=Atom/with-theme-warning: metadata.labels.pdok.nl/tag: field is not supposed to be set"},
+			expectedWarnings: &[]string{"pdok.nl/v3, Kind=Atom/with-theme-warning: metadata.labels.pdok.nl/tag: field is not supposed to be set."},
 			expectedErrors:   &field.ErrorList{},
 		},
 		{
@@ -39,6 +39,11 @@ func TestValidateAtomWithoutClusterChecks(t *testing.T) {
 				"pdok.nl/v3, Kind=Atom/no-labels-warning: metadata.labels.pdok.nl/service-type: label is missing."},
 			expectedErrors: &field.ErrorList{},
 		},
+		{
+			name:             "no-error-service-version-warning",
+			expectedWarnings: &[]string{"pdok.nl/v3, Kind=Atom/with-service-version: metadata.labels.pdok.nl/service-version: field is not supposed to be set."},
+			expectedErrors:   &field.ErrorList{},
+		},
 	}
 	for _, tt := range tests {
 		actualWarnings := []string{}

api/v3/test_data/input/no-error-service-version-warning.yaml

@@ -0,0 +1,61 @@
+apiVersion: pdok.nl/v3
+kind: Atom
+metadata:
+  annotations:
+    kangaroo.pdok.nl/lifecycle-phase: prod
+    kangaroo.pdok.nl/service-bundle-ids: 65daed5f-e9e4-5791-a7c9-7e9effcca520
+    kangaroo.pdok.nl/readonly: "true"
+  labels:
+    pdok.nl/dataset-id: wetlands
+    pdok.nl/owner-id: rvo
+    pdok.nl/service-type: atom
+    pdok.nl/service-version: v1_0
+  name: with-service-version
+  namespace: services
+spec:
+  service:
+    baseUrl: http://localhost:32788/rvo/wetlands/atom
+    datasetFeeds:
+      - author:
+          email: [email protected]
+          name: Ministerie van EL&I - GIS Competence Center
+        datasetMetadataLinks:
+          metadataIdentifier: 07d73b60-dfd6-4c54-9c82-9fac70c6c48e
+          templates:
+            - csw
+            - html
+        entries:
+          - content:
+              Wetlands zijn de natte natuurgebieden in Nederland (44 gebieden).
+              Het Wetland verdrag is op 2 februari 1971 te Ramsar in Iran ondertekend.
+              Nederland was een van de zestien landen die het Verdrag toen ondertekende.
+            downloadlinks:
+              - data: public/rvo/wetlands/65daed5f-e9e4-5791-a7c9-7e9effcca520/3/wetlands.gpkg
+            polygon:
+              bbox:
+                maxx: "7.5553527"
+                maxy: "55.66948"
+                minx: "2.354173"
+                miny: "50.71447"
+            srs:
+              name: Amersfoort / RD New
+              uri: https://www.opengis.net/def/crs/EPSG/0/28992
+            technicalName: wetlands
+            title: wetlands
+            updated: "2025-02-28T09:04:17Z"
+        spatialDatasetIdentifierCode: 07d73b60-dfd6-4c54-9c82-9fac70c6c48e
+        spatialDatasetIdentifierNamespace: http://www.pdok.nl
+        subtitle: wetlands
+        technicalName: wetlands
+        title: wetlands
+    lang: nl
+    ownerInfoRef: pdok
+    rights: https://creativecommons.org/publicdomain/zero/1.0/deed.nl
+    serviceMetadataLinks:
+      metadataIdentifier: 2751ba40-5100-4186-81be-b7fdee95b49c
+      templates:
+        - csw
+        - opensearch
+        - html
+    subtitle: Download Service van wetlands
+    title: Wetlands