Updated harverster to new devops module API.

harvester.py

@@ -1,8 +1,16 @@
 #!/usr/bin/env python3
 
 from sk.devops import Organization
-org = Organization("https://dev.azure.com/mcovsandbox")
+from sk.azure import get_token
+
+token = get_token(
+    tenant_id="a7740229-47b6-45de-ad22-83721462b1bf",
+    client_id="840671c4-5dc4-40e5-aab9-7c3a07bbd652",
+    pem_path="./slawek-mba.pem"
+)
+
+org = Organization("https://dev.azure.com/mcovsandbox", token=token)
 
 # print(org.projects["bafe0cf1-6c97-4088-864a-ea6dc02b2727"].repositories["feac266f-84d2-41bc-839b-736925a85eaa"].items["/generate-pat.py"])
-print(org["ADO Sandbox"]["ado-auth-lab"]["/container"].url)
-print(org["ADO Sandbox"]["ado-auth-lab"]["/generate-pat.py"].url)
+print(org["ADO Sandbox"]["ado-auth-lab"]["/container"].url) # type: ignore[attr-defined]
+print(org["ADO Sandbox"]["ado-auth-lab"]["/generate-pat.py"].url) # type: ignore[attr-defined]

sk/devops.py

@@ -96,7 +96,10 @@ class Organization():
     def projects(self):
         if not hasattr(self, "_projects"):
             # Create Project objects
-            self._projects = [Project(org=self, **proj) for proj in self.get_path("_apis/projects").json().get("value", [])]
+            self._projects = []
+            for proj in self.get_path("_apis/projects").json().get("value", []):
+                p = Project(org=self, **proj)
+                self._projects.append(p)
         return self._projects
 
     def __getitem__(self, key: str) -> Project:
@@ -151,7 +154,12 @@ class Project():
     @property
     def repositories(self):
         if not hasattr(self, "_repositories"):
-            self._repositories = [Repository(org=self._org, **repo) for repo in self._org.get_path(f"{self._id}/_apis/git/repositories").json().get("value", [])]
+            self._repositories = []
+            for repo in self._org.get_path(f"{self._id}/_apis/git/repositories").json().get("value", []):
+                # Remove unnecessary nested project info
+                if "project" in repo:
+                    del repo["project"]
+                self._repositories.append(Repository(project=self, **repo))
         return self._repositories
 
     def __getitem__(self, key: str) -> Repository:
@@ -271,8 +279,8 @@ class Item():
             raise ValueError("Child items can only be fetched for folder items.")
 
         # Fetch child objects
-        objects = self._repository._project.organization.get_path(
-            path=f"{self._repository._project.id}/_apis/git/repositories/{self._repository.id}/items",
+        objects = self._repository.project.organization.get_path(
+            path=f"{self._repository.project.id}/_apis/git/repositories/{self._repository.id}/items",
             params={
                 "scopePath": self.path,
                 "recursionLevel": "oneLevel"

sk/logger.py

@@ -1,18 +1,12 @@
 import logging
 from loki_logger_handler.loki_logger_handler import LokiLoggerHandler
-from uuid import uuid4, UUID
 
 LOG_CONSOLE = 1
 LOG_FILE = 2
 LOG_LOKI = 4
-run_id: UUID
 
 # Quick non-intrusive debug check for sk.devops logger
 def setup(name: str, handlers: int) -> logging.Logger:
-    global run_id
-    # Generate a unique run ID.
-    run_id = uuid4()
-
     logger = logging.getLogger(name)
     logger.setLevel(logging.DEBUG)
 
@@ -42,31 +36,9 @@ def setup(name: str, handlers: int) -> logging.Logger:
 
     return logger
 
-def debug(logger: logging.Logger, message: str, **kwargs):
-    global run_id
-    logger.debug(message, extra={"run_id": str(run_id), **kwargs})
-
-def info(logger: logging.Logger, message: str, **kwargs):
-    global run_id
-    logger.info(message, extra={"run_id": str(run_id), **kwargs})
-
-def warning(logger: logging.Logger, message: str, **kwargs):
-    global run_id
-    logger.warning(message, extra={"run_id": str(run_id), **kwargs})
-
-def error(logger: logging.Logger, message: str, **kwargs):
-    global run_id
-    logger.error(message, extra={"run_id": str(run_id), **kwargs})
-
-def critical(logger: logging.Logger, message: str, **kwargs):
-    global run_id
-    logger.critical(message, extra={"run_id": str(run_id), **kwargs})
-
 def log_entity_creation(logger: logging.Logger, entity_class: type, entity_key: str):
-    global run_id
     logger.debug(f'Created new "{entity_class.__name__}" object with key: "{entity_key}"',
                  extra={
                      "entity_class": entity_class.__name__,
-                     "entity_key": entity_key,
-                     "run_id": str(run_id)
+                     "entity_key": entity_key
                  })