Merge pull request #79 from fishi0x01/test-exec

combine vault_exec setup calls
fishi0x01 · Feb 15, 2021 · 93f4117 · 93f4117
2 parents 1b22562 + ece3420
commit 93f4117
Showing 1 changed file with 31 additions and 32 deletions.
diff --git a/test/util/util.bash b/test/util/util.bash
@@ -28,40 +28,39 @@ setup() {
     docker cp "$DIR/policy-delete-only.hcl" ${VAULT_CONTAINER_NAME}:.
     # need some time for GH Actions CI
     sleep 3
-    vault_exec "vault secrets disable secret"
-    vault_exec "vault policy write no-root policy-no-root.hcl"
-    vault_exec "vault token create -id=no-root -policy=no-root"
-    vault_exec "vault policy write delete-only policy-delete-only.hcl"
-    vault_exec "vault token create -id=delete-only -policy=delete-only"
+    vault_exec "vault secrets disable secret;
+                vault policy write no-root policy-no-root.hcl;
+                vault token create -id=no-root -policy=no-root;
+                vault policy write delete-only policy-delete-only.hcl;
+                vault token create -id=delete-only -policy=delete-only;
+                vault secrets enable -version=1 -path=KV1 kv;
+                vault secrets enable -version=2 -path=KV2 kv"
 
-    KV_BACKENDS=("KV1" "KV2")
-    vault_exec "vault secrets enable -version=1 -path=KV1 kv"
-    vault_exec "vault secrets enable -version=2 -path=KV2 kv"
-    for kv_backend in "${KV_BACKENDS[@]}"
+    for kv_backend in KV1 KV2;
     do
-        vault_exec "vault kv put ${kv_backend}/src/data/1 data=1"
-        vault_exec "vault kv put ${kv_backend}/src/data/2 value=1 data=2"
-        vault_exec "vault kv put ${kv_backend}/src/dev/1 value=1 fruit=apple"
-        vault_exec "vault kv put ${kv_backend}/src/dev/2 value=2 fruit=banana"
-        vault_exec "vault kv put ${kv_backend}/src/dev/3 value=3 fruit=berry"
-        vault_exec "vault kv put ${kv_backend}/src/staging/all value=all tree=palm"
-        vault_exec "vault kv put ${kv_backend}/src/staging/all/v1 value=v1 tree=oak"
-        vault_exec "vault kv put ${kv_backend}/src/staging/all/v2 value=v2 tree=bonsai"
-        vault_exec "vault kv put ${kv_backend}/src/prod/all value=all example=test"
-        vault_exec "vault kv put ${kv_backend}/src/tooling value=tooling drink=beer key=A"
-        vault_exec "vault kv put ${kv_backend}/src/tooling/v1 value=v1 drink=juice key=B"
-        vault_exec "vault kv put ${kv_backend}/src/tooling/v2 value=v2 drink=water key=C"
-        vault_exec "vault kv put ${kv_backend}/src/ambivalence/1 value=1 fruit=apple"
-        vault_exec "vault kv put ${kv_backend}/src/ambivalence/1/a value=2 fruit=banana"
-        vault_exec "vault kv put ${kv_backend}/src/selector/1 value=1 fruit=apple produce=apple food=apple"
-        vault_exec "vault kv put ${kv_backend}/src/selector/2 value=2 fruit=banana produce=banana food=banana"
-        vault_exec "vault kv put ${kv_backend}/src/a/foo value=1 long=this-is-a-really-long-value-for-testing"
-        vault_exec "vault kv put ${kv_backend}/src/a/foo/bar value=2"
-        vault_exec "vault kv put ${kv_backend}/src/b/foo value=1"
-        vault_exec "vault kv put ${kv_backend}/src/b/foo/bar value=2"
-        vault_exec "echo -n \"a spaced value\" | vault kv put ${kv_backend}/src/spaces/foo bar=-"
-        vault_exec "vault kv put ${kv_backend}/src/apostrophe/foo bar=steve\'s"
-        vault_exec "echo -n 'a \"quoted\" value' | vault kv put ${kv_backend}/src/quoted/foo bar=-"
+        vault_exec "vault kv put ${kv_backend}/src/data/1 data=1;
+                    vault kv put ${kv_backend}/src/data/2 value=1 data=2;
+                    vault kv put ${kv_backend}/src/dev/1 value=1 fruit=apple;
+                    vault kv put ${kv_backend}/src/dev/2 value=2 fruit=banana;
+                    vault kv put ${kv_backend}/src/dev/3 value=3 fruit=berry;
+                    vault kv put ${kv_backend}/src/staging/all value=all tree=palm;
+                    vault kv put ${kv_backend}/src/staging/all/v1 value=v1 tree=oak;
+                    vault kv put ${kv_backend}/src/staging/all/v2 value=v2 tree=bonsai;
+                    vault kv put ${kv_backend}/src/prod/all value=all example=test;
+                    vault kv put ${kv_backend}/src/tooling value=tooling drink=beer key=A;
+                    vault kv put ${kv_backend}/src/tooling/v1 value=v1 drink=juice key=B;
+                    vault kv put ${kv_backend}/src/tooling/v2 value=v2 drink=water key=C;
+                    vault kv put ${kv_backend}/src/ambivalence/1 value=1 fruit=apple;
+                    vault kv put ${kv_backend}/src/ambivalence/1/a value=2 fruit=banana;
+                    vault kv put ${kv_backend}/src/selector/1 value=1 fruit=apple produce=apple food=apple;
+                    vault kv put ${kv_backend}/src/selector/2 value=2 fruit=banana produce=banana food=banana;
+                    vault kv put ${kv_backend}/src/a/foo value=1 long=this-is-a-really-long-value-for-testing;
+                    vault kv put ${kv_backend}/src/a/foo/bar value=2;
+                    vault kv put ${kv_backend}/src/b/foo value=1;
+                    vault kv put ${kv_backend}/src/b/foo/bar value=2;
+                    echo -n \"a spaced value\" | vault kv put ${kv_backend}/src/spaces/foo bar=-;
+                    vault kv put ${kv_backend}/src/apostrophe/foo bar=steve\'s;
+                    echo -n 'a \"quoted\" value' | vault kv put ${kv_backend}/src/quoted/foo bar=-"
     done
 }