Linting

Author: Jelle Dijkstra

api/v2beta1/shared_conversion.go

@@ -2,6 +2,7 @@ package v2beta1
 
 import (
 	"fmt"
+
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	shared_model "github.com/pdok/smooth-operator/model"
 	smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"

api/v2beta1/wms_conversion.go

@@ -74,19 +74,7 @@ func (src *WMS) ToV3(target *pdoknlv3.WMS) {
 	}
 
 	dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
-	if hc := src.Spec.Kubernetes.HealthCheck; hc != nil {
-		switch {
-		case hc.Querystring != nil:
-			dst.Spec.HealthCheck = &pdoknlv3.HealthCheckWMS{
-				Querystring: hc.Querystring,
-				Mimetype:    hc.Mimetype,
-			}
-		case hc.Boundingbox != nil:
-			dst.Spec.HealthCheck = &pdoknlv3.HealthCheckWMS{
-				Boundingbox: smoothoperatorutils.Pointer(sharedModel.ExtentToBBox(strings.ReplaceAll(*hc.Boundingbox, ",", " "))),
-			}
-		}
-	}
+	dst.Spec.HealthCheck = convertHealthCheckToV3(src.Spec.Kubernetes.HealthCheck)
 
 	service := pdoknlv3.WMSService{
 		URL:               CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
@@ -153,6 +141,24 @@ func (src *WMS) ToV3(target *pdoknlv3.WMS) {
 	dst.Spec.Service = service
 }
 
+func convertHealthCheckToV3(v2 *HealthCheck) *pdoknlv3.HealthCheckWMS {
+	if v2 != nil {
+		switch {
+		case v2.Querystring != nil:
+			return &pdoknlv3.HealthCheckWMS{
+				Querystring: v2.Querystring,
+				Mimetype:    v2.Mimetype,
+			}
+		case v2.Boundingbox != nil:
+			return &pdoknlv3.HealthCheckWMS{
+				Boundingbox: smoothoperatorutils.Pointer(sharedModel.ExtentToBBox(strings.ReplaceAll(*v2.Boundingbox, ",", " "))),
+			}
+		}
+	}
+
+	return nil
+}
+
 // ConvertFrom converts the Hub version (v3) to this WMS (v2beta1).
 //
 //nolint:revive
@@ -166,19 +172,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 	dst.Spec.General = LabelsToV2General(src.ObjectMeta.Labels)
 
 	dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
-	if src.Spec.HealthCheck != nil {
-		switch {
-		case src.Spec.HealthCheck.Querystring != nil:
-			dst.Spec.Kubernetes.HealthCheck = &HealthCheck{
-				Querystring: src.Spec.HealthCheck.Querystring,
-				Mimetype:    src.Spec.HealthCheck.Mimetype,
-			}
-		case src.Spec.HealthCheck.Boundingbox != nil:
-			dst.Spec.Kubernetes.HealthCheck = &HealthCheck{
-				Boundingbox: smoothoperatorutils.Pointer(strings.ReplaceAll(src.Spec.HealthCheck.Boundingbox.ToExtent(), " ", ",")),
-			}
-		}
-	}
+	dst.Spec.Kubernetes.HealthCheck = convertHealthCheckToV2(src.Spec.HealthCheck)
 
 	dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
 
@@ -265,6 +259,24 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
+func convertHealthCheckToV2(v3 *pdoknlv3.HealthCheckWMS) *HealthCheck {
+	if v3 != nil {
+		switch {
+		case v3.Querystring != nil:
+			return &HealthCheck{
+				Querystring: v3.Querystring,
+				Mimetype:    v3.Mimetype,
+			}
+		case v3.Boundingbox != nil:
+			return &HealthCheck{
+				Boundingbox: smoothoperatorutils.Pointer(strings.ReplaceAll(v3.Boundingbox.ToExtent(), " ", ",")),
+			}
+		}
+	}
+
+	return nil
+}
+
 func (v2Service WMSService) GetTopLayer() (*WMSLayer, error) {
 	// Only one layer defined that has data
 	if len(v2Service.Layers) == 1 && v2Service.Layers[0].Data != nil {