Skip to content

Commit f21b003

Browse files
ShalucikShalucik
authored
Merge pull request #58 from PDOK/wr/refactor
split shared-controller plus fix imports
2 parents 1134cdb + 4f54c48 commit f21b003

22 files changed

+1239
-1151
lines changed

‎api/v3/wms_types_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/google/go-cmp/cmp"
88
"github.com/pdok/smooth-operator/model"
9-
controller "github.com/pdok/smooth-operator/pkg/util"
9+
smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
1010
)
1111

1212
func TestLayer_setInheritedBoundingBoxes(t *testing.T) {
@@ -60,19 +60,19 @@ func TestLayer_setInheritedBoundingBoxes(t *testing.T) {
6060
{
6161
name: "setInheritedBoundingBoxes for layer",
6262
layer: Layer{
63-
Name: controller.Pointer("toplayer"),
63+
Name: smoothoperatorutils.Pointer("toplayer"),
6464
BoundingBoxes: []WMSBoundingBox{first28992BoundingBox},
6565
Layers: []Layer{
6666
{
67-
Name: controller.Pointer("grouplayer-1"),
67+
Name: smoothoperatorutils.Pointer("grouplayer-1"),
6868
BoundingBoxes: []WMSBoundingBox{first4326BoundingBox},
6969
Layers: []Layer{
7070
{
71-
Name: controller.Pointer("datalayer-1"),
71+
Name: smoothoperatorutils.Pointer("datalayer-1"),
7272
BoundingBoxes: []WMSBoundingBox{first4258BoundingBox},
7373
},
7474
{
75-
Name: controller.Pointer("datalayer-2"),
75+
Name: smoothoperatorutils.Pointer("datalayer-2"),
7676
BoundingBoxes: []WMSBoundingBox{second28992BoundingBox},
7777
},
7878
},
@@ -129,9 +129,9 @@ func TestLayer_setInheritedBoundingBoxes(t *testing.T) {
129129
}
130130

131131
func TestLayer_GetParent(t *testing.T) {
132-
childLayer2 := Layer{Name: controller.Pointer("childlayer-2")}
133-
childLayer1 := Layer{Name: controller.Pointer("childlayer-1"), Layers: []Layer{childLayer2}}
134-
topLayer := Layer{Name: controller.Pointer("toplayer"), Layers: []Layer{childLayer1}}
132+
childLayer2 := Layer{Name: smoothoperatorutils.Pointer("childlayer-2")}
133+
childLayer1 := Layer{Name: smoothoperatorutils.Pointer("childlayer-1"), Layers: []Layer{childLayer2}}
134+
topLayer := Layer{Name: smoothoperatorutils.Pointer("toplayer"), Layers: []Layer{childLayer1}}
135135

136136
type args struct {
137137
service WMSService

‎api/v3/wms_validation_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"reflect"
55
"testing"
66

7-
controller "github.com/pdok/smooth-operator/pkg/util"
7+
smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
88
)
99

1010
func Test_getEqualChildStyleNames(t *testing.T) {
@@ -21,21 +21,21 @@ func Test_getEqualChildStyleNames(t *testing.T) {
2121
name: "Test equal style names",
2222
args: args{
2323
layer: &Layer{
24-
Name: controller.Pointer("toplayer"),
24+
Name: smoothoperatorutils.Pointer("toplayer"),
2525
Styles: []Style{
2626
{Name: "stylename-1"},
2727
{Name: "stylename-2"},
2828
},
2929
Layers: []Layer{
3030
{
31-
Name: controller.Pointer("childlayer-1"),
31+
Name: smoothoperatorutils.Pointer("childlayer-1"),
3232
Styles: []Style{
3333
{Name: "stylename-2"},
3434
{Name: "stylename-3"},
3535
},
3636
Layers: []Layer{
3737
{
38-
Name: controller.Pointer("childlayer-2"),
38+
Name: smoothoperatorutils.Pointer("childlayer-2"),
3939
Styles: []Style{
4040
{Name: "stylename-3"},
4141
{Name: "stylename-4"},
@@ -56,21 +56,21 @@ func Test_getEqualChildStyleNames(t *testing.T) {
5656
name: "Test no equal style names",
5757
args: args{
5858
layer: &Layer{
59-
Name: controller.Pointer("toplayer"),
59+
Name: smoothoperatorutils.Pointer("toplayer"),
6060
Styles: []Style{
6161
{Name: "stylename-1"},
6262
{Name: "stylename-2"},
6363
},
6464
Layers: []Layer{
6565
{
66-
Name: controller.Pointer("childlayer-1"),
66+
Name: smoothoperatorutils.Pointer("childlayer-1"),
6767
Styles: []Style{
6868
{Name: "stylename-3"},
6969
{Name: "stylename-4"},
7070
},
7171
Layers: []Layer{
7272
{
73-
Name: controller.Pointer("childlayer-2"),
73+
Name: smoothoperatorutils.Pointer("childlayer-2"),
7474
Styles: []Style{
7575
{Name: "stylename-5"},
7676
{Name: "stylename-6"},

‎cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3030

3131
"github.com/pdok/mapserver-operator/internal/controller/mapfilegenerator"
32-
smoothoperator "github.com/pdok/smooth-operator/api/v1"
32+
smoothoperatorv1 "github.com/pdok/smooth-operator/api/v1"
3333
traefikiov1alpha1 "github.com/traefik/traefik/v3/pkg/provider/kubernetes/crd/traefikio/v1alpha1"
3434

3535
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -72,7 +72,7 @@ var (
7272
func init() {
7373
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
7474
utilruntime.Must(traefikiov1alpha1.AddToScheme(scheme))
75-
utilruntime.Must(smoothoperator.AddToScheme(scheme))
75+
utilruntime.Must(smoothoperatorv1.AddToScheme(scheme))
7676
utilruntime.Must(pdoknlv3.AddToScheme(scheme))
7777
utilruntime.Must(pdoknlv2beta1.AddToScheme(scheme))
7878
// +kubebuilder:scaffold:scheme

‎internal/controller/blobdownload/blob_download_test.go‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66

77
"github.com/google/go-cmp/cmp"
88

9-
v3 "github.com/pdok/mapserver-operator/api/v3"
9+
pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
1010
smoothoperatorutils "github.com/pdok/smooth-operator/pkg/util"
1111
)
1212

@@ -68,7 +68,7 @@ chown -R 999:999 /var/www/legend
6868

6969
func TestGetArgsForWFS(t *testing.T) {
7070
type args struct {
71-
WFS *v3.WFS
71+
WFS *pdoknlv3.WFS
7272
}
7373
tests := []struct {
7474
name string
@@ -79,12 +79,12 @@ func TestGetArgsForWFS(t *testing.T) {
7979
{
8080
name: "GetArgs for WFS with prefetchData",
8181
args: args{
82-
WFS: &v3.WFS{
83-
Spec: v3.WFSSpec{
84-
Service: v3.WFSService{
82+
WFS: &pdoknlv3.WFS{
83+
Spec: pdoknlv3.WFSSpec{
84+
Service: pdoknlv3.WFSService{
8585
Title: "wfs-prefetch-service-title",
8686
},
87-
Options: &v3.Options{
87+
Options: &pdoknlv3.Options{
8888
PrefetchData: true,
8989
},
9090
},
@@ -96,12 +96,12 @@ func TestGetArgsForWFS(t *testing.T) {
9696
{
9797
name: "GetArgs for WFS without prefetchData",
9898
args: args{
99-
WFS: &v3.WFS{
100-
Spec: v3.WFSSpec{
101-
Service: v3.WFSService{
99+
WFS: &pdoknlv3.WFS{
100+
Spec: pdoknlv3.WFSSpec{
101+
Service: pdoknlv3.WFSService{
102102
Title: "wfs-noprefetch-service-title",
103103
},
104-
Options: &v3.Options{
104+
Options: &pdoknlv3.Options{
105105
PrefetchData: false,
106106
},
107107
},
@@ -131,7 +131,7 @@ func TestGetArgsForWFS(t *testing.T) {
131131

132132
func TestGetArgsForWMS(t *testing.T) {
133133
type args struct {
134-
WMS v3.WMS
134+
WMS pdoknlv3.WMS
135135
}
136136
tests := []struct {
137137
name string
@@ -142,63 +142,63 @@ func TestGetArgsForWMS(t *testing.T) {
142142
{
143143
name: "GetArgs for WMS GeoPackage layer",
144144
args: args{
145-
WMS: v3.WMS{
146-
Spec: v3.WMSSpec{
147-
Service: v3.WMSService{
145+
WMS: pdoknlv3.WMS{
146+
Spec: pdoknlv3.WMSSpec{
147+
Service: pdoknlv3.WMSService{
148148
Title: "wms-gpkg-service-title",
149-
Layer: v3.Layer{
149+
Layer: pdoknlv3.Layer{
150150
Name: smoothoperatorutils.Pointer("wms-gpkg-layer-name"),
151151
Title: smoothoperatorutils.Pointer("wms-gpkg-layer-title"),
152-
Styles: []v3.Style{
152+
Styles: []pdoknlv3.Style{
153153
{
154-
Legend: &v3.Legend{
154+
Legend: &pdoknlv3.Legend{
155155
BlobKey: "key/gpkg-layer-legend.png",
156156
},
157157
},
158158
},
159-
Layers: []v3.Layer{
159+
Layers: []pdoknlv3.Layer{
160160
{
161161
Name: smoothoperatorutils.Pointer("wms-gpkg-layer-1-name"),
162162
Title: smoothoperatorutils.Pointer("wms-gpkg-layer-1-title"),
163-
Styles: []v3.Style{
163+
Styles: []pdoknlv3.Style{
164164
{
165165
Name: "wms-gpkg-style-1-name",
166166
Title: smoothoperatorutils.Pointer("wms-gpkg-style-1-title"),
167-
Legend: &v3.Legend{
167+
Legend: &pdoknlv3.Legend{
168168
Width: 50,
169169
Height: 50,
170170
Format: "png",
171171
BlobKey: "resources-bucket/key/gpkg-layer-1-legend.png",
172172
},
173173
},
174174
},
175-
Data: &v3.Data{
176-
Gpkg: &v3.Gpkg{
175+
Data: &pdoknlv3.Data{
176+
Gpkg: &pdoknlv3.Gpkg{
177177
BlobKey: "geopackages-bucket/key/gpkg-layer-1-data.gpkg",
178178
},
179179
},
180180
},
181181
{
182182
Name: smoothoperatorutils.Pointer("wms-gpkg-layer-2-name"),
183183
Title: smoothoperatorutils.Pointer("wms-gpkg-layer-2-title"),
184-
Styles: []v3.Style{
184+
Styles: []pdoknlv3.Style{
185185
{
186186
Name: "wms-gpkg-style-2-name",
187187
Title: smoothoperatorutils.Pointer("wms-gpkg-style-2-title"),
188-
Legend: &v3.Legend{
188+
Legend: &pdoknlv3.Legend{
189189
BlobKey: "resources-bucket/key/gpkg-layer-2-legend.png",
190190
},
191191
},
192192
},
193-
Data: &v3.Data{
194-
Gpkg: &v3.Gpkg{
193+
Data: &pdoknlv3.Data{
194+
Gpkg: &pdoknlv3.Gpkg{
195195
BlobKey: "geopackages-bucket/key/gpkg-layer-2-data.gpkg",
196196
},
197197
},
198198
},
199199
},
200200
},
201-
StylingAssets: &v3.StylingAssets{
201+
StylingAssets: &pdoknlv3.StylingAssets{
202202
BlobKeys: []string{
203203
"resources-bucket/key/gpkg-symbol.png",
204204
"resources-bucket/key/symbol.svg",
@@ -207,7 +207,7 @@ func TestGetArgsForWMS(t *testing.T) {
207207
},
208208
},
209209
},
210-
Options: &v3.Options{
210+
Options: &pdoknlv3.Options{
211211
PrefetchData: true,
212212
},
213213
},
@@ -219,53 +219,53 @@ func TestGetArgsForWMS(t *testing.T) {
219219
{
220220
name: "GetArgs for WMS TIF layer",
221221
args: args{
222-
WMS: v3.WMS{
223-
Spec: v3.WMSSpec{
224-
Service: v3.WMSService{
222+
WMS: pdoknlv3.WMS{
223+
Spec: pdoknlv3.WMSSpec{
224+
Service: pdoknlv3.WMSService{
225225
Title: "wms-tif-service-title",
226-
Layer: v3.Layer{
226+
Layer: pdoknlv3.Layer{
227227
Name: smoothoperatorutils.Pointer("wms-tif-layer-name"),
228228
Title: smoothoperatorutils.Pointer("wms-tif-layer-title"),
229-
Layers: []v3.Layer{
229+
Layers: []pdoknlv3.Layer{
230230
{
231231
Name: smoothoperatorutils.Pointer("wms-tif-layer-1-name"),
232232
Title: smoothoperatorutils.Pointer("wms-tif-layer-1-title"),
233-
Styles: []v3.Style{
233+
Styles: []pdoknlv3.Style{
234234
{
235235
Name: "wms-tif-style-1-name",
236236
Title: smoothoperatorutils.Pointer("wms-tif-style-1-title"),
237-
Legend: &v3.Legend{
237+
Legend: &pdoknlv3.Legend{
238238
BlobKey: "resources-bucket/key/tif-layer-1-legend.png",
239239
},
240240
},
241241
},
242-
Data: &v3.Data{
243-
TIF: &v3.TIF{
242+
Data: &pdoknlv3.Data{
243+
TIF: &pdoknlv3.TIF{
244244
BlobKey: "tifs-bucket/key/tif-layer-1-data.tif",
245245
},
246246
},
247247
},
248248
{
249249
Name: smoothoperatorutils.Pointer("wms-tif-layer-2-name"),
250250
Title: smoothoperatorutils.Pointer("wms-tif-layer-2-title"),
251-
Styles: []v3.Style{
251+
Styles: []pdoknlv3.Style{
252252
{
253253
Name: "wms-tif-style-2-name",
254254
Title: smoothoperatorutils.Pointer("wms-tif-style-2-title"),
255-
Legend: &v3.Legend{
255+
Legend: &pdoknlv3.Legend{
256256
BlobKey: "resources-bucket/key/tif-layer-2-legend.png",
257257
},
258258
},
259259
},
260-
Data: &v3.Data{
261-
TIF: &v3.TIF{
260+
Data: &pdoknlv3.Data{
261+
TIF: &pdoknlv3.TIF{
262262
BlobKey: "tifs-bucket/key/tif-layer-2-data.tif",
263263
},
264264
},
265265
},
266266
},
267267
},
268-
StylingAssets: &v3.StylingAssets{
268+
StylingAssets: &pdoknlv3.StylingAssets{
269269
BlobKeys: []string{
270270
"resources-bucket/key/tif-symbol.png",
271271
"resources-bucket/key/symbol.svg",
@@ -274,7 +274,7 @@ func TestGetArgsForWMS(t *testing.T) {
274274
},
275275
},
276276
},
277-
Options: &v3.Options{
277+
Options: &pdoknlv3.Options{
278278
PrefetchData: true,
279279
},
280280
},

0 commit comments

Comments
 (0)