cloudx-proxy 0.4.10__py3-none-any.whl → 0.4.11__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.10'
-__version_tuple__ = version_tuple = (0, 4, 10)
+__version__ = version = '0.4.11'
+__version_tuple__ = version_tuple = (0, 4, 11)

cloudx_proxy/cli.py

@@ -10,7 +10,17 @@ from .setup import CloudXSetup
 @click.group()
 @click.version_option(version=__version__)
 def cli():
-    """cloudx-proxy - SSH proxy to connect VSCode Remote SSH to EC2 instances using SSM."""
+    """cloudx-proxy - SSH proxy to connect VSCode Remote SSH to EC2 instances using SSM.
+    
+    This tool enables seamless SSH connections from VSCode to EC2 instances using AWS Systems Manager,
+    eliminating the need for direct SSH access or public IP addresses.
+    
+    Main commands:
+    
+        setup     - Configure AWS profile, SSH keys, and SSH configuration
+        connect   - Connect to an EC2 instance via SSM
+        list      - List configured SSH hosts
+    """
     pass
 
 @cli.command()
@@ -27,9 +37,11 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
     INSTANCE_ID is the EC2 instance ID to connect to (e.g., i-0123456789abcdef0)
     
     Example usage:
-        cloudx-proxy i-0123456789abcdef0 22
-        cloudx-proxy i-0123456789abcdef0 22 --profile myprofile --region eu-west-1
-        cloudx-proxy i-0123456789abcdef0 22 --aws-env prod
+    
+        cloudx-proxy connect i-0123456789abcdef0 22
+        cloudx-proxy connect i-0123456789abcdef0 22 --profile myprofile --region eu-west-1
+        cloudx-proxy connect i-0123456789abcdef0 22 --ssh-config ~/.ssh/cloudx/config
+        cloudx-proxy connect i-0123456789abcdef0 22 --aws-env prod
     """
     try:
         client = CloudXProxy(
@@ -56,25 +68,28 @@ def connect(instance_id: str, port: int, profile: str, region: str, ssh_key: str
 @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/)')
-@click.option('--1password', 'use_1password', is_flag=True, help='Use 1Password SSH agent for SSH authentication')
+@click.option('--1password', 'use_1password', default=None, help='Use 1Password SSH agent for SSH authentication. Optionally specify vault name (default: "Private")')
 @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')
-def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1password: bool, 
+def setup(profile: str, ssh_key: str, ssh_config: str, aws_env: str, use_1password: str, 
           instance: str, hostname: str, non_interactive: bool):
     """Set up AWS profile, SSH keys, and configuration for CloudX.
     
     This command will:
+    
     1. Set up AWS profile with credentials
     2. Create or use existing SSH key
     3. Configure SSH for CloudX instances
     4. Check instance setup status
     
     Example usage:
+    
         cloudx-proxy setup
         cloudx-proxy setup --profile myprofile --ssh-key mykey
         cloudx-proxy setup --ssh-config ~/.ssh/cloudx/config
         cloudx-proxy setup --1password
+        cloudx-proxy setup --1password Work
         cloudx-proxy setup --instance i-0123456789abcdef0 --hostname myserver --yes
     """
     try:
@@ -136,6 +151,7 @@ def list(ssh_config: str, environment: str, detailed: bool):
     Hosts are grouped by environment for easier navigation.
     
     Example usage:
+    
         cloudx-proxy list
         cloudx-proxy list --environment dev
         cloudx-proxy list --ssh-config ~/.ssh/cloudx/config

cloudx_proxy/setup.py

@@ -14,7 +14,7 @@ class CloudXSetup:
     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, instance_id: str = None, 
+                 aws_env: str = None, use_1password: str = None, instance_id: str = None, 
                  non_interactive: bool = False):
         """Initialize cloudx-proxy setup.
         
@@ -23,14 +23,24 @@ class CloudXSetup:
             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)
