cloudx-proxy 0.3.14__py3-none-any.whl → 0.3.15__py3-none-any.whl

cloudx_proxy/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.14'
-__version_tuple__ = version_tuple = (0, 3, 14)
+__version__ = version = '0.3.15'
+__version_tuple__ = version_tuple = (0, 3, 15)

cloudx_proxy/cli.py

@@ -17,8 +17,9 @@ def cli():
 @click.option('--profile', default='vscode', help='AWS profile to use (default: vscode)')
 @click.option('--region', help='AWS region (default: from profile, or eu-west-1 if not set)')
 @click.option('--ssh-key', default='vscode', help='SSH key name to use (default: vscode)')
+@click.option('--ssh-config', help='SSH config file to use (default: ~/.ssh/vscode/config)')
 @click.option('--aws-env', help='AWS environment directory (default: ~/.aws, use name of directory in ~/.aws/aws-envs/)')
-def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str, aws_env: str):
+def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str, ssh_config: str, aws_env: str):
     """Connect to an EC2 instance via SSM.
     
     INSTANCE_ID is the EC2 instance ID to connect to (e.g., i-0123456789abcdef0)
@@ -35,6 +36,7 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
             profile=profile,
             region=region,
             ssh_key=ssh_key,
+            ssh_config=ssh_config,
             aws_env=aws_env
         )
         
@@ -48,8 +50,9 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
 @cli.command()
 @click.option('--profile', default='vscode', help='AWS profile to use (default: vscode)')
 @click.option('--ssh-key', default='vscode', help='SSH key name to use (default: vscode)')
+@click.option('--ssh-config', help='SSH config file to use (default: ~/.ssh/vscode/config)')
 @click.option('--aws-env', help='AWS environment directory (default: ~/.aws, use name of directory in ~/.aws/aws-envs/)')
-def setup(profile: str, ssh_key: str, aws_env: str):
+def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str):
     """Set up AWS profile, SSH keys, and configuration for CloudX.
     
     This command will:
@@ -61,9 +64,10 @@ def setup(profile: str, ssh_key: str, aws_env: str):
     Example usage:
         cloudx-proxy setup
         cloudx-proxy setup --profile myprofile --ssh-key mykey
+        cloudx-proxy setup --ssh-config ~/.ssh/cloudx/config
     """
     try:
-        setup = CloudXSetup(profile=profile, ssh_key=ssh_key, aws_env=aws_env)
+        setup = CloudXSetup(profile=profile, ssh_key=ssh_key, ssh_config=ssh_config, aws_env=aws_env)
         
         print("\n\033[1;95m=== cloudx-proxy Setup ===\033[0m\n")
         

cloudx_proxy/core.py

@@ -7,7 +7,7 @@ from botocore.exceptions import ClientError
 
 class CloudXProxy:
     def __init__(self, instance_id: str, port: int = 22, profile: str = "vscode", 
-                 region: str = None, ssh_key: str = "vscode", aws_env: str = None):
+                 region: str = None, ssh_key: str = "vscode", ssh_config: str = None, aws_env: str = None):
         """Initialize CloudX client for SSH tunneling via AWS SSM.
         
         Args:
@@ -39,8 +39,14 @@ class CloudXProxy:
         self.ec2 = self.session.client('ec2')
         self.ec2_connect = self.session.client('ec2-instance-connect')
         
-        # Set up SSH key path
-        self.ssh_dir = os.path.expanduser("~/.ssh/vscode")
+        # Set up SSH configuration and key paths
+        if ssh_config:
+            self.ssh_config_file = os.path.expanduser(ssh_config)
+            self.ssh_dir = os.path.dirname(self.ssh_config_file)
+        else:
+            self.ssh_dir = os.path.expanduser("~/.ssh/vscode")
+            self.ssh_config_file = os.path.join(self.ssh_dir, "config")
+            
         self.ssh_key = os.path.join(self.ssh_dir, f"{ssh_key}.pub")
 
     def log(self, message: str) -> None:

cloudx_proxy/setup.py

@@ -9,20 +9,28 @@ import boto3
 from botocore.exceptions import ClientError
 
 class CloudXSetup:
-    def __init__(self, profile: str = "vscode", ssh_key: str = "vscode", aws_env: str = None):
+    def __init__(self, profile: str = "vscode", ssh_key: str = "vscode", ssh_config: str = None, aws_env: str = None):
         """Initialize cloudx-proxy setup.
         
         Args:
             profile: AWS profile name (default: "vscode")
             ssh_key: SSH key name (default: "vscode")
+            ssh_config: SSH config file path (default: None, uses ~/.ssh/vscode/config)
             aws_env: AWS environment directory (default: None)
         """
         self.profile = profile
         self.ssh_key = ssh_key
         self.aws_env = aws_env
         self.home_dir = str(Path.home())
-        self.ssh_dir = Path(self.home_dir) / ".ssh" / "vscode"
-        self.ssh_config_file = self.ssh_dir / "config"
+        
+        # Set up ssh config paths based on provided config or default
+        if ssh_config:
+            self.ssh_config_file = Path(os.path.expanduser(ssh_config))
+            self.ssh_dir = self.ssh_config_file.parent
+        else:
+            self.ssh_dir = Path(self.home_dir) / ".ssh" / "vscode"
+            self.ssh_config_file = self.ssh_dir / "config"
+        
         self.ssh_key_file = self.ssh_dir / f"{ssh_key}"
         self.default_env = None
 
@@ -330,8 +338,10 @@ Host cloudx-{cloudx_env}-{hostname}
                 if f"Host cloudx-{cloudx_env}-*" in current_config:
                     self.print_status(f"Found existing config for cloudx-{cloudx_env}-*", True, 2)
                     choice = self.prompt(
-                        "Would you like to \n  1: override the existing config\n "
-                        "  2: add settings to the specific host entry?\nSelect an option ",
+                        "Would you like to \n"
+                        "  1: override the existing config\n"
+                        "  2: add settings to the specific host entry?\n"
+                        "Select an option",
                         "1"
                     )
                     if choice == "2":
@@ -358,6 +368,7 @@ Host cloudx-{cloudx_env}-{hostname}
             # Create base config
             self.print_status(f"Creating new config for cloudx-{cloudx_env}-*", None, 2)
             # Build ProxyCommand with only non-default parameters
+            # We don't need to include ssh_config here as SSH will handle that through the config
             proxy_command = "uvx cloudx-proxy connect %h %p"
             if self.profile != "vscode":
                 proxy_command += f" --profile {self.profile}"
@@ -420,7 +431,9 @@ Host cloudx-{cloudx_env}-{hostname}
                 f.write(host_entry)
             self.print_status("Host entry added", True, 2)
 
-            # Ensure main SSH config includes our config
+            # Handle system SSH config integration
+            system_config_path = Path(self.home_dir) / ".ssh" / "config"
+            
             # Ensure ~/.ssh directory has proper permissions
             ssh_parent_dir = Path(self.home_dir) / ".ssh"
             if not ssh_parent_dir.exists():
@@ -428,36 +441,41 @@ Host cloudx-{cloudx_env}-{hostname}
                 self.print_status(f"Created SSH directory: {ssh_parent_dir}", True, 2)
             self._set_directory_permissions(ssh_parent_dir)
             
-            main_config = Path(self.home_dir) / ".ssh" / "config"
-            include_line = f"Include {self.ssh_config_file}\n"
-            
-            if main_config.exists():
-                content = main_config.read_text()
-                if include_line not in content:
-                    with open(main_config, 'a') as f:
-                        f.write(f"\n{include_line}")
-                    self.print_status("Added include line to main SSH config", True, 2)
-                else:
-                    self.print_status("Main SSH config already includes our config", True, 2)
-                
-                # Set correct permissions on main config file
-                if platform.system() != 'Windows':
-                    import stat
-                    main_config.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
-                    self.print_status("Set main config file permissions to 600", True, 2)
+            # If our config file is the system config, we're done
+            if self.ssh_config_file.samefile(system_config_path) if self.ssh_config_file.exists() and system_config_path.exists() else str(self.ssh_config_file) == str(system_config_path):
+                self.print_status("Using system SSH config directly, no Include needed", True, 2)
             else:
-                main_config.write_text(include_line)
-                self.print_status("Created main SSH config with include line", True, 2)
+                # Otherwise, make sure the system config includes our config file
+                include_line = f"Include {self.ssh_config_file}\n"
                 
-                # Set correct permissions on newly created main config file
-                if platform.system() != 'Windows':
-                    import stat
-                    main_config.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
-                    self.print_status("Set main config file permissions to 600", True, 2)
+                if system_config_path.exists():
+                    content = system_config_path.read_text()
+                    if include_line not in content:
+                        with open(system_config_path, 'a') as f:
+                            f.write(f"\n{include_line}")
+                        self.print_status("Added include line to system SSH config", True, 2)
+                    else:
+                        self.print_status("System SSH config already includes our config", True, 2)
+                    
+                    # Set correct permissions on system config file
+                    if platform.system() != 'Windows':
+                        import stat
+                        system_config_path.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
+                        self.print_status("Set system config file permissions to 600", True, 2)
+                else:
+                    system_config_path.write_text(include_line)
+                    self.print_status("Created system SSH config with include line", True, 2)
+                    
+                    # Set correct permissions on newly created system config file
+                    if platform.system() != 'Windows':
+                        import stat
+                        system_config_path.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 600 permissions
+                        self.print_status("Set system config file permissions to 600", True, 2)
 
             self.print_status("SSH configuration summary:", None)
-            self.print_status(f"Main config: {main_config}", None, 2)
+            self.print_status(f"System config: {system_config_path}", None, 2)
             self.print_status(f"cloudx-proxy config: {self.ssh_config_file}", None, 2)
+            self.print_status(f"SSH key directory: {self.ssh_dir}", None, 2)
             self.print_status(f"Connect using: ssh cloudx-{cloudx_env}-{hostname}", None, 2)
             
             return True

{cloudx_proxy-0.3.14.dist-info → cloudx_proxy-0.3.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudx-proxy
-Version: 0.3.14
+Version: 0.3.15
 Summary: SSH proxy command to connect VSCode with Cloud9/CloudX instance using AWS Systems Manager
 Author-email: easytocloud <info@easytocloud.com>
 License: MIT License

cloudx_proxy-0.3.15.dist-info/RECORD

@@ -0,0 +1,11 @@
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=HSn5cGZLA_vnXREa9sRtSYCA5Ii9CJlQbi1YMzsfUGM,513
+cloudx_proxy/cli.py,sha256=tP-Ftf2VNKtaiu26x5nDKCMZOPKoa4XCNDd5-okoE4s,3827
+cloudx_proxy/core.py,sha256=iHloywyiDcWRXzFxgX0TdcOPHujW2u83WUMllk4m9Es,7588
+cloudx_proxy/setup.py,sha256=zZMMGAAQMqXlfVJ8_M4f5-SEcYqsFQ82kQv18ikdta0,25409
+cloudx_proxy-0.3.15.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.3.15.dist-info/METADATA,sha256=qOT0s-RuqhXnU69PHxWELyeBKNgluZyHpO-R6O5d2q8,14038
+cloudx_proxy-0.3.15.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+cloudx_proxy-0.3.15.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.3.15.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.3.15.dist-info/RECORD,,

cloudx_proxy-0.3.14.dist-info/RECORD

@@ -1,11 +0,0 @@
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=dAYECGus8vEags4_X66QYJmiBFCY-yJJXDyexsFv72w,513
-cloudx_proxy/cli.py,sha256=7wi00p5CUl0Dt8huMEkP85SWgA_vzcoCzch0wctvqHk,3488
-cloudx_proxy/core.py,sha256=XQbVlPaqQQ352Ao_JJlN-PpqIdQtSBec0lNRB1s0JSk,7288
-cloudx_proxy/setup.py,sha256=Ing3UnTG_zeMZAcNI3SQbmTJzrY1UWUHUbu6UT14lao,24178
-cloudx_proxy-0.3.14.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.3.14.dist-info/METADATA,sha256=qvR4_o1puGZ2WNjb0Y5GLW8Ff2aX_IH7k8YPZx9-ORM,14038
-cloudx_proxy-0.3.14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-cloudx_proxy-0.3.14.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.3.14.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.3.14.dist-info/RECORD,,