Merge branch 'master' into jd/fixes

jelledijkstra97 · web-flow · commit 85dab7d6e1dd · 2025-06-13T13:34:30.000+02:00
diff --git a/internal/controller/configmaps.go b/internal/controller/configmaps.go
@@ -120,7 +120,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor
 	for _, name := range staticFileName {
 		content := contents[name]
 		if name == "include.conf" {
-			content = []byte(strings.ReplaceAll(string(content), "{{ service_path }}", obj.URL().Path))
+			content = []byte(strings.ReplaceAll(string(content), "/{{ service_path }}", obj.URL().Path))
 		}
 		configMap.Data[name] = string(content)
 	}
diff --git a/internal/controller/legendgenerator/legend_generator_test.go b/internal/controller/legendgenerator/legend_generator_test.go
@@ -37,6 +37,7 @@ func TestGetConfigMapDataNoLegendFix(t *testing.T) {
 	test(t, "no-legend-fix")
 }
 
-func TestGetConfigMapDataLegendFix(t *testing.T) {
-	test(t, "no-legend-fix")
-}
+// TODO Fix test
+// func TestGetConfigMapDataLegendFix(t *testing.T) {
+//	test(t, "legend-fix")
+// }
diff --git a/internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/complete/expected/configmap-mapserver.yaml
@@ -130,7 +130,7 @@ metadata:
     service-type: wfs
     service-version: v1_0
     theme: theme
-  name: complete-wfs-mapserver-d84299cgbk
+  name: complete-wfs-mapserver-4dm5625f45
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wfs/complete/expected/deployment.yaml b/internal/controller/test_data/wfs/complete/expected/deployment.yaml
@@ -253,7 +253,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: complete-wfs-mapserver-d84299cgbk
+            name: complete-wfs-mapserver-4dm5625f45
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/minimal/expected/configmap-mapserver.yaml
@@ -15,7 +15,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wfs
     service-version: v1_0
-  name: minimal-wfs-mapserver-49t5fd5c5d
+  name: minimal-wfs-mapserver-f5ch9b2bhh
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wfs/minimal/expected/deployment.yaml b/internal/controller/test_data/wfs/minimal/expected/deployment.yaml
@@ -236,7 +236,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: minimal-wfs-mapserver-49t5fd5c5d
+            name: minimal-wfs-mapserver-f5ch9b2bhh
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml b/internal/controller/test_data/wfs/noprefetch/expected/configmap-mapserver.yaml
@@ -15,7 +15,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wfs
     service-version: v1_0
-  name: noprefetch-wfs-mapserver-49t5fd5c5d
+  name: noprefetch-wfs-mapserver-f5ch9b2bhh
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml b/internal/controller/test_data/wfs/noprefetch/expected/deployment.yaml
@@ -232,7 +232,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: noprefetch-wfs-mapserver-49t5fd5c5d
+            name: noprefetch-wfs-mapserver-f5ch9b2bhh
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/complete/expected/configmap-mapserver.yaml
@@ -136,7 +136,7 @@ metadata:
     service-type: wms
     service-version: v1_0
     theme: "2016"
-  name: complete-wms-mapserver-6k9496ckg7
+  name: complete-wms-mapserver-84kmc4cbf6
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wms/complete/expected/deployment.yaml b/internal/controller/test_data/wms/complete/expected/deployment.yaml
@@ -366,7 +366,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: complete-wms-mapserver-6k9496ckg7
+            name: complete-wms-mapserver-84kmc4cbf6
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/configmap-mapserver.yaml
@@ -135,7 +135,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: custom-mapfile-wms-mapserver-thkgc6d66b
+  name: custom-mapfile-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml b/internal/controller/test_data/wms/custom-mapfile/expected/deployment.yaml
@@ -312,7 +312,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: custom-mapfile-wms-mapserver-thkgc6d66b
+            name: custom-mapfile-wms-mapserver-df94mb2d76
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/minimal/expected/configmap-mapserver.yaml
@@ -135,7 +135,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: minimal-wms-mapserver-thkgc6d66b
+  name: minimal-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wms/minimal/expected/deployment.yaml b/internal/controller/test_data/wms/minimal/expected/deployment.yaml
@@ -330,7 +330,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: minimal-wms-mapserver-thkgc6d66b
+            name: minimal-wms-mapserver-df94mb2d76
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/noprefetch/expected/configmap-mapserver.yaml
@@ -135,7 +135,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: noprefetch-wms-mapserver-thkgc6d66b
+  name: noprefetch-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml b/internal/controller/test_data/wms/noprefetch/expected/deployment.yaml
@@ -326,7 +326,7 @@ spec:
         - emptyDir: {}
           name: data
         - configMap:
-            name: noprefetch-wms-mapserver-thkgc6d66b
+            name: noprefetch-wms-mapserver-df94mb2d76
             defaultMode: 420
           name: mapserver
         - configMap:
diff --git a/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml b/internal/controller/test_data/wms/patches/expected/configmap-mapserver.yaml
@@ -135,7 +135,7 @@ metadata:
     pdok.nl/inspire: "false"
     service-type: wms
     service-version: v1_0
-  name: patches-wms-mapserver-thkgc6d66b
+  name: patches-wms-mapserver-df94mb2d76
   namespace: default
   ownerReferences:
     - apiVersion: pdok.nl/v3
diff --git a/internal/webhook/v3/wfs_webhook.go b/internal/webhook/v3/wfs_webhook.go
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+//nolint:dupl
 package v3
 
 import (
diff --git a/internal/webhook/v3/wms_webhook.go b/internal/webhook/v3/wms_webhook.go
@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+//nolint:dupl
 package v3
 
 import (
@@ -45,7 +46,7 @@ var wmsLog = logf.Log.WithName("wms-resource")
 // SetupWMSWebhookWithManager registers the webhook for WMS in the manager.
 func SetupWMSWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).For(&pdoknlv3.WMS{}).
-		WithValidator(&WMSCustomValidator{}).
+		WithValidator(&WMSCustomValidator{mgr.GetClient()}).
 		Complete()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func mutateConfigMap[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, configMap *cor`
`120`	`120`	`for _, name := range staticFileName {`
`121`	`121`	`content := contents[name]`
`122`	`122`	`if name == "include.conf" {`
`123`		`- content = []byte(strings.ReplaceAll(string(content), "{{ service_path }}", obj.URL().Path))`
	`123`	`+ content = []byte(strings.ReplaceAll(string(content), "/{{ service_path }}", obj.URL().Path))`
`124`	`124`	`}`
`125`	`125`	`configMap.Data[name] = string(content)`
`126`	`126`	`}`