cloudx-proxy 0.8.4__py3-none-any.whl → 0.9.0__py3-none-any.whl

cloudx_proxy/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.8.4'
-__version_tuple__ = version_tuple = (0, 8, 4)
+__version__ = version = '0.9.0'
+__version_tuple__ = version_tuple = (0, 9, 0)
 
 __commit_id__ = commit_id = None

cloudx_proxy/cli.py

@@ -31,7 +31,8 @@ Main commands:
 @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, ssh_config: str, aws_env: str):
+@click.option('--dry-run', is_flag=True, help='Preview connection workflow without executing')
+def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str, ssh_config: str, aws_env: str, dry_run: bool):
     """Connect to an EC2 instance via SSM.
     
     INSTANCE_ID is the EC2 instance ID to connect to (e.g., i-0123456789abcdef0)
@@ -52,7 +53,8 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
             region=region,
             ssh_key=ssh_key,
             ssh_config=ssh_config,
-            aws_env=aws_env
+            aws_env=aws_env,
+            dry_run=dry_run
         )
         
         client.log(f"cloudx-proxy@{__version__} Connecting to instance {instance_id} on port {port}...")
@@ -73,8 +75,9 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
 @click.option('--instance', help='EC2 instance ID to set up connection for')
 @click.option('--hostname', help='Hostname to use for SSH configuration')
 @click.option('--yes', 'non_interactive', is_flag=True, help='Non-interactive mode, use default values for all prompts')
+@click.option('--dry-run', is_flag=True, help='Preview setup changes without executing')
 def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1password: str, 
-          instance: str, hostname: str, non_interactive: bool):
+          instance: str, hostname: str, non_interactive: bool, dry_run: bool):
     """Set up AWS profile, SSH keys, and configuration for CloudX.
     
     \b
@@ -103,10 +106,14 @@ def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1passwo
             aws_env=aws_env,
             use_1password=use_1password,
             instance_id=instance,
-            non_interactive=non_interactive
+            non_interactive=non_interactive,
+            dry_run=dry_run
         )
         
-        print("\n\033[1;95m=== cloudx-proxy Setup ===\033[0m\n")
+        if dry_run:
+            print("\n\033[1;95m=== cloudx-proxy Setup (DRY RUN) ===\033[0m\n")
+        else:
+            print("\n\033[1;95m=== cloudx-proxy Setup ===\033[0m\n")
         
         # Set up AWS profile
         if not setup.setup_aws_profile():
@@ -147,7 +154,8 @@ def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1passwo
 @click.option('--ssh-config', help='SSH config file to use (default: ~/.ssh/vscode/config)')
 @click.option('--environment', help='Filter hosts by environment (e.g., dev, prod)')
 @click.option('--detailed', is_flag=True, help='Show detailed information including instance IDs')
-def list(ssh_config: str, environment: str, detailed: bool):
+@click.option('--dry-run', is_flag=True, help='Preview list output format')
+def list(ssh_config: str, environment: str, detailed: bool, dry_run: bool):
     """List configured cloudx-proxy SSH hosts.
     
     This command parses the SSH configuration file and displays all configured cloudx-proxy hosts.
@@ -168,6 +176,16 @@ def list(ssh_config: str, environment: str, detailed: bool):
         else:
             config_file = Path(os.path.expanduser("~/.ssh/vscode/config"))
         
+        if dry_run:
+            print(f"\n\033[1;95m=== cloudx-proxy List (DRY RUN) ===\033[0m\n")
+            print(f"[DRY RUN] Would read SSH config from: {config_file}")
+            if environment:
+                print(f"[DRY RUN] Would filter hosts by environment: {environment}")
+            if detailed:
+                print(f"[DRY RUN] Would show detailed information including instance IDs")
+            print(f"[DRY RUN] Would parse SSH configuration and display grouped hosts")
+            return
+        
         if not config_file.exists():
             print(f"SSH config file not found: {config_file}")
             print("Run 'cloudx-proxy setup' to create a configuration.")

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", ssh_config: str = None, aws_env: str = None):
+                 region: str = None, ssh_key: str = "vscode", ssh_config: str = None, aws_env: str = None, dry_run: bool = False):
         """Initialize CloudX client for SSH tunneling via AWS SSM.
         
         Args:
