fix(#3): treat country 'no' as string not boolean

eurofurence · Jan 21, 2024 · 1f7078b · 1f7078b
1 parent 688ffb9
commit 1f7078b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/charts/eurofurence-registration-system/Chart.yaml b/charts/eurofurence-registration-system/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: eurofurence-registration-system
-version: 0.0.20
+version: 0.0.21
 description: A helm chart that can deploy the Eurofurence Registration System.
 type: application
 home: https://github.com/eurofurence/reg-helm-chart
diff --git a/charts/eurofurence-registration-system/templates/configmap.yaml b/charts/eurofurence-registration-system/templates/configmap.yaml
@@ -147,19 +147,19 @@ data:
     spoken_languages:
 {{- range .Values.choices.spoken_languages }}
 {{-   range $key, $value := . }}
-      - {{ $key }}
+      - '{{ $key }}'
 {{-   end }}
 {{- end }}
     registration_languages:
 {{- range .Values.system.registration_languages }}
 {{-   range $key, $value := . }}
-      - {{ $key }}
+      - '{{ $key }}'
 {{-   end }}
 {{- end }}
     countries:
 {{- range .Values.choices.countries }}
 {{-   range $key, $value := . }}
-      - {{ $key }}
+      - '{{ $key }}'
 {{-   end }}
 {{- end }}
 

diff --git a/charts/eurofurence-registration-system/tests/configmap_test.yaml b/charts/eurofurence-registration-system/tests/configmap_test.yaml
@@ -106,11 +106,13 @@ tests:
           - 'XS':
               'en-US': 'XS (Regular Cut)'
         spoken_languages:
-          - de:
+          - 'de':
               en-US: German
-          - la:
+          - 'la':
               en-US: Latin
               de-DE: Latein
+          - 'no': # quotes important! otherwise this is false, no the string 'no'
+              en-US: Norwegian
         countries:
           - 'US':
               'en-US': 'United States of America'
@@ -204,6 +206,8 @@ tests:
               - la:
                   de-DE: Latein
                   en-US: Latin
+              - "no":
+                  en-US: Norwegian
             countries:
               - US:
                   en-US: United States of America
@@ -308,12 +312,13 @@ tests:
             tshirtsizes:
               - XS
             spoken_languages:
-              - de
-              - la
+              - 'de'
+              - 'la'
+              - 'no'
             registration_languages:
-              - en-US
+              - 'en-US'
             countries:
-              - US
+              - 'US'
       - equal:
           path: data.auth-service-config
           value: |

diff --git a/charts/eurofurence-registration-system/values-example.yaml b/charts/eurofurence-registration-system/values-example.yaml
@@ -599,7 +599,7 @@ choices:
         en-US: Maltese
     - my:
         en-US: Burmese
-    - no:
+    - 'no':
         en-US: Norwegian
     - nb:
         en-US: Norwegian (bokmal)