-            use_1password: Use 1Password SSH agent for authentication (default: False)
+            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)
         """
         self.profile = profile
         self.ssh_key = ssh_key
         self.aws_env = aws_env
-        self.use_1password = use_1password
+        
+        # Handle 1Password integration
+        if use_1password is None:
+            self.use_1password = False
+            self.op_vault = None
+        elif isinstance(use_1password, bool) or use_1password.lower() == 'true':
+            self.use_1password = True
+            self.op_vault = "Private"  # Default vault
+        else:
+            self.use_1password = True
+            self.op_vault = use_1password
         self.instance_id = instance_id
         self.non_interactive = non_interactive
         self.home_dir = str(Path.home())
@@ -209,6 +219,13 @@ class CloudXSetup:
             return False
         
         self.print_status("1Password SSH agent is running", True, 2)
+        
+        # If using a vault other than "Private", warn the user
+        if self.op_vault and self.op_vault != "Private":
+            self.print_status(f"\033[93mWarning: Using vault '{self.op_vault}' instead of default 'Private' vault\033[0m", None, 2)
+            self.print_status("\033[93mMake sure to enable this vault for SSH in 1Password settings\033[0m", None, 2)
+            self.print_status("\033[93mBy default, only the 'Private' vault is enabled for SSH\033[0m", None, 2)
+        
         return True
 
     def _create_1password_key(self) -> bool:
@@ -261,23 +278,55 @@ class CloudXSetup:
                 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)
+            # Use the specified vault or prompt the user to select one
+            if self.op_vault:
+                # Find the vault by name
+                selected_vault = None
+                for vault in vaults:
+                    if vault['name'].lower() == self.op_vault.lower():
+                        selected_vault = vault['id']
+                        self.print_status(f"Using specified 1Password vault: {self.op_vault}", True, 2)
+                        break
+                
+                # If the specified vault wasn't found, warn the user and prompt for selection
+                if not selected_vault:
+                    self.print_status(f"Specified vault '{self.op_vault}' not found", False, 2)
+                    
+                    # Display available vaults
+                    self.print_status("Available 1Password vaults:", 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
+            else:
+                # No vault specified, prompt the user
+                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
-                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)

{cloudx_proxy-0.4.10.dist-info → cloudx_proxy-0.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: cloudx-proxy
-Version: 0.4.10
+Version: 0.4.11
 Summary: SSH proxy command to connect VSCode with Cloud9/CloudX instance using AWS Systems Manager
 Author-email: easytocloud <info@easytocloud.com>
 License: MIT License
@@ -275,7 +275,7 @@ Options:
 - `--profile` (default: vscode): AWS profile to use. The profile's IAM user should follow the format cloudX-{env}-{user}. The environment part will be used as the default environment during setup.
 - `--ssh-key` (default: vscode): Name of the SSH key to create/use. The key will be stored in the SSH config directory. This same name can be used in the connect command.
 - `--ssh-config` (optional): Path to the SSH config file to use. If specified, configuration and keys will be stored in this location. Default is ~/.ssh/vscode/config.
-- `--1password` (flag): Enable 1Password SSH agent integration. Creates keys directly in 1Password and configures SSH to use the 1Password SSH agent.
+- `--1password` (optional): Enable 1Password SSH agent integration. Can be used as a flag or with a vault name (e.g., `--1password Private`). Creates keys directly in 1Password and configures SSH to use the 1Password SSH agent. If a vault name is specified, that vault will be used for key storage. By default, the "Private" vault is used. Note that only the "Private" vault is enabled for SSH by default in 1Password settings.
 - `--aws-env` (optional): AWS environment directory to use. If specified, AWS configuration and credentials will be read from ~/.aws/aws-envs/{env}/.
 - `--instance` (optional): EC2 instance ID to set up connection for. If provided, skips the instance ID prompt.
 - `--hostname` (optional): Hostname to use for SSH configuration. If not provided, a hostname will be generated from the instance ID in non-interactive mode or prompted for in interactive mode.
@@ -289,9 +289,12 @@ uvx cloudx-proxy setup
 # Setup with custom profile and key
 uvx cloudx-proxy setup --profile myprofile --ssh-key mykey
 
-# Setup with custom SSH config and 1Password integration
+# Setup with custom SSH config and 1Password integration (uses default "Private" vault)
 uvx cloudx-proxy setup --ssh-config ~/.ssh/cloudx/config --1password
 
+# Setup with 1Password integration using a specific vault
+uvx cloudx-proxy setup --1password Work
+
 # Complete setup with all options
 uvx cloudx-proxy setup --profile myprofile --ssh-key mykey --ssh-config ~/.ssh/cloudx/config --1password --aws-env prod
 ```
@@ -412,6 +415,8 @@ These permissions are required to bootstrap the instance, so that after creation
      * SSH agent is enabled in 1Password settings
      * Keys are added to the SSH agent in 1Password
      * The key is visible with `op item list --categories "SSH Key"`
+     * If using a vault other than "Private", ensure that vault is enabled for SSH in 1Password settings
+     * By default, only the "Private" vault is enabled for SSH in 1Password
 
 4. **AWS Configuration**
    - Confirm AWS CLI is configured with valid credentials

cloudx_proxy-0.4.11.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=lmDCfh4BJbHyJNIpLPplzDhSqyNzLbtZmdO47e5QgpA,513
+cloudx_proxy/cli.py,sha256=rGr_lefPDZS0s-_qSHuzyZK739z38I9f8qF8cxrOsDg,9969
+cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
+cloudx_proxy/setup.py,sha256=CmUYr9EhtLoEpKU9jMEgxXtVMYlZTfPAJ-eQ59nr_bI,42785
+cloudx_proxy-0.4.11.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
+cloudx_proxy-0.4.11.dist-info/METADATA,sha256=2vk4-VnmAK49YS8yoMdAtU0miNrmX8P5W_zkHWGVVHY,20585
+cloudx_proxy-0.4.11.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+cloudx_proxy-0.4.11.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
+cloudx_proxy-0.4.11.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
+cloudx_proxy-0.4.11.dist-info/RECORD,,

cloudx_proxy-0.4.10.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=65ElcWoBtvl8MKrI33OOSijIy6-SUp9XMvxFyE69sWU,513
-cloudx_proxy/cli.py,sha256=COcaXVgdIKtnKFmXYaxVVtNbxTmuBNcVJeUD-dv5qUo,9355
-cloudx_proxy/core.py,sha256=RF3bX5MQiokRKjYEPnfWdKywGdtoVUvV2xZqm9uOl1g,8135
-cloudx_proxy/setup.py,sha256=IHjMjUV7INFFvUuaOvQvX7dPbpsa3qiCZriOfWJACKY,40086
-cloudx_proxy-0.4.10.dist-info/LICENSE,sha256=i7P2OR4zsJYsMWcCUDe_B9ZfGi9bU0K5I2nKfDrW_N8,1068
-cloudx_proxy-0.4.10.dist-info/METADATA,sha256=sTday7zCaUurBFJuz7M0rHgh1NJIFAXOh-58gN5wssQ,19996
-cloudx_proxy-0.4.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-cloudx_proxy-0.4.10.dist-info/entry_points.txt,sha256=HGt743N2lVlKd7O1qWq3C0aEHyS5PjPnxzDHh7hwtSg,54
-cloudx_proxy-0.4.10.dist-info/top_level.txt,sha256=2wtEote1db21j-VvkCJFfT-dLlauuG5indjggYh3xDg,13
-cloudx_proxy-0.4.10.dist-info/RECORD,,