From 8c9b47bfe0c694465007a1ae26f1cb1d66bef60e Mon Sep 17 00:00:00 2001 From: Richard Kettelerij Date: Wed, 27 May 2026 12:11:09 +0200 Subject: [PATCH] chore: bump to GoKoala v1.9.3 --- cmd/main.go | 2 +- config/crd/bases/pdok.nl_ogcapis.yaml | 34 ++++++++++++++++++++------- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 211de72..b82cdb7 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -53,7 +53,7 @@ import ( ) const ( - defaultGokoalaImage = "docker.io/pdok/gokoala:1.9.0" + defaultGokoalaImage = "docker.io/pdok/gokoala:1.9.3" ) var ( diff --git a/config/crd/bases/pdok.nl_ogcapis.yaml b/config/crd/bases/pdok.nl_ogcapis.yaml index adb3deb..97aebd1 100644 --- a/config/crd/bases/pdok.nl_ogcapis.yaml +++ b/config/crd/bases/pdok.nl_ogcapis.yaml @@ -1868,12 +1868,15 @@ spec: type: array type: object filters: - description: Filters available for this collection + description: |- + Filters available for this collection, both simple equality filters + (OAF part 1) and advanced CQL filters (OAF part 3) are supported. properties: cql: description: |- OAF Part 3: enhanced filtering capabilities expressed using "Common Query Language" (CQL2) - https://docs.ogc.org/is/19-079r2/19-079r2.html + https://docs.ogc.org/is/19-079r2/19-079r2.html. To be used in conjunction with the properties/queryables + listed above. properties: enable: default: false @@ -1941,9 +1944,16 @@ spec: type: object properties: description: |- - OAF Part 1: filter on feature properties - https://docs.ogc.org/is/17-069r4/17-069r4.html#_parameters_for_filtering_on_feature_properties + List of properties in each feature that can be used for filtering. These properties + are also known as "queryables" since they can be used in a filter to query the API. + + Each property will be available as a simple property filter (OAF Part 1, + see https://docs.ogc.org/is/17-069r4/17-069r4.html#_parameters_for_filtering_on_feature_properties) + but can also be used in advanced CQL filters (OAF part 3. The latter requires CQL to be enabled. items: + description: |- + Queryable a "queryable" represents a property/field of a datasource that can + be used in a filter (part 1 filter or part 3 CQL filter). properties: allowedValues: description: Static list of allowed values @@ -1957,22 +1967,28 @@ spec: default: false description: |- Derive a list of allowed values for this property filter from the corresponding column in the datastore. - Use with caution since it can increase startup time when used on large tables. Make sure an index in present. + Use with caution since it can increase startup time when used on large tables. Make sure an index is present. + + The allowed values will be enforced though the OpenAPI spec. So be aware that the user will receive an + error (not an empty result set) when an invalid value is provided. type: boolean description: default: Filter features by this property - description: Explains this property filter + description: |- + Explains this property. When a description for this field already exists in the + schema of the datasource, that one takes precedence. type: string indexRequired: default: true description: |- - When true the property/column in the feature table needs to be indexed. Initialization will fail - when no index is present, when false the index check is skipped. For large tables an index is recommended! + When true, the property/column in the feature table needs to be indexed. Initialization will fail + when no index is present. When false, the index check is skipped. For large tables an index is recommended. + On the other hand, avoid indexing (almost) every column in a table since that defeats the purpose of an index! type: boolean name: description: Needs to match with a column name in the feature table (in the configured - datasource) + datasource). type: string required: - name diff --git a/go.mod b/go.mod index 4b2d870..43f7199 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/PDOK/ogcapi-operator go 1.26.3 require ( - github.com/PDOK/gokoala v1.9.0 + github.com/PDOK/gokoala v1.9.3 github.com/google/go-cmp v0.7.0 github.com/onsi/ginkgo/v2 v2.27.2 github.com/onsi/gomega v1.38.2 diff --git a/go.sum b/go.sum index 0c74a38..c81f81a 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= -github.com/PDOK/gokoala v1.9.0 h1:pMsGz8U7UZmua6bwTTSX7TsnBTdx2Dapv7rXaWjkxNw= -github.com/PDOK/gokoala v1.9.0/go.mod h1:OSZGSQvpemZmGIof23Qq0blPP5XuX8tD3lCINuZpxL4= +github.com/PDOK/gokoala v1.9.3 h1:U+P1zGeQi0Yf3r79b0/MYV/0eFoj9eHfYMOHaBlvyfg= +github.com/PDOK/gokoala v1.9.3/go.mod h1:OSZGSQvpemZmGIof23Qq0blPP5XuX8tD3lCINuZpxL4= github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY= github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=