fix: handle leading/trailing whitespace

snyk · Jul 15, 2024 · 9be8240 · 9be8240
1 parent 895d232
commit 9be8240
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/charts/snyk-broker/templates/secrets.yaml b/charts/snyk-broker/templates/secrets.yaml
@@ -184,7 +184,7 @@ data:
 {{- if and .Values.caCert (not .Values.caCertFile) }}
 {{ (.Files.Glob .Values.caCert).AsSecrets | nindent 2 }}
 {{- else if and .Values.caCertFile (not .Values.caCert) }}
-  cacert: {{ .Values.caCertFile | b64enc | nindent 4}}
+  cacert: {{ .Values.caCertFile | trim |  b64enc | nindent 4}}
 {{- end }}
 ---
 {{- end }}
diff --git a/charts/snyk-broker/tests/broker_deployment_ca_test.yaml b/charts/snyk-broker/tests/broker_deployment_ca_test.yaml
@@ -253,3 +253,15 @@ tests:
         documentSelector:
           path: metadata.name
           value: RELEASE-NAME-snyk-broker-cacert-secret
+
+  - it: handles extra whitespace
+    set:
+      caCertFile: "\n  \n-----BEGIN CERTIFICATE-----\nCERTIFICATE GOES HERE\n-----END CERTIFICATE-----\n\n\n"
+    asserts:
+      - equal:
+          path: data.cacert
+          value: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkNFUlRJRklDQVRFIEdPRVMgSEVSRQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t
+        template: secrets.yaml
+        documentSelector:
+          path: metadata.name
+          value: RELEASE-NAME-snyk-broker-cacert-secret