Skip to content

Commit d96dee8

Browse files
author
Jelle Dijkstra
committed
Fixed tests
1 parent 1a8bd5a commit d96dee8

File tree

8 files changed

+94
-44
lines changed

8 files changed

+94
-44
lines changed

‎api/v3/zz_generated.deepcopy.go‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/controller/mapfilegenerator/mapfile_generator_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func TestGetConfigForWFS(t *testing.T) {
245245
func TestGetConfigForWMSWithNoGroupLayers(t *testing.T) {
246246
ownerInfo := &smoothoperatorv1.OwnerInfo{
247247
Spec: smoothoperatorv1.OwnerInfoSpec{
248-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
248+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
249249
},
250250
}
251251

@@ -270,7 +270,7 @@ func TestGetConfigForWMSWithNoGroupLayers(t *testing.T) {
270270
func TestGetConfigForWMSWithGroupLayers(t *testing.T) {
271271
ownerInfo := &smoothoperatorv1.OwnerInfo{
272272
Spec: smoothoperatorv1.OwnerInfoSpec{
273-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
273+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
274274
},
275275
}
276276

@@ -295,7 +295,7 @@ func TestGetConfigForWMSWithGroupLayers(t *testing.T) {
295295
func TestGetConfigForWMSWithGroupLayersAndTopGroupLayer(t *testing.T) {
296296
ownerInfo := &smoothoperatorv1.OwnerInfo{
297297
Spec: smoothoperatorv1.OwnerInfoSpec{
298-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
298+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
299299
},
300300
}
301301

@@ -320,7 +320,7 @@ func TestGetConfigForWMSWithGroupLayersAndTopGroupLayer(t *testing.T) {
320320
func TestGetConfigForTifWMS(t *testing.T) {
321321
ownerInfo := &smoothoperatorv1.OwnerInfo{
322322
Spec: smoothoperatorv1.OwnerInfoSpec{
323-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
323+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
324324
},
325325
}
326326

@@ -345,7 +345,7 @@ func TestGetConfigForTifWMS(t *testing.T) {
345345
func TestGetConfigForPostgisWMS(t *testing.T) {
346346
ownerInfo := &smoothoperatorv1.OwnerInfo{
347347
Spec: smoothoperatorv1.OwnerInfoSpec{
348-
NamespaceTemplate: "http://{{prefix}}.geonovum.nl",
348+
NamespaceTemplate: smoothoperatorutils.Pointer("http://{{prefix}}.geonovum.nl"),
349349
},
350350
}
351351

‎internal/controller/mapfilegenerator/mapper.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, ownerInfo *smoothoperatorv
174174
Extent: extent,
175175
NamespacePrefix: datasetName,
176176
NamespaceURI: fmt.Sprintf("%s://%s.geonovum.nl", protocol, datasetName),
177-
OnlineResource: pdoknlv3.GetHost(),
177+
OnlineResource: pdoknlv3.GetHost(true),
178178
Path: mapperutils.GetPath(wms),
179179
MetadataId: metadataId,
180180
DatasetOwner: &datasetOwner,
@@ -236,14 +236,19 @@ func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv
236236
tableName = serviceLayer.Data.GetTableName()
237237
}
238238

239+
metadataId := ""
240+
if serviceLayer.DatasetMetadataURL != nil && serviceLayer.DatasetMetadataURL.CSW != nil {
241+
metadataId = serviceLayer.DatasetMetadataURL.CSW.MetadataIdentifier
242+
}
243+
239244
result := WMSLayer{
240245
BaseLayer: BaseLayer{
241246
Name: *serviceLayer.Name,
242247
Title: smoothoperatorutils.PointerVal(serviceLayer.Title, ""),
243248
Abstract: smoothoperatorutils.PointerVal(serviceLayer.Abstract, ""),
244249
Keywords: strings.Join(serviceLayer.Keywords, ","),
245250
Extent: layerExtent,
246-
MetadataId: serviceLayer.DatasetMetadataURL.CSW.MetadataIdentifier,
251+
MetadataId: metadataId,
247252
Columns: columns,
248253
GeometryType: nil,
249254
GeopackagePath: nil,

‎internal/controller/shared_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ func mutateHorizontalPodAutoscaler[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O,
665665
autoscaler.Spec = autoscalingv2.HorizontalPodAutoscalerSpec{
666666
ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{
667667
Kind: "Deployment",
668-
Name: obj.GetName() + "-" + MapserverName,
668+
Name: getSuffixedName(obj, MapserverName),
669669
},
670670
MinReplicas: &minReplicas,
671671
MaxReplicas: maxReplicas,

‎internal/controller/shared_controller_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const (
2020
testImageName4 = "test.test/image:test4"
2121
testImageName5 = "test.test/image:test5"
2222
testImageName6 = "test.test/image:test6"
23+
testImageName7 = "test.test/image:test7"
2324
)
2425

2526
func getHashedConfigMapNameFromClient[O pdoknlv3.WMSWFS](ctx context.Context, obj O, volumeName string) (string, error) {

‎internal/controller/suite_test.go‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import (
3232
smoothoperator1 "github.com/pdok/smooth-operator/api/v1"
3333
traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
3434
"golang.org/x/tools/go/packages"
35+
v1 "k8s.io/api/core/v1"
36+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3537
"k8s.io/apimachinery/pkg/runtime"
3638
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
3739
"os"
@@ -123,6 +125,25 @@ var _ = BeforeSuite(func() {
123125
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
124126
Expect(err).NotTo(HaveOccurred())
125127
Expect(k8sClient).NotTo(BeNil())
128+
129+
// Deploy blob configmap + secret
130+
blobConfig := &v1.ConfigMap{
131+
ObjectMeta: metav1.ObjectMeta{
132+
Name: blobsConfigPrefix + "testtest",
133+
Namespace: metav1.NamespaceDefault,
134+
},
135+
}
136+
err = k8sClient.Create(ctx, blobConfig)
137+
Expect(err).NotTo(HaveOccurred())
138+
139+
blobSecret := v1.Secret{
140+
ObjectMeta: metav1.ObjectMeta{
141+
Name: blobsSecretPrefix + "testtest",
142+
Namespace: metav1.NamespaceDefault,
143+
},
144+
}
145+
err = k8sClient.Create(ctx, &blobSecret)
146+
Expect(err).NotTo(HaveOccurred())
126147
})
127148

128149
var _ = AfterSuite(func() {

‎internal/controller/wfs_controller_test.go‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ var _ = Describe("WFS Controller", func() {
221221
return Expect(err).NotTo(HaveOccurred())
222222
}, "10s", "1s").Should(BeTrue())
223223

224-
Expect(deployment.GetName()).Should(Equal(wfs.GetName() + "-mapserver"))
224+
Expect(deployment.GetName()).Should(Equal(wfs.GetName() + "-wfs-mapserver"))
225225
Expect(deployment.GetNamespace()).Should(Equal(namespace))
226226

227227
Expect(deployment.Spec.Template.Spec.TerminationGracePeriodSeconds).Should(Equal(smoothoperatorutils.Pointer(int64(60))))
@@ -234,7 +234,7 @@ var _ = Describe("WFS Controller", func() {
234234
/**
235235
Container tests
236236
*/
237-
container := deployment.Spec.Template.Spec.Containers[0]
237+
container := deployment.Spec.Template.Spec.Containers[1]
238238
Expect(container.Name).Should(Equal("mapserver"))
239239
Expect(container.Ports[0].ContainerPort).Should(Equal(int32(80)))
240240
Expect(container.Image).Should(Equal(reconcilerImages.MapserverImage))
@@ -279,11 +279,11 @@ var _ = Describe("WFS Controller", func() {
279279
volumeMounts := []v1.VolumeMount{
280280
{Name: "base", MountPath: "/srv/data"},
281281
{Name: "data", MountPath: "/var/www"},
282-
{Name: mapserver.ConfigMapBlobDownloadVolumeName, MountPath: "/src/scripts", ReadOnly: true},
282+
{Name: mapserver.ConfigMapBlobDownloadVolumeName, MountPath: "/srv/scripts", ReadOnly: true},
283283
}
284284
envFrom := []v1.EnvFromSource{
285-
utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, "blobs-config"),
286-
utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, "blobs-secret"),
285+
utils.NewEnvFromSource(utils.EnvFromSourceTypeConfigMap, "blobs-testtest"),
286+
utils.NewEnvFromSource(utils.EnvFromSourceTypeSecret, "blobs-testtest"),
287287
}
288288
Expect(blobDownloadContainer.VolumeMounts).Should(Equal(volumeMounts))
289289
Expect(blobDownloadContainer.EnvFrom).Should(Equal(envFrom))
@@ -374,7 +374,7 @@ var _ = Describe("WFS Controller", func() {
374374
}, "10s", "1s").Should(BeTrue())
375375

376376
// Make sure the name is hashed
377-
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-mapserver-"))
377+
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-wfs-mapserver"))
378378
Expect(configMap.GetNamespace()).To(Equal(namespace))
379379
Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
380380

@@ -411,7 +411,7 @@ var _ = Describe("WFS Controller", func() {
411411
return Expect(err).NotTo(HaveOccurred())
412412
}, "10s", "1s").Should(BeTrue())
413413

414-
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-mapfile-generator-"))
414+
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-wfs-mapfile-generator-"))
415415
Expect(configMap.GetNamespace()).To(Equal(namespace))
416416
Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
417417
checkWFSLabels(configMap.GetLabels())
@@ -436,7 +436,7 @@ var _ = Describe("WFS Controller", func() {
436436
return Expect(err).NotTo(HaveOccurred())
437437
}, "10s", "1s").Should(BeTrue())
438438

439-
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-init-scripts-"))
439+
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-wfs-init-scripts-"))
440440
Expect(configMap.GetNamespace()).To(Equal(namespace))
441441
Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
442442
checkWFSLabels(configMap.GetLabels())
@@ -461,7 +461,7 @@ var _ = Describe("WFS Controller", func() {
461461
return Expect(err).NotTo(HaveOccurred())
462462
}, "10s", "1s").Should(BeTrue())
463463

464-
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-capabilities-generator-"))
464+
Expect(configMap.GetName()).To(HavePrefix(wfs.GetName() + "-wfs-capabilities-generator-"))
465465
Expect(configMap.GetNamespace()).To(Equal(namespace))
466466
Expect(configMap.Immutable).To(Equal(smoothoperatorutils.Pointer(true)))
467467
checkWFSLabels(configMap.GetLabels())
@@ -484,7 +484,7 @@ var _ = Describe("WFS Controller", func() {
484484
return Expect(err).NotTo(HaveOccurred())
485485
}, "10s", "1s").Should(BeTrue())
486486

487-
Expect(middlewareCorsHeaders.Name).Should(Equal(wfs.GetName() + "-mapserver-headers"))
487+
Expect(middlewareCorsHeaders.Name).Should(Equal(wfs.GetName() + "-wfs-mapserver-headers"))
488488
Expect(middlewareCorsHeaders.Namespace).Should(Equal("default"))
489489
checkWFSLabels(middlewareCorsHeaders.GetLabels())
490490
// Expect(middlewareCorsHeaders.Spec.Headers.FrameDeny).Should(Equal(true))
@@ -510,7 +510,7 @@ var _ = Describe("WFS Controller", func() {
510510
*/
511511
checkWFSLabels(podDisruptionBudget.GetLabels(), podDisruptionBudget.Spec.Selector.MatchLabels)
512512

513-
Expect(podDisruptionBudget.GetName()).To(Equal(wfs.GetName() + "-mapserver"))
513+
Expect(podDisruptionBudget.GetName()).To(Equal(wfs.GetName() + "-wfs-mapserver"))
514514
Expect(podDisruptionBudget.Spec.MaxUnavailable.IntValue()).Should(Equal(1))
515515
})
516516

@@ -526,10 +526,10 @@ var _ = Describe("WFS Controller", func() {
526526
return Expect(err).NotTo(HaveOccurred())
527527
}, "10s", "1s").Should(BeTrue())
528528

529-
Expect(autoscaler.GetName()).To(Equal(wfs.GetName() + "-mapserver"))
529+
Expect(autoscaler.GetName()).To(Equal(wfs.GetName() + "-wfs-mapserver"))
530530
Expect(autoscaler.Spec.ScaleTargetRef).To(Equal(v2.CrossVersionObjectReference{
531531
Kind: "Deployment",
532-
Name: wfs.GetName() + "-mapserver",
532+
Name: wfs.GetName() + "-wfs-mapserver",
533533
}))
534534

535535
/**
@@ -595,7 +595,7 @@ var _ = Describe("WFS Controller", func() {
595595
return Expect(err).NotTo(HaveOccurred())
596596
}, "10s", "1s").Should(BeTrue())
597597

598-
Expect(service.GetName()).To(Equal(wfs.GetName() + "-mapserver"))
598+
Expect(service.GetName()).To(Equal(wfs.GetName() + "-wfs-mapserver"))
599599
Expect(service.Spec.Ports).To(Equal([]v1.ServicePort{
600600
{
601601
Name: "mapserver",
@@ -638,17 +638,17 @@ var _ = Describe("WFS Controller", func() {
638638
"uptime.pdok.nl/url": "https://service.pdok.nl/eigenaar/dataset/wfs/1.0.0",
639639
}))
640640

641-
Expect(ingressRoute.GetName()).To(Equal(wfs.GetName() + "-mapserver"))
641+
Expect(ingressRoute.GetName()).To(Equal(wfs.GetName() + "-wfs-mapserver"))
642642
Expect(len(ingressRoute.Spec.Routes)).To(Equal(1))
643643
Expect(ingressRoute.Spec.Routes[0]).To(Equal(traefikiov1alpha1.Route{
644644
Kind: "Rule",
645645
Match: "Host(`localhost`) && Path(`/eigenaar/dataset/wfs/1.0.0`)",
646-
Middlewares: []traefikiov1alpha1.MiddlewareRef{{Name: wfs.GetName() + "-mapserver-headers", Namespace: "default"}},
646+
Middlewares: []traefikiov1alpha1.MiddlewareRef{{Name: wfs.GetName() + "-wfs-mapserver-headers", Namespace: "default"}},
647647
Services: []traefikiov1alpha1.Service{{
648648
LoadBalancerSpec: traefikiov1alpha1.LoadBalancerSpec{
649649
Kind: "Service",
650650
Port: intstr.FromInt32(80),
651-
Name: wfs.GetName() + "-mapserver",
651+
Name: wfs.GetName() + "-wfs-mapserver",
652652
},
653653
}},
654654
}))
@@ -711,6 +711,7 @@ func getWFSReconciler() *WFSReconciler {
711711
MapfileGeneratorImage: testImageName2,
712712
MapserverImage: testImageName3,
713713
CapabilitiesGeneratorImage: testImageName4,
714+
ApacheExporterImage: testImageName5,
714715
},
715716
}
716717
}

0 commit comments

Comments
 (0)