Skip to content

Commit 37e0b4d

Browse files
committed
re-pre-commit
1 parent fd2fce6 commit 37e0b4d

File tree

5 files changed

+37
-17
lines changed

5 files changed

+37
-17
lines changed

enterprise_gateway/client/gateway_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ def __init__(
111111
self.response_reader = Thread(target=self._read_responses)
112112
self.response_queues = {}
113113
self.interrupt_thread = None
114-
self.log.debug("Initializing kernel client (%s) to %s", kernel_id, self.kernel_ws_api_endpoint)
114+
self.log.debug(
115+
"Initializing kernel client (%s) to %s", kernel_id, self.kernel_ws_api_endpoint
116+
)
115117

116118
try:
117119
self.kernel_socket = websocket.create_connection(

enterprise_gateway/services/processproxies/distributed.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ async def launch_process(
101101
result_pid = self._launch_remote_process(kernel_cmd, **kwargs)
102102
self.pid = int(result_pid)
103103
except Exception as e:
104-
error_message = f"Failure occurred starting kernel on '{self.ip}'. Returned result: {e}"
104+
error_message = (
105+
f"Failure occurred starting kernel on '{self.ip}'. Returned result: {e}"
106+
)
105107
self.log_and_raise(http_status_code=500, reason=error_message)
106108

107109
self.log.info(

enterprise_gateway/services/processproxies/k8s.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,9 @@ def _create_kernel_namespace(self, service_account_name: str) -> str:
382382
self.log.info("Re-using kernel namespace: %s", namespace)
383383
else:
384384
if self.delete_kernel_namespace:
385-
reason = f"Error occurred creating role binding for namespace '{namespace}': {err}"
385+
reason = (
386+
f"Error occurred creating role binding for namespace '{namespace}': {err}"
387+
)
386388
# delete the namespace since we'll be using the EG namespace...
387389
body = client.V1DeleteOptions(
388390
grace_period_seconds=0, propagation_policy="Background"

enterprise_gateway/services/processproxies/processproxy.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ def _prepare_response_socket(self) -> None:
223223
s.bind((bind_ip, port))
224224
except OSError as e:
225225
if e.errno == errno.EADDRINUSE:
226-
self.log.info("Response port %s is already in use, trying another port...", port)
226+
self.log.info(
227+
"Response port %s is already in use, trying another port...", port
228+
)
227229
continue
228230
elif e.errno in (errno.EACCES, getattr(errno, "WSAEACCES", errno.EACCES)):
229231
self.log.warning(
@@ -710,7 +712,9 @@ def _get_ssh_client(self, host: str) -> SSHClient | None:
710712
error_message = error_message_prefix + (
711713
" provided" if self.remote_pwd else "-less SSH"
712714
)
713-
error_message = error_message + f"and EG_REMOTE_GSS_SSH={self._use_gss_raw!r} ({self.use_gss})"
715+
error_message = (
716+
error_message + f"and EG_REMOTE_GSS_SSH={self._use_gss_raw!r} ({self.use_gss})"
717+
)
714718

715719
self.log_and_raise(http_status_code=http_status_code, reason=error_message)
716720
return ssh

enterprise_gateway/tests/test_process_proxy.py

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,12 @@ def test_missing_variables_fallback(self):
6161
}
6262
}
6363

64-
with patch.object(self.proxy, 'log'), patch(
65-
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
66-
) as mock_session_manager:
64+
with (
65+
patch.object(self.proxy, 'log'),
66+
patch(
67+
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
68+
) as mock_session_manager,
69+
):
6770
mock_session_manager.get_kernel_username.return_value = "testuser"
6871
result = self.proxy._determine_kernel_pod_name(**kwargs)
6972
# Should fall back to default naming: kernel_username + "-" + kernel_id
@@ -97,9 +100,10 @@ def test_malicious_template_injection_prevention(self):
97100
variables = {"kernel_id": "test-123"}
98101

99102
for malicious_template in malicious_templates:
100-
with self.subTest(template=malicious_template), patch.object(
101-
self.proxy, 'log'
102-
) as mock_log:
103+
with (
104+
self.subTest(template=malicious_template),
105+
patch.object(self.proxy, 'log') as mock_log,
106+
):
103107
result = self.proxy._safe_template_substitute(malicious_template, variables)
104108
# All malicious templates should be treated as invalid and return None
105109
self.assertIsNone(result)
@@ -131,9 +135,12 @@ def test_pod_name_determination_with_malicious_template(self):
131135
}
132136
}
133137

134-
with patch.object(self.proxy, 'log'), patch(
135-
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
136-
) as mock_session_manager:
138+
with (
139+
patch.object(self.proxy, 'log'),
140+
patch(
141+
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
142+
) as mock_session_manager,
143+
):
137144
mock_session_manager.get_kernel_username.return_value = "testuser"
138145
result = self.proxy._determine_kernel_pod_name(**kwargs)
139146
# Should fall back to default naming
@@ -148,9 +155,12 @@ def test_pod_name_determination_with_missing_variables(self):
148155
}
149156
}
150157

151-
with patch.object(self.proxy, 'log'), patch(
152-
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
153-
) as mock_session_manager:
158+
with (
159+
patch.object(self.proxy, 'log'),
160+
patch(
161+
'enterprise_gateway.services.processproxies.k8s.KernelSessionManager'
162+
) as mock_session_manager,
163+
):
154164
mock_session_manager.get_kernel_username.return_value = "testuser"
155165
result = self.proxy._determine_kernel_pod_name(**kwargs)
156166
# Should fall back to default naming

0 commit comments

Comments
 (0)