@@ -17,10 +17,12 @@ class CloudXProxy:
             region: AWS region (default: from profile)
             ssh_key: SSH key name to use (default: "vscode")
             aws_env: AWS environment directory (default: None, uses ~/.aws)
+            dry_run: Preview mode, show what would be done without executing (default: False)
         """
         self.instance_id = instance_id
         self.port = port
         self.profile = profile
+        self.dry_run = dry_run
         
         # Configure AWS environment
         if aws_env:
@@ -28,17 +30,25 @@ class CloudXProxy:
             os.environ["AWS_CONFIG_FILE"] = os.path.join(aws_env_dir, "config")
             os.environ["AWS_SHARED_CREDENTIALS_FILE"] = os.path.join(aws_env_dir, "credentials")
         
-        # Set up AWS session with eu-west-1 as default region
-        if not region:
-            # Try to get region from profile first
-            session = boto3.Session(profile_name=profile)
-            region = session.region_name or 'eu-west-1'
-        
-        self.session = boto3.Session(profile_name=profile, region_name=region)
-        self.ssm = self.session.client('ssm')
-        self.ec2 = self.session.client('ec2')
-        self.ec2_connect = self.session.client('ec2-instance-connect')
-        
+        # Set up AWS session with eu-west-1 as default region (skip in dry-run mode)
+        if not self.dry_run:
+            if not region:
+                # Try to get region from profile first
+                session = boto3.Session(profile_name=profile)
+                region = session.region_name or 'eu-west-1'
+            
+            self.session = boto3.Session(profile_name=profile, region_name=region)
+            self.ssm = self.session.client('ssm')
+            self.ec2 = self.session.client('ec2')
+            self.ec2_connect = self.session.client('ec2-instance-connect')
+        else:
+            self.session = None
+            self.ssm = None
+            self.ec2 = None
+            self.ec2_connect = None
+            if not region:
+                region = 'eu-west-1'  # Default for dry-run display
+        self.region = region
         # Set up SSH configuration and key paths
         if ssh_config:
             self.ssh_config_file = os.path.expanduser(ssh_config)
@@ -55,6 +65,9 @@ class CloudXProxy:
 
     def get_instance_status(self) -> str:
         """Check if instance is online in SSM."""
+        if self.dry_run:
+            return 'Online'  # Simulate online status for dry-run
+            
         try:
             response = self.ssm.describe_instance_information(
                 Filters=[{'Key': 'InstanceIds', 'Values': [self.instance_id]}]
@@ -67,6 +80,10 @@ class CloudXProxy:
 
     def start_instance(self) -> bool:
         """Start the EC2 instance if it's stopped."""
+        if self.dry_run:
+            self.log(f"[DRY RUN] Would start EC2 instance: {self.instance_id}")
+            return True
+            
         try:
             self.ec2.start_instances(InstanceIds=[self.instance_id])
             return True
@@ -84,6 +101,10 @@ class CloudXProxy:
         Returns:
             bool: True if instance came online, False if timeout
         """
+        if self.dry_run:
+            self.log(f"[DRY RUN] Would wait for instance to come online (max {max_attempts * delay} seconds)")
+            return True
+            
         for _ in range(max_attempts):
             if self.get_instance_status() == 'Online':
                 return True
@@ -96,6 +117,14 @@ class CloudXProxy:
         Determines which SSH key to use (regular key or 1Password-managed key),
         then pushes the correct public key to the instance.
         """
+        if self.dry_run:
+            key_path = self.ssh_key
+            if not key_path.endswith('.pub'):
+                key_path += '.pub'
+            self.log(f"[DRY RUN] Would push SSH public key: {key_path}")
+            self.log(f"[DRY RUN] Would send key to instance {self.instance_id} as ec2-user")
+            return True
+            
         try:
             # Check if file exists with .pub extension (could be a non-1Password key)
             # or if the .pub extension is already part of self.ssh_key (because of 1Password integration)
