clear-skies-aws 2.0.6__py3-none-any.whl → 2.0.8__py3-none-any.whl

{clear_skies_aws-2.0.6.dist-info → clear_skies_aws-2.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clear-skies-aws
-Version: 2.0.6
+Version: 2.0.8
 Summary: clearskies bindings for working in AWS
 Project-URL: Repository, https://github.com/clearskies-py/clearskies-aws
 Project-URL: Issues, https://github.com/clearskies-py/clearskies-aws/issues

{clear_skies_aws-2.0.6.dist-info → clear_skies_aws-2.0.8.dist-info}/RECORD

@@ -25,7 +25,7 @@ clearskies_aws/cursors/__init__.py,sha256=vy-WYxNEy5nd9fqY0En3T6WhE3omoV1tE-A5Uz
 clearskies_aws/cursors/iam/__init__.py,sha256=dY410gfPoMXB42jhmamqD5IiCeopDnxr5wIibpqaYcY,127
 clearskies_aws/cursors/iam/rds_mysql.py,sha256=bdAYTLg9t8DsoSi0otY9bmIgLCbrezczxd_3hWuEkeE,5639
 clearskies_aws/cursors/port_forwarding/__init__.py,sha256=LBcFYeIIfmGhxf3Ezn1KChOUdkpF5AjJL1xE_ak-x3s,78
-clearskies_aws/cursors/port_forwarding/ssm.py,sha256=RJXU6meeX9GNSbcxTGf6c9LcI4I0_wvYHnS_DzRSEXM,4498
+clearskies_aws/cursors/port_forwarding/ssm.py,sha256=2tEznKflMG5a8g1AzHWghHkMp4BdBFhewB8WigFR5F4,4878
 clearskies_aws/di/__init__.py,sha256=pLHSIKxS1oELOgttRuwM0yXdJRxjZKXQ6tPxme2db0U,222
 clearskies_aws/di/aws_additional_config_auto_import.py,sha256=94h_YsPBcdwMhqn0VAAfId1jLL5vCsk76kUrr-6ET_U,1275
 clearskies_aws/di/inject/__init__.py,sha256=5_x5_BBQwC6J4k5YLdTm1DfIDM-95zXz1L5a1nMrlrY,186
@@ -62,7 +62,7 @@ clearskies_aws/secrets/additional_configs/iam_db_auth.py,sha256=PwyiLaacpRfhBKzQ
 clearskies_aws/secrets/additional_configs/iam_db_auth_with_ssm.py,sha256=ABY29X-YvrE6vvNo6kVdf4DqyRNq5cFR5SfK7MNkltE,3463
 clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssh_cert_bastion.py,sha256=mLaplwvJLSbGh6oXgdOKL9Mv-6hLv5OUYCfEwHbHvLE,3700
 clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssm_bastion.py,sha256=2VHOwto4I9gBwrpd2HGpL-Wr0T2S-jFjUhe2Ib8hNJ8,6596
-clear_skies_aws-2.0.6.dist-info/METADATA,sha256=IidH6WQFF7CUARhh69VvYOTYty62G4udnySWuPnGtt0,9084
-clear_skies_aws-2.0.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-clear_skies_aws-2.0.6.dist-info/licenses/LICENSE,sha256=MkEX8JF8kZxdyBpTTcB0YTd-xZpWnHvbRlw-pQh8u58,1069
-clear_skies_aws-2.0.6.dist-info/RECORD,,
+clear_skies_aws-2.0.8.dist-info/METADATA,sha256=-uvSoeZ2V4_osTaUEJntwkkKhah6LP_a78xA2ZEioW4,9084
+clear_skies_aws-2.0.8.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+clear_skies_aws-2.0.8.dist-info/licenses/LICENSE,sha256=MkEX8JF8kZxdyBpTTcB0YTd-xZpWnHvbRlw-pQh8u58,1069
+clear_skies_aws-2.0.8.dist-info/RECORD,,

clearskies_aws/cursors/port_forwarding/ssm.py

@@ -92,6 +92,9 @@ class Ssm(PortForwarder):
         if self.local_port == 0:
             self.local_port = self.pick_free_port("127.0.0.1")
 
+        if self.remote_port is None:
+            raise ValueError("remote_port must be set for SSM port forwarding.")
+
         if self.is_port_open("127.0.0.1", self.local_port):
             return "127.0.0.1", self.local_port
 
@@ -102,15 +105,17 @@ class Ssm(PortForwarder):
             "--target",
             self.instance_id,
             "--document-name",
-            "AWS-StartPortForwardingSession",
+            "AWS-StartPortForwardingSessionToRemoteHost",
             "--parameters",
-            f"portNumber={self.remote_port},localPort={self.local_port}",
+            f'{{"host":["{original_host}"],"portNumber":["{self.remote_port}"],"localPortNumber":["{self.local_port}"]}}',
         ]
         if self.region:
             ssm_cmd += ["--region", self.region]
         if self.profile:
             ssm_cmd += ["--profile", self.profile]
 
+        self.logger.debug(f"Starting SSM port forwarding session: {' '.join(ssm_cmd)}")
+
         self._proc = self.subprocess.Popen(ssm_cmd, stdout=self.subprocess.PIPE, stderr=self.subprocess.PIPE)
 
         start = time.time()
@@ -123,7 +128,8 @@ class Ssm(PortForwarder):
                 break
             except Exception:
                 if self._proc is not None and self._proc.poll() is not None:
-                    raise RuntimeError("SSM process exited unexpectedly")
+                    stderr = self._proc.stderr.read().decode() if self._proc.stderr else ""
+                    raise RuntimeError(f"SSM process exited unexpectedly. Stderr: {stderr}")
                 if time.time() - start > 10:
                     raise TimeoutError(f"Timeout waiting for port {self.local_port} to open")
                 time.sleep(0.1)