outposts: pass outpost reference instead of PK, implement TaskResult.uid

passbook/outposts/controllers/base.py

@@ -19,8 +19,8 @@ class BaseController:
 
     outpost: Outpost
 
-    def __init__(self, outpost_pk: str):
+    def __init__(self, outpost: Outpost):
-        self.outpost = Outpost.objects.get(pk=outpost_pk)
+        self.outpost = outpost
         self.logger = get_logger(
             controller=self.__class__.__name__, outpost=self.outpost
         )

passbook/outposts/controllers/docker.py

@@ -8,6 +8,7 @@ from yaml import safe_dump
 
 from passbook import __version__
 from passbook.outposts.controllers.base import BaseController, ControllerException
+from passbook.outposts.models import Outpost
 
 
 class DockerController(BaseController):
@@ -19,8 +20,8 @@ class DockerController(BaseController):
 
     image_base = "beryju/passbook"
 
-    def __init__(self, outpost_pk: str) -> None:
+    def __init__(self, outpost: Outpost) -> None:
-        super().__init__(outpost_pk)
+        super().__init__(outpost)
         self.client = from_env()
 
     def _get_env(self) -> Dict[str, str]:

passbook/outposts/controllers/kubernetes.py

@@ -10,13 +10,14 @@ from passbook.outposts.controllers.base import BaseController, ControllerExcepti
 from passbook.outposts.controllers.k8s.deployment import DeploymentReconciler
 from passbook.outposts.controllers.k8s.secret import SecretReconciler
 from passbook.outposts.controllers.k8s.service import ServiceReconciler
+from passbook.outposts.models import Outpost
 
 
 class KubernetesController(BaseController):
     """Manage deployment of outpost in kubernetes"""
 
-    def __init__(self, outpost_pk: str) -> None:
+    def __init__(self, outpost: Outpost) -> None:
-        super().__init__(outpost_pk)
+        super().__init__(outpost)
         try:
             load_incluster_config()
         except ConfigException:

passbook/outposts/tasks.py

@@ -29,25 +29,26 @@ def outpost_controller_all():
     for outpost in Outpost.objects.exclude(
         deployment_type=OutpostDeploymentType.CUSTOM
     ):
-        outpost_controller.delay(outpost.pk.hex, outpost.deployment_type, outpost.type)
+        outpost_controller.delay(outpost.pk.hex)
 
 
 @CELERY_APP.task(bind=True, base=MonitoredTask)
-def outpost_controller(
+def outpost_controller(self: MonitoredTask, outpost_pk: str):
-    self: MonitoredTask, outpost_pk: str, deployment_type: str, outpost_type: str
-):
     """Launch controller and reconcile deployment/service/etc"""
     logs = []
+    outpost: Outpost = Outpost.objects.get(pk=outpost_pk)
     try:
-        if outpost_type == OutpostType.PROXY:
+        if outpost.type == OutpostType.PROXY:
-            if deployment_type == OutpostDeploymentType.KUBERNETES:
+            if outpost.deployment_type == OutpostDeploymentType.KUBERNETES:
-                logs = ProxyKubernetesController(outpost_pk).run_with_logs()
+                logs = ProxyKubernetesController(outpost).run_with_logs()
-            if deployment_type == OutpostDeploymentType.DOCKER:
+            if outpost.deployment_type == OutpostDeploymentType.DOCKER:
-                logs = ProxyDockerController(outpost_pk).run_with_logs()
+                logs = ProxyDockerController(outpost).run_with_logs()
     except ControllerException as exc:
-        self.set_status(TaskResult(TaskResultStatus.ERROR, [str(exc)], exc))
+        self.set_status(
+            TaskResult(TaskResultStatus.ERROR, [str(exc)], exc, uid=outpost.name)
+        )
     else:
-        self.set_status(TaskResult(TaskResultStatus.SUCCESSFUL, logs))
+        self.set_status(TaskResult(TaskResultStatus.SUCCESSFUL, logs, uid=outpost.name))
 
 
 @CELERY_APP.task()

passbook/outposts/views.py

@@ -35,7 +35,7 @@ class DockerComposeView(LoginRequiredMixin, View):
         )
         manifest = ""
         if outpost.type == OutpostType.PROXY:
-            controller = DockerController(outpost_pk)
+            controller = DockerController(outpost)
             manifest = controller.get_static_deployment()
 
         return HttpResponse(manifest, content_type="text/vnd.yaml")

passbook/providers/proxy/controllers/docker.py

@@ -1,12 +1,13 @@
 """Proxy Provider Docker Contoller"""
 from passbook.outposts.controllers.docker import DockerController
+from passbook.outposts.models import Outpost
 
 
 class ProxyDockerController(DockerController):
     """Proxy Provider Docker Contoller"""
 
-    def __init__(self, outpost_pk: str):
+    def __init__(self, outpost: Outpost):
-        super().__init__(outpost_pk)
+        super().__init__(outpost)
         self.deployment_ports = {
             "http": 4180,
             "https": 4443,

passbook/providers/proxy/controllers/kubernetes.py

@@ -1,12 +1,13 @@
 """Proxy Provider Kubernetes Contoller"""
 from passbook.outposts.controllers.kubernetes import KubernetesController
+from passbook.outposts.models import Outpost
 
 
 class ProxyKubernetesController(KubernetesController):
     """Proxy Provider Kubernetes Contoller"""
 
-    def __init__(self, outpost_pk: str):
+    def __init__(self, outpost: Outpost):
-        super().__init__(outpost_pk)
+        super().__init__(outpost)
         self.deployment_ports = {
             "http": 4180,
             "https": 4443,