cloudx-proxy 0.4.5__py3-none-any.whl → 0.4.6__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.4.5'
-__version_tuple__ = version_tuple = (0, 4, 5)
+__version__ = version = '0.4.6'
+__version_tuple__ = version_tuple = (0, 4, 6)

cloudx_proxy/cli.py

@@ -55,7 +55,10 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
 @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/)')
 @click.option('--1password', 'use_1password', is_flag=True, help='Use 1Password SSH agent for SSH authentication')
-def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1password: bool):
+@click.option('--instance', help='EC2 instance ID to set up connection for')
+@click.option('--yes', 'non_interactive', is_flag=True, help='Non-interactive mode, use default values for all prompts')
+def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1password: bool, 
+          instance: str, non_interactive: bool):
     """Set up AWS profile, SSH keys, and configuration for CloudX.
     
     This command will:
@@ -69,6 +72,7 @@ def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1passwo
         cloudx-proxy setup --profile myprofile --ssh-key mykey
         cloudx-proxy setup --ssh-config ~/.ssh/cloudx/config
         cloudx-proxy setup --1password
+        cloudx-proxy setup --instance i-0123456789abcdef0 --yes
     """
     try:
         setup = CloudXSetup(
@@ -76,7 +80,9 @@ def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1passwo
             ssh_key=ssh_key, 
             ssh_config=ssh_config, 
             aws_env=aws_env,
-            use_1password=use_1password
+            use_1password=use_1password,
+            instance_id=instance,
+            non_interactive=non_interactive
         )
         
         print("\n\033[1;95m=== cloudx-proxy Setup ===\033[0m\n")
@@ -91,8 +97,13 @@ def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1passwo
         
         # Get environment and instance details
         cloudx_env = setup.prompt("Enter environment", getattr(setup, 'default_env', None))
-        instance_id = setup.prompt("Enter EC2 instance ID (e.g., i-0123456789abcdef0)")
-        hostname = setup.prompt("Enter hostname for the instance")
+        
+        # Use the --instance parameter if provided, otherwise prompt
+        instance_id = instance or setup.prompt("Enter EC2 instance ID (e.g., i-0123456789abcdef0)")
+        
+        # Generate a default hostname based on instance ID if we're in non-interactive mode
+        hostname_default = f"instance-{instance_id[-7:]}" if non_interactive else None
+        hostname = setup.prompt("Enter hostname for the instance", hostname_default)
         
         # Set up SSH config
         if not setup.setup_ssh_config(cloudx_env, instance_id, hostname):

cloudx_proxy/setup.py

@@ -10,8 +10,12 @@ from botocore.exceptions import ClientError
 from ._1password import check_1password_cli, check_ssh_agent, list_ssh_keys, create_ssh_key, get_vaults, save_public_key
 
 class CloudXSetup:
+    # Define SSH key prefix as a constant
+    SSH_KEY_PREFIX = "cloudX SSH Key - "
+    
     def __init__(self, profile: str = "vscode", ssh_key: str = "vscode", ssh_config: str = None, 
-                 aws_env: str = None, use_1password: bool = False):
+                 aws_env: str = None, use_1password: bool = False, instance_id: str = None, 
+                 non_interactive: bool = False):
         """Initialize cloudx-proxy setup.
         
         Args:
@@ -20,11 +24,15 @@ class CloudXSetup:
             ssh_config: SSH config file path (default: None, uses ~/.ssh/vscode/config)
             aws_env: AWS environment directory (default: None)
             use_1password: Use 1Password SSH agent for authentication (default: False)
+            instance_id: EC2 instance ID to set up connection for (optional)
+            non_interactive: Non-interactive mode, use defaults for all prompts (default: False)
         """
         self.profile = profile
         self.ssh_key = ssh_key
         self.aws_env = aws_env
         self.use_1password = use_1password
+        self.instance_id = instance_id
+        self.non_interactive = non_interactive
         self.home_dir = str(Path.home())
         self.onepassword_agent_sock = Path(self.home_dir) / ".1password" / "agent.sock"
         
