From f3cba82c9fea834aa0608d1ae622e0fb6080a8fb Mon Sep 17 00:00:00 2001
From: Nico Angelo <nicolas.angelo@nuki.io>
Date: Mon, 2 Oct 2023 15:06:30 +0200
Subject: [PATCH] also populate logger for lookup

---
 src/lookups/bitwarden_lookup.py | 23 +++++++++++++----------
 src/template.py                 | 21 +++++++++------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/lookups/bitwarden_lookup.py b/src/lookups/bitwarden_lookup.py
index 9329855..522fbb8 100644
--- a/src/lookups/bitwarden_lookup.py
+++ b/src/lookups/bitwarden_lookup.py
@@ -1,13 +1,16 @@
-import json
-
 from utils.utils import get_secret_from_bitwarden, get_attachment, parse_fields_scope, parse_login_scope
 
 
-def bitwarden_lookup(id, scope, field):
-    if scope == "attachment":
-        return get_attachment(None, id, field)
-    _secret_json = get_secret_from_bitwarden(None, id)
-    if scope == "login":
-        return parse_login_scope(_secret_json, field)
-    if scope == "fields":
-        return parse_fields_scope(_secret_json, field)
+class BitwardenLookupHandler:
+
+    def __init__(self, logger) -> None:
+        self.logger = logger
+
+    def bitwarden_lookup(self, id, scope, field):
+        if scope == "attachment":
+            return get_attachment(self.logger, id, field)
+        _secret_json = get_secret_from_bitwarden(self.logger, id)
+        if scope == "login":
+            return parse_login_scope(_secret_json, field)
+        if scope == "fields":
+            return parse_fields_scope(_secret_json, field)
diff --git a/src/template.py b/src/template.py
index f6d3ce9..ed9622c 100644
--- a/src/template.py
+++ b/src/template.py
@@ -4,27 +4,24 @@ import kubernetes
 import json
 
 from utils.utils import unlock_bw, bw_sync_interval
-from lookups.bitwarden_lookup import bitwarden_lookup
+from lookups.bitwarden_lookup import BitwardenLookupHandler
 from jinja2 import Environment, BaseLoader
 
 
-lookup_func_dict = {
-    "bitwarden_lookup": bitwarden_lookup,
-}
-
-
-def render_template(template):
+def render_template(logger, template):
     jinja_template = Environment(loader=BaseLoader()).from_string(template)
-    jinja_template.globals.update(lookup_func_dict)
+    jinja_template.globals.update({
+        "bitwarden_lookup": BitwardenLookupHandler(logger).bitwarden_lookup,
+    })
     return jinja_template.render()
 
 
-def create_template_secret(secret, filename, template):
+def create_template_secret(logger, secret, filename, template):
     secret.type = "Opaque"
     secret.data = {}
     secret.data[filename] = str(
         base64.b64encode(
-            render_template(template).encode("utf-8")),
+            render_template(logger, template).encode("utf-8")),
         "utf-8")
     return secret
 
@@ -48,7 +45,7 @@ def create_managed_secret(spec, name, namespace, logger, body, **kwargs):
     secret = kubernetes.client.V1Secret()
     secret.metadata = kubernetes.client.V1ObjectMeta(
         name=secret_name, annotations=annotations)
-    secret = create_template_secret(secret, filename, template)
+    secret = create_template_secret(logger, secret, filename, template)
 
     obj = api.create_namespaced_secret(
         secret_namespace, secret
@@ -109,7 +106,7 @@ def update_managed_secret(
     secret = kubernetes.client.V1Secret()
     secret.metadata = kubernetes.client.V1ObjectMeta(
         name=secret_name, annotations=annotations)
-    secret = create_template_secret(secret, filename, template)
+    secret = create_template_secret(logger, secret, filename, template)
 
     try:
         obj = api.replace_namespaced_secret(