From 56cfe31e88da4d5918e76176f26d137683c0f073 Mon Sep 17 00:00:00 2001
From: Cyber MacGeddon <cybermaggedon@gmail.com>
Date: Mon, 14 Oct 2024 19:45:54 +0100
Subject: [PATCH] Tidier templating for environment variables

---
 templates/engine/docker-compose.jsonnet |  2 +-
 templates/engine/k8s.jsonnet            | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/templates/engine/docker-compose.jsonnet b/templates/engine/docker-compose.jsonnet
index b9076d09..c37f1df0 100644
--- a/templates/engine/docker-compose.jsonnet
+++ b/templates/engine/docker-compose.jsonnet
@@ -195,7 +195,7 @@
         variables:: [],
 
         with_env_var::
-            function(name) self + {
+            function(name, key) self + {
                 variables: super.variables + [name],
             },
 
diff --git a/templates/engine/k8s.jsonnet b/templates/engine/k8s.jsonnet
index 656b360a..2fec0d1f 100644
--- a/templates/engine/k8s.jsonnet
+++ b/templates/engine/k8s.jsonnet
@@ -54,7 +54,7 @@
                             valueFrom: {
                                 secretKeyRef: {
                                     name: vars.name,
-                                    key: x,
+                                    key: vars.keyMap[x],
                                 }
                             }
                         }]
@@ -312,23 +312,12 @@
         name: name,
 
         variables: [],
+        keyMap: {},
 
         with_size:: function(size) self + { size: size },
 
         add:: function() [
-/*
-                {
-                    apiVersion: "v1",
-                    kind: "Secret",
-                    metadata: {
-                        name: volume.name,
-                        namespace: "trustgraph",
-                    },
-                    data: {
-                    }
-                },
-*/
-            ],
+        ],
 
         volRef:: function() {
             name: volume.name,
@@ -336,8 +325,9 @@
         },
 
         with_env_var::
-            function(name) self + {
+            function(name, key) self + {
                 variables: super.variables + [name],
+                keyMap: super.keyMap + { [name]: key },
             },
 
     },