Merge pull request #48 from PDOK/jd/optional-options

Optional options + mapfilegenerator testfiles moved to yaml+json files

Author: jelledijkstra97

api/v2beta1/shared_conversion.go

@@ -10,10 +10,14 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func ConvertOptionsV2ToV3(src WMSWFSOptions) pdoknlv3.Options {
+func ConvertOptionsV2ToV3(src *WMSWFSOptions) *pdoknlv3.Options {
 	defaults := pdoknlv3.GetDefaultOptions()
 
-	return pdoknlv3.Options{
+	if src == nil {
+		return defaults
+	}
+
+	return &pdoknlv3.Options{
 		AutomaticCasing:             src.AutomaticCasing,
 		IncludeIngress:              src.IncludeIngress,
 		PrefetchData:                smoothoperatorutils.PointerVal(src.PrefetchData, defaults.PrefetchData),
@@ -24,8 +28,12 @@ func ConvertOptionsV2ToV3(src WMSWFSOptions) pdoknlv3.Options {
 	}
 }
 
-func ConvertOptionsV3ToV2(src pdoknlv3.Options) WMSWFSOptions {
-	return WMSWFSOptions{
+func ConvertOptionsV3ToV2(src *pdoknlv3.Options) *WMSWFSOptions {
+	if src == nil {
+		src = pdoknlv3.GetDefaultOptions()
+	}
+
+	return &WMSWFSOptions{
 		AutomaticCasing:             src.AutomaticCasing,
 		IncludeIngress:              src.IncludeIngress,
 		PrefetchData:                &src.PrefetchData,

api/v2beta1/wfs_types.go

@@ -54,10 +54,10 @@ type WFSList struct {
 
 // WFSSpec is the struct for all fields defined in the WFS CRD
 type WFSSpec struct {
-	General    General       `json:"general"`
-	Service    WFSService    `json:"service"`
-	Kubernetes Kubernetes    `json:"kubernetes"`
-	Options    WMSWFSOptions `json:"options,omitempty"`
+	General    General        `json:"general"`
+	Service    WFSService     `json:"service"`
+	Kubernetes Kubernetes     `json:"kubernetes"`
+	Options    *WMSWFSOptions `json:"options,omitempty"`
 }
 
 // WFSService is the struct with all service specific options

api/v2beta1/wms_types.go

@@ -46,10 +46,10 @@ type WMS struct {
 
 // WMSSpec is the struct for all fields defined in the WMS CRD
 type WMSSpec struct {
-	General    General       `json:"general"`
-	Service    WMSService    `json:"service"`
-	Options    WMSWFSOptions `json:"options"`
-	Kubernetes Kubernetes    `json:"kubernetes"`
+	General    General        `json:"general"`
+	Service    WMSService     `json:"service"`
+	Options    *WMSWFSOptions `json:"options,omitempty"`
+	Kubernetes Kubernetes     `json:"kubernetes"`
 }
 
 // WMSService is the struct for all service level fields

api/v2beta1/zz_generated.deepcopy.go

@@ -78,7 +78,7 @@ type WFSSpec struct {
 	PodSpecPatch                 *corev1.PodSpec               `json:"podSpecPatch,omitempty"`
 	HorizontalPodAutoscalerPatch *HorizontalPodAutoscalerPatch `json:"horizontalPodAutoscalerPatch,omitempty"`
 	// TODO omitting the options field or setting an empty value results in incorrect defaulting of the options
-	Options Options `json:"options"`
+	Options *Options `json:"options,omitempty"`
 
 	// service configuration
 	Service WFSService `json:"service"`
@@ -242,7 +242,11 @@ func (wfs *WFS) HorizontalPodAutoscalerPatch() *HorizontalPodAutoscalerPatch {
 }
 
 func (wfs *WFS) Options() Options {
-	return wfs.Spec.Options
+	if wfs.Spec.Options == nil {
+		return *GetDefaultOptions()
+	}
+
+	return *wfs.Spec.Options
 }
 
 func (wfs *WFS) ID() string {

api/v3/wfs_types.go

@@ -61,7 +61,7 @@ type WMSSpec struct {
 
 	// Optional options for the configuration of the service.
 	// TODO omitting the options field or setting an empty value results in incorrect defaulting of the options
-	Options Options `json:"options"`
+	Options *Options `json:"options,omitempty"`
 
 	// Service specification
 	Service WMSService `json:"service"`
@@ -569,7 +569,11 @@ func (wms *WMS) HorizontalPodAutoscalerPatch() *HorizontalPodAutoscalerPatch {
 }
 
 func (wms *WMS) Options() Options {
-	return wms.Spec.Options
+	if wms.Spec.Options == nil {
+		return *GetDefaultOptions()
+	}
+
+	return *wms.Spec.Options
 }
 
 func (wms *WMS) ID() string {

api/v3/wms_types.go

@@ -79,8 +79,8 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 		}
 	}
 
-	var rewriteGroupToDataLayers = wms.Spec.Options.RewriteGroupToDataLayers
-	var validateChildStyleNameEqual = wms.Spec.Options.ValidateChildStyleNameEqual
+	var rewriteGroupToDataLayers = wms.Options().RewriteGroupToDataLayers
+	var validateChildStyleNameEqual = wms.Options().ValidateChildStyleNameEqual
 
 	equalChildStyleNames := map[string][]string{}
 	if rewriteGroupToDataLayers && validateChildStyleNameEqual {

api/v3/wms_validation.go

@@ -1541,7 +1541,6 @@ spec:
                 - url
                 type: object
             required:
-            - options
             - service
             type: object
           status:

api/v3/zz_generated.deepcopy.go

@@ -397,7 +397,6 @@ spec:
               required:
                 - general
                 - kubernetes
-                - options
                 - service
               type: object
             status:
@@ -2097,7 +2096,6 @@ spec:
                     - url
                   type: object
               required:
-                - options
                 - service
               type: object
             status: