From a8c42428b02877c10b2a8ac030f020624e2c0868 Mon Sep 17 00:00:00 2001
From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>
Date: Mon, 30 Nov 2020 16:31:02 -0500
Subject: [PATCH] Add extraArgs support to dev mode (#421)

---
 templates/_helpers.tpl                | 15 +++------------
 templates/server-statefulset.yaml     |  4 +++-
 test/unit/server-dev-statefulset.bats | 11 +++++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index d0c4d5f..0bd2891 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -103,18 +103,6 @@ extra volumes the user may have specified (such as a secret with TLS).
   {{- end }}
 {{- end -}}
 
-{{/*
-Set's a command to override the entrypoint defined in the image
-so we can make the user experience nicer.  This works in with
-"vault.args" to specify what commands /bin/sh should run.
-*/}}
-{{- define "vault.command" -}}
-  {{ if or (eq .mode "standalone") (eq .mode "ha") }}
-          - "/bin/sh"
-          - "-ec"
-  {{ end }}
-{{- end -}}
-
 {{/*
 Set's the args for custom command to render the Vault configuration
 file with IP addresses to make the out of box experience easier
@@ -131,6 +119,9 @@ for users looking to use this chart with Consul Helm.
             [ -n "${TRANSIT_ADDR}" ] && sed -Ei "s|TRANSIT_ADDR|${TRANSIT_ADDR?}|g" /tmp/storageconfig.hcl;
             [ -n "${RAFT_ADDR}" ] && sed -Ei "s|RAFT_ADDR|${RAFT_ADDR?}|g" /tmp/storageconfig.hcl;
             /usr/local/bin/docker-entrypoint.sh vault server -config=/tmp/storageconfig.hcl {{ .Values.server.extraArgs }}
+   {{ else if eq .mode "dev" }}
+          - |
+            /usr/local/bin/docker-entrypoint.sh vault server -dev {{ .Values.server.extraArgs }}
   {{ end }}
 {{- end -}}
 
diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index efb7ce2..be8ed93 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -66,7 +66,9 @@ spec:
           {{ template "vault.resources" . }}
           image: {{ .Values.server.image.repository }}:{{ .Values.server.image.tag | default "latest" }}
           imagePullPolicy: {{ .Values.server.image.pullPolicy }}
-          command: {{ template "vault.command" . }}
+          command:
+          - "/bin/sh"
+          - "-ec"
           args: {{ template "vault.args" . }}
           env:
             - name: HOST_IP
diff --git a/test/unit/server-dev-statefulset.bats b/test/unit/server-dev-statefulset.bats
index a44e243..7a62644 100755
--- a/test/unit/server-dev-statefulset.bats
+++ b/test/unit/server-dev-statefulset.bats
@@ -403,3 +403,14 @@ load _helpers
       yq -r '.spec.template.spec.securityContext.fsGroup' | tee /dev/stderr)
   [ "${actual}" = "2000" ]
 }
+
+@test "server/dev-StatefulSet: add extraArgs" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/server-statefulset.yaml \
+      --set 'server.dev.enabled=true' \
+      --set 'server.extraArgs=foobar' \
+      . | tee /dev/stderr |
+       yq -r '.spec.template.spec.containers[0].args[0]' | tee /dev/stderr)
+  [[ "${actual}" = *"foobar"* ]]
+}