aws-ssh-utils 0.1.1__tar.gz → 0.2.0__tar.gz

aws_ssh_utils-0.2.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 mvanderlee
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{aws_ssh_utils-0.1.1 → aws_ssh_utils-0.2.0}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: aws-ssh-utils
-Version: 0.1.1
+Version: 0.2.0
 Summary: Easy AWS SSHing
-Project-URL: Homepage, https://github.com/mvanderlee/aws_ssh_utils
+Project-URL: Homepage, https://github.com/mvanderlee/aws-ssh-utils
 Author-email: Michiel Vanderlee <jmt.vanderlee@gmail.com>
 License-Expression: MIT
+License-File: LICENSE
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
@@ -37,6 +38,10 @@ Description-Content-Type: text/markdown
 
 # AWS SSH Utils
 
+[![Version](https://img.shields.io/pypi/v/aws-ssh-utils.svg)](https://pypi.org/project/aws-ssh-utils/)
+[![License](https://img.shields.io/pypi/l/aws-ssh-utils.svg)](#)
+[![Supported Python Versions](https://img.shields.io/pypi/pyversions/aws-ssh-utils.svg)](https://pypi.org/project/aws-ssh-utils/)
+
 ```shell
 pip install aws-ssh-utils
 

{aws_ssh_utils-0.1.1 → aws_ssh_utils-0.2.0}/README.md

@@ -1,5 +1,9 @@
 # AWS SSH Utils
 
+[![Version](https://img.shields.io/pypi/v/aws-ssh-utils.svg)](https://pypi.org/project/aws-ssh-utils/)
+[![License](https://img.shields.io/pypi/l/aws-ssh-utils.svg)](#)
+[![Supported Python Versions](https://img.shields.io/pypi/pyversions/aws-ssh-utils.svg)](https://pypi.org/project/aws-ssh-utils/)
+
 ```shell
 pip install aws-ssh-utils
 

aws_ssh_utils-0.2.0/aws_ssh_utils/__init__.py

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

{aws_ssh_utils-0.1.1 → aws_ssh_utils-0.2.0}/aws_ssh_utils/emr_utils.py

@@ -161,13 +161,3 @@ def get_emr_instance_ips(
         ]
         for k, v in get_emr_instances(emr, cluster_id).items()
     }
-
-
-def get_instance_key_name(
-    emr: "EMRClient",
-    cluster_id: str,
-) -> str:
-    cluster = emr.describe_cluster(ClusterId=cluster_id)
-
-    key_name = cluster["Cluster"]["Ec2InstanceAttributes"]["Ec2KeyName"]
-    return key_name

{aws_ssh_utils-0.1.1 → aws_ssh_utils-0.2.0}/aws_ssh_utils/ssh.py

@@ -1,14 +1,18 @@
+import datetime as dt
 import logging
 import os
+import subprocess
 import sys
 import textwrap
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from hashlib import sha1
 from typing import TYPE_CHECKING
 
 import boto3
 import click
 import click_spinner
 import paramiko
+import paramiko.pkey
 import questionary
 from botocore.exceptions import ClientError
 from environs import Env
@@ -17,7 +21,6 @@ from loguru import logger
 from .emr_utils import (
     IP,
     get_emr_instance_ips,
-    get_instance_key_name,
     prompt_for_emr_cluster,
     prompt_for_emr_instance_group,
 )
@@ -28,6 +31,7 @@ if TYPE_CHECKING:
     from mypy_boto3_emr import EMRClient
 
 Env().read_env()  # Load .env file
+OPKSSH_PROVIDER_TAG = 'opkssh_provider'
 
 
 class ShellError(Exception):
@@ -248,13 +252,6 @@ def emr_ssh_all(
             exit(1)
 
 
-@cli.command('test')
-def test(**kwargs):
-    tmux('new-session -d -s "test" -n "window 1" "echo hello && $SHELL -i"')
-    tmux('new-window -n "window 2" -t "test:" "echo hello && $SHELL -i"')
-    tmux('switch-client -t "test:window 1"')
-
-
 @dataclass
 class SSHShell:
     hostname: str
@@ -262,6 +259,17 @@ class SSHShell:
     key_filename: str
     terminal_title: str = None
 
+    private_key: paramiko.PKey = field(init=False)
+
+    def __post_init__(self):
+        if not os.path.isfile(self.key_filename):
+            raise ValueError(f'File {self.key_filename} does not exist')
+
+        self.private_key = paramiko.PKey.from_path(self.key_filename)
+        public_key_path = f'{self.key_filename}.pub'
+        if os.path.isfile(public_key_path):
+            self.private_key.load_certificate(public_key_path)
+
     def connect(self):
         self._open()
         self._launch()
@@ -278,7 +286,11 @@ class SSHShell:
         ssh_client.load_host_keys(host_key_path)
         ssh_client.set_missing_host_key_policy(ConfirmAddPolicy())
         try:
-            ssh_client.connect(hostname=self.hostname, username=self.username, key_filename=self.key_filename)
+            ssh_client.connect(
+                hostname=self.hostname,
+                username=self.username,
+                pkey=self.private_key,
+            )
         except paramiko.BadHostKeyException as e:
             error_message = f'''
                 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@@ -359,8 +371,18 @@ def get_ec2_ssh_options(
     key_file: str = None
 ) -> tuple[str, str, str, str]:
     instance = prompt_for_ec2_instance(b3s)
+    instance_tags = {
+        tag['Key'].lower(): tag['Value']
+        for tag in instance.tags
+    }
+
     if key_file is None:
-        key_file = try_to_find_ssh_key_file(instance.key_name)
+        # Support https://github.com/openpubkey/opkssh via tags
+        if OPKSSH_PROVIDER_TAG in instance_tags:
+           key_file = get_opkssh_key_file(instance_tags[OPKSSH_PROVIDER_TAG])
+
+        else:
+            key_file = try_to_find_ssh_key_file(instance.key_name)
 
     if user is None:
         logger.info('No user specified, attempting to detect required user...')
@@ -406,8 +428,17 @@ def get_emr_ssh_key_file_for_cluster(
     cluster_id: str,
 ) -> str:
     with click_spinner.spinner():
-        key_name = get_instance_key_name(emr, cluster_id)
-        key_file = try_to_find_ssh_key_file(key_name)
+        cluster = emr.describe_cluster(ClusterId=cluster_id)
+        cluster_tags = {
+            tag['Key'].lower(): tag['Value']
+            for tag in cluster['Cluster']['Tags']
+        }
+        # Support https://github.com/openpubkey/opkssh via tags
+        if OPKSSH_PROVIDER_TAG in cluster_tags:
+           key_file = get_opkssh_key_file(cluster_tags[OPKSSH_PROVIDER_TAG])
+        else:
+            key_name = cluster["Cluster"]["Ec2InstanceAttributes"]["Ec2KeyName"]
+            key_file = try_to_find_ssh_key_file(key_name)
 
     if key_file is None:
         should_continue = questionary.confirm(f'Could not find the ssh key {key_name}, would you like to continue?').unsafe_ask()
@@ -472,6 +503,23 @@ def get_ec2_name(ec2_instance: "Instance") -> str:
     return ec2_instance.instance_id
 
 
+def get_opkssh_key_file(provider: str) -> str:
+    opkssh_key_file = os.path.join(os.path.expanduser('~/.ssh/'), f'opkssh_{sha1(provider.encode()).hexdigest()}')
+
+    if os.path.exists(opkssh_key_file) and os.path.getmtime(opkssh_key_file) > dt.datetime.now().timestamp() - 86400:
+        logger.info('Found existing opkssh key')
+    else:
+        logger.info('Detected opkssh, logging in')
+        cmd = f"opkssh login --provider '{provider}' -i '{opkssh_key_file}'"
+        process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+        process.wait()
+        if process.returncode != 0:
+            logger.error('Failed to authenticate using opkssh')
+            sys.exit(process.returncode)
+
+    return opkssh_key_file
+
+
 class ConfirmAddPolicy(paramiko.client.MissingHostKeyPolicy):
     """
     Policy for automatically adding the hostname and new host key to the

{aws_ssh_utils-0.1.1 → aws_ssh_utils-0.2.0}/pyproject.toml

@@ -41,7 +41,7 @@ dependencies = [
 dynamic = ["version"]
 
 [project.urls]
-Homepage = "https://github.com/mvanderlee/aws_ssh_utils"
+Homepage = "https://github.com/mvanderlee/aws-ssh-utils"
 
 [project.scripts]
 aws_ssh = "aws_ssh_utils.ssh:cli"

aws_ssh_utils-0.1.1/aws_ssh_utils/__init__.py

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