feat: don't use nonchars in variable name (#115)

chanzuckerberg · Sep 17, 2024 · ac47ece · ac47ece
1 parent cd2c559
commit ac47ece
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/stack/templates/_helpers.tpl b/stack/templates/_helpers.tpl
@@ -186,14 +186,10 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ join "." (list (include "oidcProxy.name" .) (include "clusterBaseDomain" .)) }}
 {{- end -}}
 
-{{- define "oidcProxy.skipAuth" -}}
-{{- $id := printf "%s_%s"   (.method |lower) (.path | replace "/" "") }}
-{{ $id }}
-{{- end -}}
-
 {{- define "oidcProxy.skipAuthConfig" -}}
 {{- range  $k, $v := .Values.global.oidcProxy.skipAuth -}}
 {{- $id := printf "%s_%s" ($v.method |lower) ($v.path | replace "/" "")}}
+{{- $id := regexReplaceAll "\\W+" $id "_" -}}
 {{- $var_name := printf "%s_%s" "skip_auth" $id }}
 set {{ $var_name }} 1;
 

diff --git a/stack/tests/ingress_test.yaml b/stack/tests/ingress_test.yaml
@@ -60,6 +60,8 @@ tests:
           skipAuth:
             - path: /healthz
               method: GET
+            - path: /api/*
+              method: "*"
       services:
         service1:
           ingress:
@@ -84,3 +86,16 @@ tests:
             if ( skip_auth_get_healthz ) {
                 return 200;
             }
+            set skip_auth___api_ 1;
+
+            if ( $request_uri !~ "/api/*" ) {
+                set skip_auth___api_  0;
+            }
+
+            if ( $request_method !~ "*" ) {
+                set skip_auth___api_  0;
+            }
+
+            if ( skip_auth___api_ ) {
+                return 200;
+            }