From 2daa4978869b210fb645cc0fbf99c65ee4669d0f Mon Sep 17 00:00:00 2001
From: Martin Buchleitner <mbuchleitner@infralovers.com>
Date: Thu, 24 Oct 2024 08:33:47 +0200
Subject: [PATCH] update code samples

Signed-off-by: Martin Buchleitner <mbuchleitner@infralovers.com>
---
 nomad/app_dynamic.hcl                 | 2 +-
 nomad/app_static.hcl                  | 6 +++---
 nomad/app_transit.hcl                 | 4 +++-
 nomad/app_transit_connect.hcl         | 2 +-
 nomad/app_transit_connect_traefik.hcl | 2 +-
 nomad/mysql_connect.hcl               | 8 ++++----
 nomad/mysql_static.hcl                | 9 ++++-----
 nomad/whoami.hcl                      | 1 -
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nomad/app_dynamic.hcl b/nomad/app_dynamic.hcl
index 584bcda..0728322 100644
--- a/nomad/app_dynamic.hcl
+++ b/nomad/app_dynamic.hcl
@@ -55,7 +55,7 @@ job "dynamic-app" {
     {{end}}
 
     {{ with secret "dynamic-app/kv/database" }}
-    Database = {{ .Data.database }}
+    Database = {{ .Data.data.database }}
     {{ end }}
     {{ with secret "dynamic-app/db/creds/app" }}
     User = {{ .Data.username }}
diff --git a/nomad/app_static.hcl b/nomad/app_static.hcl
index 993e4cf..dfccba3 100644
--- a/nomad/app_static.hcl
+++ b/nomad/app_static.hcl
@@ -56,9 +56,9 @@ job "dynamic-app" {
     {{end}}
 
     {{ with secret "dynamic-app/kv/database" }}
-    Database = {{ .Data.database }}
-    User = {{ .Data.username }}
-    Password = {{ .Data.password }}
+    Database = {{ .Data.data.database }}
+    User = {{ .Data.data.username }}
+    Password = {{ .Data.data.password }}
     {{ end }}
     [VAULT]
     Enabled = False        
diff --git a/nomad/app_transit.hcl b/nomad/app_transit.hcl
index 8f95828..1612829 100644
--- a/nomad/app_transit.hcl
+++ b/nomad/app_transit.hcl
@@ -56,7 +56,9 @@ job "dynamic-app" {
     Port = {{ .Port }}
     {{end}}
 
-    Database = my_app
+    {{ with secret "dynamic-app/kv/database" }}
+    Database = {{ .Data.data.database }}
+    {{ end }}
     {{ with secret "dynamic-app/db/creds/app" }}
     User = {{ .Data.username }}
     Password = {{ .Data.password }}
diff --git a/nomad/app_transit_connect.hcl b/nomad/app_transit_connect.hcl
index bff70c0..950d9d0 100644
--- a/nomad/app_transit_connect.hcl
+++ b/nomad/app_transit_connect.hcl
@@ -65,7 +65,7 @@ job "dynamic-app" {
     Port = 3306
     
     {{ with secret "dynamic-app/kv/database" }}
-    Database = {{ .Data.database }}
+    Database = {{ .Data.data.database }}
     {{ end }}
     {{ with secret "dynamic-app/db/creds/app" }}
     User = {{ .Data.username }}
diff --git a/nomad/app_transit_connect_traefik.hcl b/nomad/app_transit_connect_traefik.hcl
index 921c1d7..e37c7cc 100644
--- a/nomad/app_transit_connect_traefik.hcl
+++ b/nomad/app_transit_connect_traefik.hcl
@@ -76,7 +76,7 @@ job "dynamic-app" {
     Port = 3306
     
     {{ with secret "dynamic-app/kv/database" }}
-    Database = {{ .Data.database }}
+    Database = {{ .Data.data.database }}
     {{ end }}
     {{ with secret "dynamic-app/db/creds/app" }}
     User = {{ .Data.username }}
diff --git a/nomad/mysql_connect.hcl b/nomad/mysql_connect.hcl
index 7013e95..f533a96 100644
--- a/nomad/mysql_connect.hcl
+++ b/nomad/mysql_connect.hcl
@@ -44,13 +44,13 @@ job "mysql-server" {
         env         = true
         data        = <<EOF
 {{ with secret "dynamic-app/kv/database" }}
-MYSQL_DATABASE = "{{ .Data.database }}"
-MYSQL_USER = "{{ .Data.username }}"
-MYSQL_PASSWORD = "{{ .Data.password }}"
+MYSQL_DATABASE = "{{ .Data.data.database }}"
+MYSQL_USER = "{{ .Data.data.username }}"
+MYSQL_PASSWORD = "{{ .Data.data.password }}"
 {{ end }}
 
 {{ with secret "dynamic-app/kv/database_root" }}
-MYSQL_ROOT_PASSWORD = "{{ .Data.password }}"
+MYSQL_ROOT_PASSWORD = "{{ .Data.data.password }}"
 {{ end }}
 EOF
       }
diff --git a/nomad/mysql_static.hcl b/nomad/mysql_static.hcl
index bef7dae..953f30b 100644
--- a/nomad/mysql_static.hcl
+++ b/nomad/mysql_static.hcl
@@ -34,19 +34,18 @@ job "mysql-server" {
         ]
       }
       template {
-        env = true
         destination = "secrets/.envs"
         change_mode = "noop"
         env         = true
         data        = <<EOF
 {{ with secret "dynamic-app/kv/database" }}
-MYSQL_DATABASE = "{{ .Data.database }}"
-MYSQL_USER = "{{ .Data.username }}"
-MYSQL_PASSWORD = "{{ .Data.password }}"
+MYSQL_DATABASE = "{{ .Data.data.database }}"
+MYSQL_USER = "{{ .Data.data.username }}"
+MYSQL_PASSWORD = "{{ .Data.data.password }}"
 {{ end }}
 
 {{ with secret "dynamic-app/kv/database_root" }}
-MYSQL_ROOT_PASSWORD = "{{ .Data.password }}"
+MYSQL_ROOT_PASSWORD = "{{ .Data.data.password }}"
 {{ end }}
 EOF
       }
diff --git a/nomad/whoami.hcl b/nomad/whoami.hcl
index ea27a2b..44ce7e5 100644
--- a/nomad/whoami.hcl
+++ b/nomad/whoami.hcl
@@ -1,7 +1,6 @@
 job "whoami" {
   datacenters = ["dc1"]
   type        = "service"
-  namespace   = "demo"
 
   group "whoami" {
     count = 1