Merge branch 'RESTAPI-changing-helpers-for-algs' into 'master'

Changing pub key and type algorithm helpers file See merge request firecrest/firecrest!302
eth-cscs · May 27, 2024 · 5514c45 · 5514c45
2 parents c6199e1 + 3a95c4b
commit 5514c45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/deploy/k8s/config/templates/_helpers.tpl b/deploy/k8s/config/templates/_helpers.tpl
@@ -1,15 +1,15 @@
 {{- define "list.listPubKeys" -}}
-{{- $map := dict }}
-{{- range .Values.global.auth }}
-{{- $_ := set $map .F7T_AUTH_PUBKEY ""}}
-{{- end }}
-{{- keys $map | join ";" }}
-{{- end }}
+{{- $pubKeys := list -}}
+{{- range .Values.global.auth -}}
+{{- $pubKeys = append $pubKeys .F7T_AUTH_PUBKEY -}}
+{{- end -}}
+{{- join ";" $pubKeys -}}
+{{- end -}}
 
 {{- define "list.listPubKeyTypes" -}}
-{{- $map := dict }}
-{{- range .Values.global.auth }}
-{{- $_ := set $map .F7T_AUTH_ALGORITHM ""}}
-{{- end }}
-{{- keys $map | join ";" }}
-{{- end }}
+{{- $pubKeyTypes := list -}}
+{{- range .Values.global.auth -}}
+{{- $pubKeyTypes = append $pubKeyTypes .F7T_AUTH_ALGORITHM -}}
+{{- end -}}
+{{- join ";" $pubKeyTypes -}}
+{{- end -}}
diff --git a/deploy/k8s/values-dev.yaml b/deploy/k8s/values-dev.yaml
@@ -100,4 +100,8 @@ global:
     - username: kc-demo
       F7T_AUTH_ISSUER: "http://svc-keycloak:8080/auth/realms/kcrealm"
       F7T_AUTH_PUBKEY: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqB44q32bQp8LbyW6dQvgsjseXESkLT1g5LQKGb+P79AC+nOAtxhn8i/kmgc6zsQH8NlUtNJruLxlzdo2/OGmlDGYZH1x6VmAwvJPJ4er0xPUrvZ8YclxYQC16PY5LFiQRNBMRyQwP5Kne1O46FpmADFVWMfoabdnaqoXexxB56b25o8tE2ulRBgfpnrRgZAvf7kWjugRCNO06FV074FVMYHA1aBk0ICyaFCDM/Tb5oaDyGr5c/ZvdrRUrw8vaiYyMgaAnnJPL75cebGoHeMJaEyZalsHA+iuhRAfeAwpSClsmhVqnfH7a7hqrqumVRo27dydqmfVgpFjU5gbFcBZ5wIDAQAB'
+      F7T_AUTH_ALGORITHM: "RS256"
+    - username: kc-test
+      F7T_AUTH_ISSUER: "http://svc-keycloak:8080/auth/realms/testrealm"
+      F7T_AUTH_PUBKEY: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqB44q32bQp8LbyW6dQvgsjseXESkLT1g5LQKGb+P79AC+nOAtxhn8i/kmgc6zsQH8NlUtNJruLxlzdo2/OGmlDGYZH1x6VmAwvJPJ4er0xPUrvZ8YclxYQC16PY5LFiQRNBMRyQwP5Kne1O46FpmADFVWMfoabdnaqoXexxB56b25o8tE2ulRBgfpnrRgZAvf7kWjugRCNO06FV074FVMYHA1aBk0ICyaFCDM/Tb5oaDyGr5c/ZvdrRUrw8vaiYyMgaAnnJPL75cebGoHeMJaEyZalsHA+iuhRAfeAwpSClsmhVqnfH7a7hqrqumVRo27dydqmfVgpFjU5gbFcBZ5wIDAQAC'
       F7T_AUTH_ALGORITHM: "RS256"