@@ -74,6 +82,16 @@ class CloudXSetup:
         Returns:
             str: User's input or default value
         """
+        # In non-interactive mode, always use the default value
+        if self.non_interactive:
+            if default:
+                self.print_status(f"{message}: Using default [{default}]", None, 2)
+                return default
+            else:
+                self.print_status(f"{message}: No default value available", False, 2)
+                raise ValueError(f"Non-interactive mode requires default value for: {message}")
+        
+        # Interactive prompt
         if default:
             prompt_text = f"\033[93m{message} [{default}]: \033[0m"
         else:
@@ -200,38 +218,14 @@ class CloudXSetup:
             bool: True if successful
         """
         try:
-            # Get vaults to determine where to store the key
-            vaults = get_vaults()
-            if not vaults:
-                self.print_status("No 1Password vaults found", False, 2)
-                return False
-            
-            # Display available vaults
-            self.print_status("Creating a new SSH key in 1Password", None, 2)
-            print("\n\033[96mAvailable 1Password vaults:\033[0m")
-            for i, vault in enumerate(vaults):
-                print(f"  {i+1}. {vault['name']}")
-            
-            # Let user select vault
-            vault_num = self.prompt("Select vault number to store SSH key", "1")
-            try:
-                vault_idx = int(vault_num) - 1
-                if vault_idx < 0 or vault_idx >= len(vaults):
-                    self.print_status("Invalid vault number", False, 2)
-                    return False
-                selected_vault = vaults[vault_idx]['id']
-            except ValueError:
-                self.print_status("Invalid input", False, 2)
-                return False
-            
             # Create possible title variations for the 1Password item
-            ssh_key_title_with_prefix = f"cloudX SSH Key - {self.ssh_key}"
+            ssh_key_title_with_prefix = f"{self.SSH_KEY_PREFIX}{self.ssh_key}"
             ssh_key_title_without_prefix = self.ssh_key
             
-            # Check if a key with either title exists in 1Password
+            # First check if key exists in any vault
             ssh_keys = list_ssh_keys()
             
-            # First check for our prefixed format, then for a plain key with the same name
+            # Check for both prefixed and non-prefixed format
             existing_key = next((key for key in ssh_keys if key['title'] == ssh_key_title_with_prefix), None)
             if not existing_key:
                 existing_key = next((key for key in ssh_keys if key['title'] == ssh_key_title_without_prefix), None)
@@ -253,25 +247,56 @@ class CloudXSetup:
                     if save_public_key(public_key, f"{self.ssh_key_file}.pub"):
                         self.print_status(f"Saved existing public key to {self.ssh_key_file}.pub", True, 2)
                         return True
-            else:
-                # Create a new SSH key in 1Password
-                self.print_status(f"Creating new SSH key '{ssh_key_title_with_prefix}' in 1Password...", None, 2)
-                success, public_key, item_id = create_ssh_key(ssh_key_title_with_prefix, selected_vault)
-                
-                if not success:
-                    self.print_status("Failed to create SSH key in 1Password", False, 2)
-                    return False
-                
-                self.print_status("SSH key created successfully in 1Password", True, 2)
-                
-                # Save the public key to the expected location
-                if save_public_key(public_key, f"{self.ssh_key_file}.pub"):
-                    self.print_status(f"Saved public key to {self.ssh_key_file}.pub", True, 2)
-                    return True
+                    else:
+                        self.print_status(f"Failed to save public key to {self.ssh_key_file}.pub", False, 2)
+                        return False
                 else:
-                    self.print_status(f"Failed to save public key to {self.ssh_key_file}.pub", False, 2)
+                    self.print_status(f"Failed to retrieve public key from 1Password", False, 2)
                     return False
             
