Merge reconcile branch

Author: damienmulder

api/v3/shared_types.go

@@ -17,6 +17,7 @@ const (
 	ServiceTypeWFS ServiceType = "WFS"
 )
 
+// +kubebuilder:object:generate=false
 type WMSWFS interface {
 	*WFS | *WMS
 	metav1.Object

api/v3/zz_generated.deepcopy.go

@@ -65,7 +65,7 @@ chown -R 999:999 /var/www/legend
 
 func TestGetArgsForWFS(t *testing.T) {
 	type args struct {
-		WFS v3.WFS
+		WFS *v3.WFS
 	}
 	tests := []struct {
 		name     string
@@ -76,7 +76,7 @@ func TestGetArgsForWFS(t *testing.T) {
 		{
 			name: "GetArgs for WFS with prefetchData",
 			args: args{
-				WFS: v3.WFS{
+				WFS: &v3.WFS{
 					Spec: v3.WFSSpec{
 						Service: v3.WFSService{
 							Title: "wfs-prefetch-service-title",
@@ -93,7 +93,7 @@ func TestGetArgsForWFS(t *testing.T) {
 		{
 			name: "GetArgs for WFS without prefetchData",
 			args: args{
-				WFS: v3.WFS{
+				WFS: &v3.WFS{
 					Spec: v3.WFSSpec{
 						Service: v3.WFSService{
 							Title: "wfs-noprefetch-service-title",
@@ -283,7 +283,7 @@ func TestGetArgsForWMS(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			args, err := GetArgs(tt.args.WMS)
+			args, err := GetArgs(&tt.args.WMS)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetArgs() error = %v, wantErr %v", err, tt.wantErr)
 				return

internal/controller/blobdownload/blob_download_test.go

@@ -18,7 +18,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 		Global: Global{
 			Namespace:         mapperutils.GetNamespaceURI(wfs.Spec.Service.Prefix, ownerInfo),
 			Prefix:            wfs.Spec.Service.Prefix,
-			OnlineResourceurl: pdoknlv3.GetBaseURL(),
+			OnlineResourceurl: pdoknlv3.GetHost(),
 			Path:              mapperutils.GetPath(wfs),
 			Version:           *mapperutils.GetLabelValueByKey(wfs.ObjectMeta.Labels, "service-version"),
 		},
@@ -36,7 +36,7 @@ func MapWFSToCapabilitiesGeneratorInput(wfs *pdoknlv3.WFS, ownerInfo *smoothoper
 							Href string
 						}{
 							Type: "simple",
-							Href: pdoknlv3.GetBaseURL(),
+							Href: pdoknlv3.GetHost(),
 						}),
 					},
 					ServiceIdentification: wfs200.ServiceIdentification{