@@ -129,6 +158,12 @@ class CloudXProxy:
         2. Only use stderr for logging
         3. Let the session manager plugin handle the actual data transfer
         """
+        if self.dry_run:
+            region = self.region or 'eu-west-1'  # Use initialized region or default
+            self.log(f"[DRY RUN] Would start SSM session with SSH port forwarding")
+            self.log(f"[DRY RUN] Would run: aws ssm start-session --target {self.instance_id} --document-name AWS-StartSSHSession --parameters portNumber={self.port} --profile {self.profile} --region {region}")
+            return
+            
         import subprocess
         import platform
         
@@ -185,6 +220,15 @@ class CloudXProxy:
         3. Push SSH key
         4. Start SSM session
         """
+        if self.dry_run:
+            self.log(f"[DRY RUN] Connection workflow preview:")
+            self.log(f"[DRY RUN] Would check instance status: {self.instance_id}")
+            self.log(f"[DRY RUN] Would start instance if stopped")
+            self.log(f"[DRY RUN] Would wait for instance to come online")
+            self.log(f"[DRY RUN] Would push SSH key to instance")
+            self.log(f"[DRY RUN] Would start SSM session with port forwarding 22 -> localhost:22")
+            return True
+            
         status = self.get_instance_status()
         
         if status != 'Online':

cloudx_proxy/setup.py

@@ -15,7 +15,7 @@ class CloudXSetup:
     
     def __init__(self, profile: str = "vscode", ssh_key: str = "vscode", ssh_config: str = None, 
                  aws_env: str = None, use_1password: str = None, instance_id: str = None, 
-                 non_interactive: bool = False):
+                 non_interactive: bool = False, dry_run: bool = False):
         """Initialize cloudx-proxy setup.
         
         Args:
@@ -26,6 +26,7 @@ class CloudXSetup:
             use_1password: Use 1Password SSH agent for authentication. Can be True/False or a vault name (default: None)
             instance_id: EC2 instance ID to set up connection for (optional)
             non_interactive: Non-interactive mode, use defaults for all prompts (default: False)
+            dry_run: Preview mode, show what would be done without executing (default: False)
         """
         self.profile = profile
         self.ssh_key = ssh_key
@@ -43,6 +44,7 @@ class CloudXSetup:
             self.op_vault = use_1password
         self.instance_id = instance_id
         self.non_interactive = non_interactive
+        self.dry_run = dry_run
         self.home_dir = str(Path.home())
         self.onepassword_agent_sock = Path(self.home_dir) / ".1password" / "agent.sock"
         
@@ -134,6 +136,13 @@ class CloudXSetup:
         Returns:
             bool: True if profile was set up successfully or user chose to continue
         """
+        if self.dry_run:
+            self.print_status(f"[DRY RUN] Would check AWS profile configuration for '{self.profile}'")
+            if self.aws_env:
+                self.print_status(f"[DRY RUN] Would configure AWS environment: {self.aws_env}", None, 2)
+            self.print_status(f"[DRY RUN] Would verify AWS credentials and extract cloudX environment", None, 2)
+            return True
+            
         self.print_status("Checking AWS profile configuration...")
         
         try:
@@ -362,6 +371,16 @@ class CloudXSetup:
         """
         self.print_header("SSH Key Configuration")
         
+        if self.dry_run:
+            self.print_status(f"[DRY RUN] Would check SSH key '{self.ssh_key}' configuration")
+            if self.use_1password:
+                self.print_status(f"[DRY RUN] Would use 1Password SSH agent for authentication", None, 2)
+                self.print_status(f"[DRY RUN] Would create or find SSH key in vault: {self.op_vault}", None, 2)
+            else:
+                self.print_status(f"[DRY RUN] Would create SSH key pair at: {self.ssh_key_file}", None, 2)
+                self.print_status(f"[DRY RUN] Would set proper file permissions", None, 2)
+            return True
+        
         # Check 1Password integration if requested
         if self.use_1password:
             op_available = self._check_1password_availability()