+            # If we reach here, the key doesn't exist and we need to create it
+            # Get vaults to determine where to store the key
+            vaults = get_vaults()
+            if not vaults:
+                self.print_status("No 1Password vaults found", False, 2)
+                return False
+            
+            # Display available vaults
+            self.print_status("Creating a new SSH key in 1Password", None, 2)
+            print("\n\033[96mAvailable 1Password vaults:\033[0m")
+            for i, vault in enumerate(vaults):
+                print(f"  {i+1}. {vault['name']}")
+            
+            # Let user select vault
+            vault_num = self.prompt("Select vault number to store SSH key", "1")
+            try:
+                vault_idx = int(vault_num) - 1
+                if vault_idx < 0 or vault_idx >= len(vaults):
+                    self.print_status("Invalid vault number", False, 2)
+                    return False
+                selected_vault = vaults[vault_idx]['id']
+            except ValueError:
+                self.print_status("Invalid input", False, 2)
+                return False
+                
+            # Create a new SSH key in 1Password
+            self.print_status(f"Creating new SSH key '{ssh_key_title_with_prefix}' in 1Password...", None, 2)
+            success, public_key, item_id = create_ssh_key(ssh_key_title_with_prefix, selected_vault)
+            
+            if not success:
+                self.print_status("Failed to create SSH key in 1Password", False, 2)
+                return False
+            
+            self.print_status("SSH key created successfully in 1Password", True, 2)
+            
+            # Save the public key to the expected location
+            if save_public_key(public_key, f"{self.ssh_key_file}.pub"):
+                self.print_status(f"Saved public key to {self.ssh_key_file}.pub", True, 2)
+                return True
+            else:
+                self.print_status(f"Failed to save public key to {self.ssh_key_file}.pub", False, 2)
+                return False
+            
             # Remind user to enable the key in 1Password SSH agent
             self.print_status("\033[93mImportant: Make sure the key is enabled in 1Password's SSH agent settings\033[0m", None, 2)
             return True

{cloudx_proxy-0.4.5.dist-info → cloudx_proxy-0.4.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudx-proxy
-Version: 0.4.5
+Version: 0.4.6
 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.4.6.dist-info/RECORD

@@ -0,0 +1,12 @@
+cloudx_proxy/_1password.py,sha256=uxyCfVvO1eQrOfYRojst_LN2DV4fIwxM5moaQTn3wQY,5853
+cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
+cloudx_proxy/_version.py,sha256=KTwoycq1UXsZO5AtXG8jzeyeaE1ORqxkwO9Pn0qrlwg,511
+cloudx_proxy/cli.py,sha256=VqYdcTn_PC-mhcCpNEa_PcpHjV7vxIDzhfxu-WKlDdU,4904
+cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
+cloudx_proxy/setup.py,sha256=QrInbZdghpAYn064h02KmpA9r-nEbVm-LyTcXLxSmXY,39823
+cloudx_proxy-0.4.6.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.4.6.dist-info/METADATA,sha256=LV5xMR7w2qrmcID563IlI83R7X2SOxzcRo_qKLbBa9k,18522
+cloudx_proxy-0.4.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+cloudx_proxy-0.4.6.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.4.6.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.4.6.dist-info/RECORD,,

cloudx_proxy-0.4.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-cloudx_proxy/_1password.py,sha256=uxyCfVvO1eQrOfYRojst_LN2DV4fIwxM5moaQTn3wQY,5853
-cloudx_proxy/__init__.py,sha256=ZZ2O_m9OFJm18AxMSuYJt4UjSuSqyJlYRaZMoets498,61
-cloudx_proxy/_version.py,sha256=YrJwLVAkXjdo87YWYyrI7_B7BOSjbDIJ_FAFmb7g_vc,511
-cloudx_proxy/cli.py,sha256=5IcfYFACUOa4pqSKuHucqZionI9P8n5ZLvtzyXYeTvw,4218
-cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
-cloudx_proxy/setup.py,sha256=TMFSo3-RusvQ5G7_I0vUPtZG18yDnogQbRDxGxVtNnM,38632
-cloudx_proxy-0.4.5.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.4.5.dist-info/METADATA,sha256=heC8F4kGgkmgSy-8SdqpgsKsGZ27N3xNkZI8wR3nogw,18522
-cloudx_proxy-0.4.5.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-cloudx_proxy-0.4.5.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.4.5.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.4.5.dist-info/RECORD,,