aws-ssh-utils 0.3.1__tar.gz → 0.3.2__tar.gz

{aws_ssh_utils-0.3.1 → aws_ssh_utils-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aws-ssh-utils
-Version: 0.3.1
+Version: 0.3.2
 Summary: Easy AWS SSHing
 Project-URL: Homepage, https://github.com/mvanderlee/aws-ssh-utils
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>

aws_ssh_utils-0.3.2/aws_ssh_utils/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.3.2"

{aws_ssh_utils-0.3.1 → aws_ssh_utils-0.3.2}/aws_ssh_utils/session.py

@@ -3,8 +3,10 @@
 import os
 import queue
 import re
+import signal
 import threading
 import time
+from contextlib import suppress
 from typing import Protocol, cast
 
 
@@ -19,6 +21,8 @@ class ShellClient(Protocol):
 
 
 class Pty(Protocol):
+    pid: int
+
     def read(self, size: int) -> str: ...
     def write(self, data: str) -> int: ...
     def setwinsize(self, rows: int, cols: int) -> None: ...
@@ -123,6 +127,11 @@ class SSMSession:
         if not self.closed:
             self.closed = True
             try:
+                if os.name != 'nt':
+                    # The reader thread holds the pty lock until every process on it exits,
+                    # including session-manager-plugin, which survives the SIGHUP sent to aws.
+                    with suppress(ProcessLookupError):
+                        os.killpg(self.process.pid, signal.SIGKILL)
                 self.process.close(force=True)
             finally:
                 self._output.put(None)

aws_ssh_utils-0.3.1/aws_ssh_utils/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.1"