@@ -790,6 +809,15 @@ Host cloudx-{cloudx_env}-{hostname}
             bool: True if config was set up successfully
         """
         self.print_header("SSH Configuration")
+        
+        if self.dry_run:
+            self.print_status(f"[DRY RUN] Would set up SSH configuration with three-tier approach")
+            self.print_status(f"[DRY RUN] Would create generic pattern: cloudx-*", None, 2)
+            self.print_status(f"[DRY RUN] Would create environment pattern: cloudx-{cloudx_env}-*", None, 2)
+            self.print_status(f"[DRY RUN] Would create host entry: cloudx-{cloudx_env}-{hostname} -> {instance_id}", None, 2)
+            self.print_status(f"[DRY RUN] Would write configuration to: {self.ssh_config_file}", None, 2)
+            return True
+        
         self.print_status("Setting up SSH configuration with three-tier approach...")
         
         try:
@@ -953,6 +981,12 @@ Host cloudx-{cloudx_env}-{hostname}
         """
         self.print_header("Instance Access Check")
         
+        if self.dry_run:
+            self.print_status(f"[DRY RUN] Would check instance accessibility for: {hostname}")
+            self.print_status(f"[DRY RUN] Would test connection to instance: {instance_id}", None, 2)
+            self.print_status(f"[DRY RUN] Would wait up to 5 minutes for SSH access if needed", None, 2)
+            return True
+        
         if self.check_instance_setup(instance_id, hostname, cloudx_env):
             return True
             

{cloudx_proxy-0.8.4.dist-info → cloudx_proxy-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudx-proxy
-Version: 0.8.4
+Version: 0.9.0
 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.9.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+cloudx_proxy/_1password.py,sha256=uxyCfVvO1eQrOfYRojst_LN2DV4fIwxM5moaQTn3wQY,5853
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=TvxBYkx8Rz_Q1S3JFp831BRT8Wo0Yxt6TJMtgZKenTo,704
+cloudx_proxy/cli.py,sha256=DYUjhmgaUcTQlJ2FcbgoLtPJMCbETBIn0tSMDybgC0s,10932
+cloudx_proxy/core.py,sha256=f5Wrz68nZAy0QnEw3V0OAHfc0vNPX8xfAPtY8zFIL0k,10340
+cloudx_proxy/setup.py,sha256=vVM5ZVEIxudjPdZKpjXG0JKPXzgMbN4ztbkV-5XoIu0,44927
+cloudx_proxy-0.9.0.dist-info/licenses/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.9.0.dist-info/licenses/NOTICE,sha256=JH0TVxH8Nkt3_CkL2-MEiJfVGvWYZ52H5uUxEq9p7rg,3223
+cloudx_proxy-0.9.0.dist-info/METADATA,sha256=F4AmOHuQ271ymlzXMT59OLXJUrLyN84eG17I1j3LxzM,29053
+cloudx_proxy-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cloudx_proxy-0.9.0.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.9.0.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.9.0.dist-info/RECORD,,

cloudx_proxy-0.8.4.dist-info/RECORD

@@ -1,13 +0,0 @@
-cloudx_proxy/_1password.py,sha256=uxyCfVvO1eQrOfYRojst_LN2DV4fIwxM5moaQTn3wQY,5853
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=6jY56wQpNbuVX1aDDCpFgsBq74u7lloIJcrJSefeVec,704
-cloudx_proxy/cli.py,sha256=vvPxNaixGdc_hirQrHgjxrmbiFtX-ugYoHGgR0zq79w,9934
-cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
-cloudx_proxy/setup.py,sha256=CmUYr9EhtLoEpKU9jMEgxXtVMYlZTfPAJ-eQ59nr_bI,42785
-cloudx_proxy-0.8.4.dist-info/licenses/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.8.4.dist-info/licenses/NOTICE,sha256=JH0TVxH8Nkt3_CkL2-MEiJfVGvWYZ52H5uUxEq9p7rg,3223
-cloudx_proxy-0.8.4.dist-info/METADATA,sha256=5y1v_qUKTRAdn3gvgM-ARGAWDkkxb4MOXW9fHu0MgI4,29053
-cloudx_proxy-0.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cloudx_proxy-0.8.4.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.8.4.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.8.4.dist-info/RECORD,,