chore: fix k8s proxy; re-export in jasyncio

Author: dimaqq

juju/client/proxy/kubernetes/proxy.py

@@ -1,7 +1,6 @@
 # Copyright 2023 Canonical Ltd.
 # Licensed under the Apache V2, see LICENCE file for details.
 import logging
-import os
 import tempfile
 
 from kubernetes import client
@@ -36,11 +35,15 @@ def __init__(
         except ValueError:
             raise ValueError(f"Invalid port number: {remote_port}")
 
+        self.port_forwarder = None
+
         if ca_cert:
-            self.temp_ca_file = tempfile.NamedTemporaryFile(delete=False)
+            self.temp_ca_file = tempfile.NamedTemporaryFile()  # noqa: SIM115
             self.temp_ca_file.write(bytes(ca_cert, "utf-8"))
             self.temp_ca_file.flush()
             config.ssl_ca_cert = self.temp_ca_file.name
+        else:
+            self.temp_ca_file = None
 
         self.api_client = client.ApiClient(config)
 
@@ -64,15 +67,13 @@ def connect(self):
 
     def __del__(self):
         self.close()
-        try:
-            os.unlink(self.temp_ca_file.name)
-        except FileNotFoundError:
-            log.debug(f"file {self.temp_ca_file.name} not found")
 
     def close(self):
         try:
-            self.port_forwarder.close()
-            self.temp_ca_file.close()
+            if self.port_forwarder:
+                self.port_forwarder.close()
+            if self.temp_ca_file:
+                self.temp_ca_file.close()
         except AttributeError:
             pass
 

juju/controller.py

@@ -397,7 +397,7 @@ async def destroy_models(
 
         """
         uuids = await self.model_uuids()
-        models = [uuids[model] if model in uuids else model for model in models]
+        models = [uuids.get(model) or model for model in models]
 
         model_facade = client.ModelManagerFacade.from_connection(self.connection())
 
@@ -574,7 +574,7 @@ async def get_models(self, all=False, username=None):  # noqa: A002
         """
         return await self.list_models(username, all)
 
-    async def model_uuids(self, username=None, all=False):
+    async def model_uuids(self, username=None, all=False):  # noqa: A002
         """Return a mapping of model names to UUIDs the given user can access.
 
         :param str username: Optional username argument, defaults to
@@ -599,7 +599,7 @@ async def model_uuids(self, username=None, all=False):
             model_summary.name: model_summary.uuid for model_summary in model_summaries
         }
 
-    async def list_models(self, username=None, all=False):
+    async def list_models(self, username=None, all=False):  # noqa: A002
         """Return list of names of the available models on this controller.
 
         Equivalent to ``sorted((await self.model_uuids()).keys())``
@@ -885,7 +885,7 @@ async def _watcher(stop_event):
         jasyncio.ensure_future(_watcher(stop_event))
         return stop_event
 
-    async def add_secret_backends(self, id, name, backend_type, config):
+    async def add_secret_backends(self, id_, name, backend_type, config):
         """Add a new secret backend.
 
         Parameters
@@ -907,7 +907,7 @@ async def add_secret_backends(self, id, name, backend_type, config):
         facade = client.SecretBackendsFacade.from_connection(self.connection())
         return await facade.AddSecretBackends([
             {
-                "id": id,
+                "id": id_,
                 "backend-type": backend_type,
                 "config": config,
                 "name": name,

juju/jasyncio.py

@@ -13,33 +13,71 @@
 import functools
 import logging
 import signal
+from asyncio import (
+    ALL_COMPLETED as ALL_COMPLETED,
+)
+from asyncio import (
+    FIRST_COMPLETED as FIRST_COMPLETED,
+)
 from asyncio import (
     CancelledError,
     create_task,
     wait,
-    Event as Event, TimeoutError as TimeoutError, Queue as Queue, ensure_future as ensure_future,
-    gather as gather,
-    sleep as sleep,
-    wait_for as wait_for,
-    create_subprocess_exec as create_subprocess_exec,
-    subprocess as subprocess,
-
-     FIRST_COMPLETED as FIRST_COMPLETED,
-     Lock as Lock,
-     as_completed as as_completed,
-     new_event_loop as new_event_loop,
+)
 
+# FIXME: integration tests don't use these, but some are used in this repo
+# Use primitives from asyncio within this repo and remove these re-exports
+from asyncio import (
+    Event as Event,
+)
+from asyncio import (
+    Lock as Lock,
+)
+from asyncio import (
+    Queue as Queue,
+)
+from asyncio import (
+    TimeoutError as TimeoutError,  # noqa: A004
+)
+from asyncio import (
+    all_tasks as all_tasks,
+)
+from asyncio import (
+    as_completed as as_completed,
+)
+from asyncio import (
+    create_subprocess_exec as create_subprocess_exec,
+)
+from asyncio import (
+    current_task as current_task,
+)
+from asyncio import (
+    ensure_future as ensure_future,
+)
+from asyncio import (
+    gather as gather,
+)
+from asyncio import (
     get_event_loop_policy as get_event_loop_policy,
-    get_running_loop as
-    get_running_loop,
-    ALL_COMPLETED as
-    ALL_COMPLETED,
-    all_tasks as
-    all_tasks,
-    current_task as
-    current_task,
+)
+from asyncio import (
+    get_running_loop as get_running_loop,
+)
+from asyncio import (
+    new_event_loop as new_event_loop,
+)
+from asyncio import (
     shield as shield,
 )
+from asyncio import (
+    sleep as sleep,
+)
+from asyncio import (
+    subprocess as subprocess,
+)
+from asyncio import (
+    wait_for as wait_for,
+)
 
 import websockets