fix: Add queryables file name check (#380)

Author: emmanuelmathot

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed Helm template to check queryables `file` field with schema validation [#380](https://github.com/developmentseed/eoapi-k8s/pull/380)
+
 ## [0.8.1]
 
 ### Added

charts/eoapi/templates/database/pgstacbootstrap/configmap.yaml

@@ -50,7 +50,7 @@ data:
 {{- if .Values.pgstacBootstrap.settings.queryables }}
 {{- $hasFileBasedQueryables := false }}
 {{- range $config := .Values.pgstacBootstrap.settings.queryables }}
-  {{- if $config.file }}
+  {{- if and $config.file (typeIs "string" $config.file) }}
     {{- $hasFileBasedQueryables = true }}
   {{- end }}
 {{- end }}
@@ -65,7 +65,7 @@ metadata:
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   {{- range $config := .Values.pgstacBootstrap.settings.queryables }}
-  {{- if $config.file }}
+  {{- if and $config.file (typeIs "string" $config.file) }}
   {{ $config.name }}: |
     {{- $.Files.Get $config.file | nindent 4 }}
   {{- end }}

charts/eoapi/templates/database/pgstacbootstrap/job.yaml

@@ -221,7 +221,7 @@ spec:
             {{- toYaml .Values.pgstacBootstrap.settings.resources | nindent 12 }}
           volumeMounts:
             {{- range $idx, $config := .Values.pgstacBootstrap.settings.queryables }}
-            {{- if $config.file }}
+            {{- if and $config.file (typeIs "string" $config.file) }}
             - mountPath: /opt/queryables/{{ $config.name }}
               name: {{ $.Release.Name }}-queryables-volume
               subPath: {{ $config.name }}
@@ -236,7 +236,7 @@ spec:
       volumes:
         {{- $hasFileBasedQueryables := false }}
         {{- range $config := .Values.pgstacBootstrap.settings.queryables }}
-          {{- if $config.file }}
+          {{- if and $config.file (typeIs "string" $config.file) }}
             {{- $hasFileBasedQueryables = true }}
           {{- end }}
         {{- end }}

charts/eoapi/values.schema.json

@@ -334,6 +334,71 @@
                   "description": "Cron schedule for updating collection extents"
                 }
               }
+            },
+            "queryables": {
+              "type": "array",
+              "description": "List of queryables configurations to load using pypgstac load-queryables",
+              "items": {
+                "type": "object",
+                "required": ["name"],
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Name of the queryables configuration file"
+                  },
+                  "file": {
+                    "type": "string",
+                    "description": "Path to the queryables file relative to the chart directory"
+                  },
+                  "configMapRef": {
+                    "type": "object",
+                    "description": "Reference to an external ConfigMap containing queryables data",
+                    "properties": {
+                      "name": {
+                        "type": "string",
+                        "description": "Name of the ConfigMap"
+                      },
+                      "key": {
+                        "type": "string",
+                        "description": "Key within the ConfigMap containing the queryables data"
+                      }
+                    },
+                    "required": ["name", "key"]
+                  },
+                  "indexFields": {
+                    "type": "array",
+                    "description": "List of fields to create database indexes for",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "deleteMissing": {
+                    "type": "boolean",
+                    "description": "Whether to delete queryables not present in this configuration"
+                  },
+                  "collections": {
+                    "type": "array",
+                    "description": "List of collection IDs to apply these queryables to",
+                    "items": {
+                      "type": "string"
+                    }
+                  }
+                },
+                "oneOf": [
+                  {
+                    "required": ["file"],
+                    "not": {
+                      "required": ["configMapRef"]
+                    }
+                  },
+                  {
+                    "required": ["configMapRef"],
+                    "not": {
+                      "required": ["file"]
+                    }
+                  }
+                ]
+              }
             }
           }
         }