fix: use string checks for boolean expression

jessesimpson36 · May 31, 2024 · 5743c75 · 5743c75
1 parent 512aaa7
commit 5743c75
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/null_checking_bug/templates/_helpers.tpl b/null_checking_bug/templates/_helpers.tpl
@@ -1,17 +1,25 @@
 {{- define "null_checking_bug.isPasswordExplicit" -}}
-  {{- typeIs "string" .Values.existingSecret -}}
+  {{- if typeIs "string" .Values.existingSecret -}}
+true
+  {{- else -}}
+false
+  {{- end -}}
 {{- end -}}
 
 {{- define "null_checking_bug.isSecretName" -}}
-  {{- and (typeIs "map[string]interface {}" .Values.existingSecret)
+  {{- if and (typeIs "map[string]interface {}" .Values.existingSecret)
           (get .Values.existingSecret "name") -}}
+true
+  {{- else -}}
+false
+  {{- end -}}
 {{- end -}}
 
 
 {{- define "null_checking_bug.evaluateNameOfSecret" -}}
-  {{- if (include "null_checking_bug.isPasswordExplicit" .) -}}
+  {{- if eq "true" (include "null_checking_bug.isPasswordExplicit" .) -}}
     "default-secret"
-  {{- else if (include "null_checking_bug.isSecretName" .) -}}
-    {{- .Values.existingSecret.name | default "default-secret" }}
+  {{- else if eq "true" (include "null_checking_bug.isSecretName" .) -}}
+    {{- .Values.existingSecret.name | default "replace-default-secret" | quote }}
   {{- end }}
 {{- end -}}
diff --git a/null_checking_bug/templates/secret.yaml b/null_checking_bug/templates/secret.yaml
@@ -3,9 +3,6 @@ data:
   isSecretName: {{ (include "null_checking_bug.isSecretName" .) | quote }}
   isPasswordExplicit: {{ (include "null_checking_bug.isPasswordExplicit" .) | quote }}
   nameOfSecret: {{ include "null_checking_bug.evaluateNameOfSecret" . }}
-  {{- if (include "null_checking_bug.isSecretName" .) -}}
-  nameOfSecretFromValuesYaml: {{ .Values.existingSecret.name }}
-  {{- end }}
   typeOfSecretName: {{ typeOf (include "null_checking_bug.isSecretName" .) | quote }}
 kind: Secret
 metadata: