Skip to content

Commit 0125509

Browse files
author
Jelle Dijkstra
committed
Requested changes
1 parent 237b5a8 commit 0125509

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎api/v2beta1/shared_conversion.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func PointerVal[T interface{}](val *T, def T) T {
2020
return *val
2121
}
2222

23-
func ConverseOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
23+
func ConvertOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
2424
return &pdoknlv3.Options{
2525
AutomaticCasing: src.AutomaticCasing,
2626
IncludeIngress: src.IncludeIngress,
@@ -32,7 +32,7 @@ func ConverseOptionsV2ToV3(src WMSWFSOptions) *pdoknlv3.Options {
3232
}
3333
}
3434

35-
func ConverseOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
35+
func ConvertOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
3636
return WMSWFSOptions{
3737
AutomaticCasing: src.AutomaticCasing,
3838
PrefetchData: src.PrefetchData,
@@ -44,7 +44,7 @@ func ConverseOptionsV3ToV2(src *pdoknlv3.Options) WMSWFSOptions {
4444
}
4545
}
4646

47-
func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerSpec {
47+
func ConvertAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscalerSpec {
4848
var minReplicas *int32
4949
if src.MinReplicas != nil {
5050
minReplicas = Pointer(int32(*src.MinReplicas))
@@ -76,7 +76,7 @@ func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscaler
7676
}
7777
}
7878

79-
func ConverseResources(src corev1.ResourceRequirements) *corev1.PodSpec {
79+
func ConvertResources(src corev1.ResourceRequirements) *corev1.PodSpec {
8080
return &corev1.PodSpec{
8181
Containers: []corev1.Container{
8282
{
@@ -86,7 +86,7 @@ func ConverseResources(src corev1.ResourceRequirements) *corev1.PodSpec {
8686
}
8787
}
8888

89-
func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Column {
89+
func ConvertColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases map[string]string) []pdoknlv3.Column {
9090
v3Columns := make([]pdoknlv3.Column, 0)
9191
for _, column := range columns {
9292
col := pdoknlv3.Column{
@@ -104,7 +104,7 @@ func ConverseColumnAndAliasesV2ToColumnsWithAliasV3(columns []string, aliases ma
104104
return v3Columns
105105
}
106106

107-
func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column) ([]string, map[string]string) {
107+
func ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column) ([]string, map[string]string) {
108108
v2Columns := make([]string, 0)
109109
v2Aliases := make(map[string]string)
110110

@@ -119,15 +119,15 @@ func ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(columns []pdoknlv3.Column)
119119
return v2Columns, v2Aliases
120120
}
121121

122-
func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
122+
func ConvertV2DataToV3(v2 Data) pdoknlv3.Data {
123123
v3 := pdoknlv3.Data{}
124124

125125
if v2.GPKG != nil {
126126
v3.Gpkg = &pdoknlv3.Gpkg{
127127
BlobKey: v2.GPKG.BlobKey,
128128
TableName: v2.GPKG.Table,
129129
GeometryType: v2.GPKG.GeometryType,
130-
Columns: ConverseColumnAndAliasesV2ToColumnsWithAliasV3(
130+
Columns: ConvertColumnAndAliasesV2ToColumnsWithAliasV3(
131131
v2.GPKG.Columns,
132132
v2.GPKG.Aliases,
133133
),
@@ -138,7 +138,7 @@ func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
138138
v3.Postgis = &pdoknlv3.Postgis{
139139
TableName: v2.Postgis.Table,
140140
GeometryType: v2.Postgis.GeometryType,
141-
Columns: ConverseColumnAndAliasesV2ToColumnsWithAliasV3(
141+
Columns: ConvertColumnAndAliasesV2ToColumnsWithAliasV3(
142142
v2.Postgis.Columns,
143143
v2.Postgis.Aliases,
144144
),
@@ -157,11 +157,11 @@ func ConverseV2DataToV3(v2 Data) pdoknlv3.Data {
157157
return v3
158158
}
159159

160-
func ConverseV3DataToV2(v3 pdoknlv3.Data) Data {
160+
func ConvertV3DataToV2(v3 pdoknlv3.Data) Data {
161161
v2 := Data{}
162162

163163
if v3.Gpkg != nil {
164-
columns, aliases := ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Gpkg.Columns)
164+
columns, aliases := ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Gpkg.Columns)
165165
v2.GPKG = &GPKG{
166166
BlobKey: v3.Gpkg.BlobKey,
167167
Table: v3.Gpkg.TableName,
@@ -172,7 +172,7 @@ func ConverseV3DataToV2(v3 pdoknlv3.Data) Data {
172172
}
173173

174174
if v3.Postgis != nil {
175-
columns, aliases := ConverseColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Postgis.Columns)
175+
columns, aliases := ConvertColumnsWithAliasV3ToColumnsAndAliasesV2(v3.Postgis.Columns)
176176
v2.Postgis = &Postgis{
177177
Table: v3.Postgis.TableName,
178178
GeometryType: v3.Postgis.GeometryType,

‎api/v2beta1/wfs_conversion.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
4949
}
5050

5151
if src.Spec.Kubernetes.Autoscaling != nil {
52-
dst.Spec.HorizontalPodAutoscalerPatch = ConverseAutoscaling(*src.Spec.Kubernetes.Autoscaling)
52+
dst.Spec.HorizontalPodAutoscalerPatch = ConvertAutoscaling(*src.Spec.Kubernetes.Autoscaling)
5353
}
5454

5555
// TODO converse src.Spec.Kubernetes.HealthCheck when we know what the implementation in v3 will be
5656
if src.Spec.Kubernetes.Resources != nil {
57-
dst.Spec.PodSpecPatch = ConverseResources(*src.Spec.Kubernetes.Resources)
57+
dst.Spec.PodSpecPatch = ConvertResources(*src.Spec.Kubernetes.Resources)
5858
}
5959

60-
dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
60+
dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
6161

6262
service := pdoknlv3.WFSService{
6363
Prefix: "",
@@ -137,7 +137,7 @@ func convertV2FeatureTypeToV3(src FeatureType) pdoknlv3.FeatureType {
137137
}
138138
}
139139

140-
featureTypeV3.Data = ConverseV2DataToV3(src.Data)
140+
featureTypeV3.Data = ConvertV2DataToV3(src.Data)
141141

142142
return featureTypeV3
143143
}
@@ -157,7 +157,7 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
157157
dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
158158

159159
if src.Spec.Options != nil {
160-
dst.Spec.Options = ConverseOptionsV3ToV2(src.Spec.Options)
160+
dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
161161
}
162162

163163
service := WFSService{
@@ -201,7 +201,7 @@ func (dst *WFS) ConvertFrom(srcRaw conversion.Hub) error {
201201
Keywords: featureType.Keywords,
202202
DatasetMetadataIdentifier: featureType.DatasetMetadataURL.CSW.MetadataIdentifier,
203203
SourceMetadataIdentifier: "",
204-
Data: ConverseV3DataToV2(featureType.Data),
204+
Data: ConvertV3DataToV2(featureType.Data),
205205
}
206206

207207
if src.Spec.Service.Inspire != nil {

‎api/v2beta1/wms_conversion.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
5454
}
5555

5656
if src.Spec.Kubernetes.Autoscaling != nil {
57-
dst.Spec.HorizontalPodAutoscalerPatch = ConverseAutoscaling(*src.Spec.Kubernetes.Autoscaling)
57+
dst.Spec.HorizontalPodAutoscalerPatch = ConvertAutoscaling(*src.Spec.Kubernetes.Autoscaling)
5858
}
5959

6060
// TODO converse src.Spec.Kubernetes.HealthCheck when we know what the implementation in v3 will be
6161
if src.Spec.Kubernetes.Resources != nil {
62-
dst.Spec.PodSpecPatch = ConverseResources(*src.Spec.Kubernetes.Resources)
62+
dst.Spec.PodSpecPatch = ConvertResources(*src.Spec.Kubernetes.Resources)
6363
}
6464

65-
dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
65+
dst.Spec.Options = ConvertOptionsV2ToV3(src.Spec.Options)
6666

6767
service := pdoknlv3.WMSService{
6868
URL: CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
@@ -144,7 +144,7 @@ func (dst *WMS) ConvertFrom(srcRaw conversion.Hub) error {
144144
dst.Spec.Kubernetes = NewV2KubernetesObject(src.Spec.Lifecycle, src.Spec.PodSpecPatch, src.Spec.HorizontalPodAutoscalerPatch)
145145

146146
if src.Spec.Options != nil {
147-
dst.Spec.Options = ConverseOptionsV3ToV2(src.Spec.Options)
147+
dst.Spec.Options = ConvertOptionsV3ToV2(src.Spec.Options)
148148
}
149149

150150
service := WMSService{
@@ -372,7 +372,7 @@ func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
372372
}
373373

374374
if v2Layer.Data != nil {
375-
layer.Data = Pointer(ConverseV2DataToV3(*v2Layer.Data))
375+
layer.Data = Pointer(ConvertV2DataToV3(*v2Layer.Data))
376376
} else {
377377
childLayersV2, err := v2Service.GetChildLayers(v2Layer)
378378
if err != nil {
@@ -463,7 +463,7 @@ func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, servic
463463
}
464464

465465
if v3Layer.Data != nil {
466-
v2Layer.Data = Pointer(ConverseV3DataToV2(*v3Layer.Data))
466+
v2Layer.Data = Pointer(ConvertV3DataToV2(*v3Layer.Data))
467467
}
468468

469469
layers = append(layers, v2Layer)

‎api/v3/shared_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func GetHost() string {
109109
return host
110110
}
111111

112-
func GetBaseURLPath[T *WFS | *WMS](o T) string {
112+
func GetBaseURLPath[T WMSWFS](o T) string {
113113
var serviceURL string
114114
switch any(o).(type) {
115115
case *WFS:

‎cmd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import (
4848
const (
4949
defaultMultitoolImage = "docker.io/pdok/docker-multitool:0.9.1"
5050
defaultMapfileGeneratorImage = "docker.io/pdok/mapfile-generator:1.9.3"
51-
defaultCapabilitiesGeneratorImage = "acrpdokprodman.azurecr.io/pdok/ogc-capabilities-generator:0.2.7"
51+
defaultCapabilitiesGeneratorImage = "docker.io/pdok/ogc-capabilities-generator:1.0.0-beta5"
5252
)
5353

5454
var (

0 commit comments

Comments
 (0)