Fixed tests

Author: Jelle Dijkstra

internal/controller/blobdownload/blob_download_test.go

@@ -35,10 +35,10 @@ echo 'generated fonts.list:';
 cat /srv/data/config/fonts/fonts.list;
 mkdir -p /var/www/legend/wms-gpkg-layer-1-name;
 rclone copyto blobs:/resources-bucket/key/gpkg-layer-1-legend.png /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png || exit 1;
-Copied legend gpkg-layer-1-legend.png to /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png;
+echo 'Copied legend gpkg-layer-1-legend.png to /var/www/legend/wms-gpkg-layer-1-name/wms-gpkg-style-1-name.png';
 mkdir -p /var/www/legend/wms-gpkg-layer-2-name;
 rclone copyto blobs:/resources-bucket/key/gpkg-layer-2-legend.png /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png || exit 1;
-Copied legend gpkg-layer-2-legend.png to /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png;
+echo 'Copied legend gpkg-layer-2-legend.png to /var/www/legend/wms-gpkg-layer-2-name/wms-gpkg-style-2-name.png';
 chown -R 999:999 /var/www/legend
 `
 
@@ -58,10 +58,10 @@ echo 'generated fonts.list:';
 cat /srv/data/config/fonts/fonts.list;
 mkdir -p /var/www/legend/wms-tif-layer-1-name;
 rclone copyto blobs:/resources-bucket/key/tif-layer-1-legend.png /var/www/legend/wms-tif-layer-1-name/wms-tif-style-1-name.png || exit 1;
-Copied legend tif-layer-1-legend.png to /var/www/legend/wms-tif-layer-1-name/wms-tif-style-1-name.png;
+echo 'Copied legend tif-layer-1-legend.png to /var/www/legend/wms-tif-layer-1-name/wms-tif-style-1-name.png';
 mkdir -p /var/www/legend/wms-tif-layer-2-name;
 rclone copyto blobs:/resources-bucket/key/tif-layer-2-legend.png /var/www/legend/wms-tif-layer-2-name/wms-tif-style-2-name.png || exit 1;
-Copied legend tif-layer-2-legend.png to /var/www/legend/wms-tif-layer-2-name/wms-tif-style-2-name.png;
+echo 'Copied legend tif-layer-2-legend.png to /var/www/legend/wms-tif-layer-2-name/wms-tif-style-2-name.png';
 chown -R 999:999 /var/www/legend
 `
 )

internal/controller/mapfilegenerator/test_data/expected/wfs.json

@@ -9,6 +9,7 @@
   "service_onlineresource": "https://service.pdok.nl",
   "service_path": "/datasetOwner/dataset/theme/wfs/v1_0",
   "service_metadata_id": "metameta-meta-meta-meta-metametameta",
+  "service_accessconstraints": "http://creativecommons.org/publicdomain/zero/1.0/deed.nl",
   "automatic_casing": true,
   "data_epsg": "EPSG:28992",
   "service_debug_level": 0,

internal/controller/test_data/wfs/complete/expected/configmap-capabilities-generator.yaml

@@ -107,7 +107,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-capabilities-generator-g57dmd6b78
+  name: complete-wfs-capabilities-generator-g7fh2dbt4m
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/complete/expected/configmap-mapfile-generator.yaml

@@ -111,7 +111,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-mapfile-generator-5gf58d5d55
+  name: complete-wfs-mapfile-generator-c4f5ctgfmb
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/complete/expected/deployment.yaml

@@ -261,10 +261,10 @@ spec:
             name: complete-wfs-init-scripts-fft29bbtdd
           name: init-scripts
         - configMap:
-            name: complete-wfs-capabilities-generator-g57dmd6b78
+            name: complete-wfs-capabilities-generator-g7fh2dbt4m
             defaultMode: 420
           name: capabilities-generator-config
         - configMap:
-            name: complete-wfs-mapfile-generator-5gf58d5d55
+            name: complete-wfs-mapfile-generator-c4f5ctgfmb
             defaultMode: 420
           name: mapfile-generator-config

internal/controller/test_data/wfs/minimal/expected/configmap-capabilities-generator.yaml

@@ -11,7 +11,7 @@ metadata:
     pdok.nl/inspire: 'false'
     service-type: wfs
     service-version: v1_0
-  name: minimal-wfs-capabilities-generator-md7fhtmd4f
+  name: minimal-wfs-capabilities-generator-m46924mtk7
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/minimal/expected/configmap-mapfile-generator.yaml

@@ -11,7 +11,7 @@ metadata:
     pdok.nl/inspire: 'false'
     service-type: wfs
     service-version: v1_0
-  name: minimal-wfs-mapfile-generator-g82gh74ddd
+  name: minimal-wfs-mapfile-generator-cdchdd74m7
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/minimal/expected/deployment.yaml

@@ -244,10 +244,10 @@ spec:
             name: minimal-wfs-init-scripts-fft29bbtdd
           name: init-scripts
         - configMap:
-            name: minimal-wfs-capabilities-generator-md7fhtmd4f
+            name: minimal-wfs-capabilities-generator-m46924mtk7
             defaultMode: 420
           name: capabilities-generator-config
         - configMap:
-            name: minimal-wfs-mapfile-generator-g82gh74ddd
+            name: minimal-wfs-mapfile-generator-cdchdd74m7
             defaultMode: 420
           name: mapfile-generator-config

internal/controller/test_data/wfs/noprefetch/expected/configmap-capabilities-generator.yaml

@@ -11,7 +11,7 @@ metadata:
     pdok.nl/inspire: 'false'
     service-type: wfs
     service-version: v1_0
-  name: noprefetch-wfs-capabilities-generator-md7fhtmd4f
+  name: noprefetch-wfs-capabilities-generator-m46924mtk7
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3

internal/controller/test_data/wfs/noprefetch/expected/configmap-mapfile-generator.yaml

@@ -11,7 +11,7 @@ metadata:
     pdok.nl/inspire: 'false'
     service-type: wfs
     service-version: v1_0
-  name: noprefetch-wfs-mapfile-generator-g82gh74ddd
+  name: noprefetch-wfs-mapfile-generator-cdchdd74m7
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3