From e67bea6a4c28e8dfebf855ece08a696e9074b89e Mon Sep 17 00:00:00 2001
From: David Peters <57600507+peters-david@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:02:18 +0100
Subject: [PATCH] Non json logging (#70)

* non json logging formatter

* lower harborapi version

* harborapi version without mro issues

* pin httpx version

* remove missed print call
---
 src/harbor.py             | 8 +++++---
 src/projects.py           | 2 +-
 src/retention_policies.py | 2 +-
 src/utils.py              | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/harbor.py b/src/harbor.py
index 8660e91..3ef8c7d 100644
--- a/src/harbor.py
+++ b/src/harbor.py
@@ -39,10 +39,12 @@
 logger = logging.getLogger()
 logger.setLevel(logging.INFO)
 if json_logging:
-    handler = logging.StreamHandler()
     formatter = jsonlogger.JsonFormatter()
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
+else:
+    formatter = logging.Formatter()
+handler = logging.StreamHandler()
+handler.setFormatter(formatter)
+logger.addHandler(handler)
 
 
 async def main() -> None:
diff --git a/src/projects.py b/src/projects.py
index 87fa79c..e521c2b 100644
--- a/src/projects.py
+++ b/src/projects.py
@@ -11,7 +11,7 @@ async def sync_projects(client, path, logger):
     """
 
     logger.info("Syncing projects")
-    target_projects_string = await fill_template(client, path)
+    target_projects_string = await fill_template(client, path, logger)
     target_projects = json.loads(target_projects_string)
     current_projects = await client.get_projects(limit=None)
     current_project_names = [
diff --git a/src/retention_policies.py b/src/retention_policies.py
index 62c155c..a41084e 100644
--- a/src/retention_policies.py
+++ b/src/retention_policies.py
@@ -11,7 +11,7 @@ async def sync_retention_policies(client, path, logger):
     """
 
     logger.info("Syncing retention policies")
-    retention_policies_string = await fill_template(client, path)
+    retention_policies_string = await fill_template(client, path, logger)
     retention_policies = json.loads(retention_policies_string)
     for retention_policy in retention_policies:
         retention_scope = retention_policy["scope"]["ref"]
diff --git a/src/utils.py b/src/utils.py
index 306580a..5cb3d02 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -69,7 +69,7 @@ def get_member_id(members: [ProjectMemberEntity], username: str) -> int | None:
     return None
 
 
-async def fill_template(client, path: str) -> str:
+async def fill_template(client, path: str, logger) -> str:
     """Takes the path to a template file and returns its content with the
     replaced ids
     """
@@ -78,7 +78,7 @@ async def fill_template(client, path: str) -> str:
         placeholders = re.findall(
             r'{{[ ]*(?:project|registry):[A-z,0-9,.,\-,_]+[ ]*}}', content
         )
-        print(f"Found id templates: {placeholders}")
+        logger.info("Found id templates", extra={"placeholders": placeholders})
         placeholders = [
             placeholder.replace('{{', '').replace(' ', '').replace('}}', '')
             for placeholder in placeholders