chore: clean up types and cleanup async task

Author: uptickmetachu

gitops/common/app.py

@@ -143,12 +143,12 @@ def image_prefix(self) -> str:
     @property
     def cluster(self) -> str:
         cluster = self.values.get("cluster", "")
-        return str(cluster) if cluster else ""
+        return str(cluster)
 
     @property
     def tags(self) -> list[str]:
         tags = self.values.get("tags", [])
-        return list(tags) if tags else []
+        return list(tags)
 
     @property
     def service_account_name(self) -> str:
@@ -166,7 +166,7 @@ def service_account_name(self) -> str:
     def secrets(self) -> dict[str, str]:
         # TODO: This should be a first class property
         secrets = self.values.get("secrets", {})
-        return dict(secrets) if secrets else {}
+        return dict(secrets)
 
 
 class Chart:

gitops_server/app.py

@@ -17,8 +17,13 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]:
 
     loop = asyncio.get_running_loop()
     deploy_queue_worker = DeployQueueWorker.get_worker()
-    deploy_queue_worker.task = asyncio.ensure_future(deploy_queue_worker.run(), loop=loop)
+    deploy_queue_worker_task = asyncio.ensure_future(deploy_queue_worker.run(), loop=loop)
     yield
+    deploy_queue_worker_task.cancel()
+    try:
+        await deploy_queue_worker_task
+    except asyncio.CancelledError:
+        pass
 
 
 app = FastAPI(lifespan=lifespan)

gitops_server/workers/deployer/worker.py

@@ -33,7 +33,6 @@ def __init__(self) -> None:
         self.queue: asyncio.Queue[Any] = asyncio.Queue()
         self.semaphore_manager = AppSemaphoreManager()
         self.active_deployments: set[asyncio.Task[None]] = set()
-        self.task: asyncio.Task[None] | None = None
 
     async def enqueue(self, work: Any) -> None:
         """Enqueue an item of work for future processing.