Skip to content

Commit 33e6d94

Browse files
committed
fix: address review comments
1 parent a2bbb86 commit 33e6d94

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

juju/client/proxy/kubernetes/proxy.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def __init__(
3030
self.namespace = namespace
3131
self.remote_port = remote_port
3232
self.service = service
33-
self.temp_ca_file = None
33+
self.temp_ca_path = None
3434
self.port_forwarder = None
3535

3636
try:
@@ -41,7 +41,8 @@ def __init__(
4141
if ca_cert:
4242
with tempfile.NamedTemporaryFile(delete=False) as f:
4343
f.write(bytes(ca_cert, "utf-8"))
44-
self.temp_ca_file = config.ssl_ca_cert = f.name
44+
self.temp_ca_path = f.name
45+
config.ssl_ca_cert = f.name
4546

4647
self.api_client = client.ApiClient(config)
4748

@@ -65,18 +66,13 @@ def connect(self):
6566

6667
def __del__(self):
6768
self.close()
68-
try:
69-
if self.temp_ca_file:
70-
os.unlink(self.temp_ca_file)
71-
except FileNotFoundError:
72-
log.debug(f"file {self.temp_ca_file} not found")
69+
if self.temp_ca_path:
70+
os.unlink(self.temp_ca_path)
7371

7472
def close(self):
75-
try:
76-
if self.port_forwarder:
77-
self.port_forwarder.close()
78-
except AttributeError:
79-
pass
73+
if self.port_forwarder:
74+
self.port_forwarder.close()
75+
self.port_forwarder = None
8076

8177
def socket(self):
8278
if self.port_forwarder is not None:

0 commit comments

Comments
 (0)