vm-tool 1.0.41__tar.gz → 1.0.43__tar.gz

vm_tool-1.0.43/.agent/workflows/push.md

@@ -0,0 +1,11 @@
+---
+description: Push code using the custom automation script
+---
+
+This workflow uses the project's custom script to commit, bump version, and push changes. It ensures consistent versioning and environment management.
+
+1. Run the custom push script
+   ```bash
+   # Replace arguments as needed
+   python3 codePushToGithub.py --branch main --message "Update via Agent"
+   ```

vm_tool-1.0.43/.agent/workflows/test_and_lint.md

@@ -0,0 +1,18 @@
+---
+description: Run tests and linting for vm_tool
+---
+
+This workflow runs the project's tests and linting checks using the configured Makefile and Python tools.
+
+1. Install dependencies (if needed) and run tests
+
+   ```bash
+   pip install -e ".[dev]"
+   pytest
+   ```
+
+2. Run linting checks
+   ```bash
+   flake8 vm_tool
+   black --check vm_tool
+   ```

{vm_tool-1.0.41 → vm_tool-1.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vm_tool
-Version: 1.0.41
+Version: 1.0.43
 Summary: A Comprehensive Tool for Setting Up Virtual Machines.
 Home-page: https://github.com/thesunnysinha/vm_tool
 Author: Sunny Sinha

{vm_tool-1.0.41 → vm_tool-1.0.43}/codePushToGithub.py

@@ -128,20 +128,38 @@ def get_current_version():
 
 
 def main():
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        description="Automate git commits and pushes with version bumping."
+    )
+    parser.add_argument("--branch", "-b", help="Branch name to push to", default=None)
+    parser.add_argument("--message", "-m", help="Commit message", default=None)
+    args = parser.parse_args()
+
     # Setup virtual environment
     print("🔧 Setting up environment...")
     setup_environment()
     print()
 
-    # Ask for the branch name
-    branch_name = input("Enter the branch name: ").strip()
+    # Ask for the branch name if not provided
+    if args.branch:
+        branch_name = args.branch
+    else:
+        branch_name = input("Enter the branch name: ").strip()
 
-    if branch_name == "main":
+    if branch_name.lower() in ["main", "master"]:
         # 1. Commit User Changes FIRST
         print("Adding changes...")
         run_command("git add .")
 
-        commit_message = input("Enter the commit message for your changes: ").strip()
+        if args.message:
+            commit_message = args.message
+        else:
+            commit_message = input(
+                "Enter the commit message for your changes: "
+            ).strip()
+
         print("Committing changes...")
         # Try to commit changes
         result = run_command(f'git commit -m "{commit_message}"', check=False)
@@ -181,14 +199,22 @@ def main():
     else:
         # Create and switch to the new branch
         print(f"Creating and switching to branch: {branch_name}")
-        run_command(f"git checkout -b {branch_name}")
+        # Check if branch exists
+        result = run_command(f"git rev-parse --verify {branch_name}", check=False)
+        if result.returncode == 0:
+            run_command(f"git checkout {branch_name}")
+        else:
+            run_command(f"git checkout -b {branch_name}")
 
         # Add all changes
         print("Adding changes...")
         run_command("git add .")
 
         # Ask for commit message
-        commit_message = input("Enter the commit message: ").strip()
+        if args.message:
+            commit_message = args.message
+        else:
+            commit_message = input("Enter the commit message: ").strip()
 
         # Commit with the entered message
         print("Committing changes...")

vm_tool-1.0.43/jingo.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "../jingo"
+		},
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

{vm_tool-1.0.41 → vm_tool-1.0.43}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vm_tool"
-version = "1.0.41"
+version = "1.0.43"
 description = "A Comprehensive Tool for Setting Up Virtual Machines."
 readme = "README.md"
 authors = [
@@ -76,7 +76,7 @@ include = '\.pyi?$'
 profile = "black"
 multi_line_output = 3
 [tool.bumpversion]
-current_version = "1.0.41"
+current_version = "1.0.43"
 commit = true
 tag = true
 

{vm_tool-1.0.41 → vm_tool-1.0.43}/setup.py

@@ -12,7 +12,7 @@ else:
 
 setup(
     name="vm_tool",
-    version="1.0.41",  # This will be updated by bump2version
+    version="1.0.43",  # This will be updated by bump2version
     packages=find_packages(),
     description="A Comprehensive Tool for Setting Up Virtual Machines.",
     long_description=long_description,

{vm_tool-1.0.41 → vm_tool-1.0.43}/vm_tool/cli.py

@@ -6,7 +6,7 @@ def main():
     parser = argparse.ArgumentParser(
         description="VM Tool: Setup, Provision, and Manage VMs"
     )
-    parser.add_argument("--version", action="version", version="1.0.41")
+    parser.add_argument("--version", action="version", version="1.0.43")
     parser.add_argument(
         "--verbose", "-v", action="store_true", help="Enable verbose output"
     )
@@ -168,6 +168,29 @@ def main():
         "--inventory", type=str, default="inventory.yml", help="Inventory file to use"
     )
 
+    # Hydrate Env command
+    hydrate_parser = subparsers.add_parser(
+        "hydrate-env", help="Hydrate missing env files from secrets"
+    )
+    hydrate_parser.add_argument(
+        "--compose-file",
+        type=str,
+        default="docker-compose.yml",
+        help="Path to docker-compose.yml",
+    )
+    hydrate_parser.add_argument(
+        "--secrets",
+        type=str,
+        required=True,
+        help="JSON string of GitHub secrets",
+    )
+    hydrate_parser.add_argument(
+        "--project-root",
+        type=str,
+        default=".",
+        help="Project root directory",
+    )
+
     # Docker Deploy command
     docker_parser = subparsers.add_parser(
         "deploy-docker", help="Deploy using Docker Compose"
@@ -271,6 +294,23 @@ def main():
         help="CI/CD Platform",
     )
 
+    # Secrets command
+    secrets_parser = subparsers.add_parser("secrets", help="Manage secrets")
+    secrets_subparsers = secrets_parser.add_subparsers(
+        dest="secrets_command", help="Secrets operations"
+    )
+
+    # secrets sync
+    sync_parser = secrets_subparsers.add_parser(
+        "sync", help="Sync local .env to GitHub Secrets"
+    )
+    sync_parser.add_argument(
+        "--env-file", type=str, default=".env", help="Path to .env file"
+    )
+    sync_parser.add_argument(
+        "--repo", type=str, help="Target GitHub repository (owner/repo)"
+    )
+
     args = parser.parse_args()
 
     # Configure logging based on flags
@@ -637,6 +677,25 @@ def main():
             print(f"Error: {e}")
             sys.exit(1)
 
+    elif args.command == "hydrate-env":
+        try:
+            import json
+            from vm_tool.runner import SetupRunner, SetupRunnerConfig
+
+            secrets_map = json.loads(args.secrets)
+            config = SetupRunnerConfig(github_project_url="dummy")
+            runner = SetupRunner(config)
+
+            print("💧 Hydrating environment files from secrets...")
+            runner.hydrate_env_from_secrets(
+                compose_file=args.compose_file,
+                secrets_map=secrets_map,
+                project_root=args.project_root,
+            )
+        except Exception as e:
+            print(f"❌ Failed to hydrate env: {e}")
+            sys.exit(1)
+
     elif args.command == "completion":
         from vm_tool.completion import print_completion, install_completion
 
@@ -760,6 +819,63 @@ def main():
         except Exception as e:
             print(f"Error: {e}")
             sys.exit(1)
+    elif args.command == "secrets":
+        if args.secrets_command == "sync":
+            from vm_tool.secrets import SecretsManager
+            import os
+
+            if not os.path.exists(args.env_file):
+                print(f"❌ Env file not found: {args.env_file}")
+                sys.exit(1)
+
+            try:
+                manager = SecretsManager.from_github(repo=args.repo)
+
+                print(f"📖 Reading secrets from {args.env_file}...")
+                secrets_to_sync = {}
+                with open(args.env_file, "r") as f:
+                    for line in f:
+                        line = line.strip()
+                        if not line or line.startswith("#"):
+                            continue
+                        # Basic env parsing
+                        if "=" in line:
+                            key, value = line.split("=", 1)
+                            key = key.strip()
+                            value = value.strip().strip("'").strip('"')
+                            secrets_to_sync[key] = value
+
+                if not secrets_to_sync:
+                    print("⚠️  No secrets found to sync.")
+                    sys.exit(0)
+
+                print(f"🚀 Syncing {len(secrets_to_sync)} secrets to GitHub...")
+                # Confirm with user
+                confirm = (
+                    input(
+                        f"Proceed to upload {len(secrets_to_sync)} secrets? (yes/no): "
+                    )
+                    .strip()
+                    .lower()
+                )
+                if confirm != "yes":
+                    print("❌ Operation cancelled.")
+                    sys.exit(0)
+
+                success_count = 0
+                for key, value in secrets_to_sync.items():
+                    print(f"   Uploading {key}...")
+                    if manager.set(key, value):
+                        success_count += 1
+
+                print(
+                    f"\n✨ Successfully synced {success_count}/{len(secrets_to_sync)} secrets!"
+                )
+
+            except Exception as e:
+                print(f"❌ Error syncing secrets: {e}")
+                sys.exit(1)
+
     else:
         parser.print_help()
 

{vm_tool-1.0.41 → vm_tool-1.0.43}/vm_tool/generator.py

@@ -22,6 +22,8 @@ class PipelineGenerator:
         health_url: Optional[str] = None,
         backup_paths: Optional[list] = None,
         app_port: int = 8000,
+        hydrate_env: bool = True,
+        combine_compose: bool = True,
     ):
         self.platform = platform
         self.strategy = strategy
@@ -37,6 +39,8 @@ class PipelineGenerator:
         )
         self.backup_paths = backup_paths or ["/app", "/etc/nginx"]
         self.app_port = app_port
+        self.hydrate_env = hydrate_env
+        self.combine_compose = combine_compose
 
         # New options
         self.run_linting = False
@@ -50,8 +54,7 @@ class PipelineGenerator:
         run_tests: bool = False,
         python_version: str = "3.11",
         branch: str = "main",
-    ):
-        """Set additional options for the pipeline."""
+    ):        """Set additional options for the pipeline."""
         self.run_linting = run_linting
         self.run_tests = run_tests
         self.python_version = python_version
@@ -120,6 +123,12 @@ class PipelineGenerator:
         if self.enable_dry_run:
             steps.append(self._step_dry_run())
 
+        if self.hydrate_env:
+            steps.append(self._step_hydrate_env())
+            
+        if self.combine_compose:
+            steps.append(self._step_combine_compose())
+            
         # Main deployment
         steps.append(self._step_deploy())
 
@@ -143,7 +152,7 @@ class PipelineGenerator:
         # Combine all steps
         steps_yaml = "\n".join(steps)
 
-        return f"""name: Deploy to EC2 with vm_tool
+        return f"""name: Deploy with vm_tool
 
 on:
   push:
@@ -153,8 +162,8 @@ on:
   workflow_dispatch:
 
 env:
-  EC2_HOST: ${{{{ secrets.EC2_HOST }}}}
-  EC2_USER: ${{{{ secrets.EC2_USER }}}}
+  SSH_HOSTNAME: ${{{{ secrets.SSH_HOSTNAME }}}}
+  SSH_USERNAME: ${{{{ secrets.SSH_USERNAME }}}}
   APP_PORT: {self.app_port}
 
 jobs:
@@ -176,16 +185,16 @@ jobs:
           echo "🔐 Validating GitHub Secrets..."
           MISSING_SECRETS=()
           
-          if [ -z "${{ secrets.EC2_HOST }}" ]; then
-            MISSING_SECRETS+=("EC2_HOST")
+          if [ -z "${{ secrets.SSH_HOSTNAME }}" ]; then
+            MISSING_SECRETS+=("SSH_HOSTNAME")
           fi
           
-          if [ -z "${{ secrets.EC2_USER }}" ]; then
-            MISSING_SECRETS+=("EC2_USER")
+          if [ -z "${{ secrets.SSH_USERNAME }}" ]; then
+            MISSING_SECRETS+=("SSH_USERNAME")
           fi
           
-          if [ -z "${{ secrets.EC2_SSH_KEY }}" ]; then
-            MISSING_SECRETS+=("EC2_SSH_KEY")
+          if [ -z "${{ secrets.SSH_ID_RSA }}" ]; then
+            MISSING_SECRETS+=("SSH_ID_RSA")
           fi
           
           if [ ${#MISSING_SECRETS[@]} -ne 0 ]; then
@@ -199,16 +208,16 @@ jobs:
             echo "2. Add each secret:"
             echo ""
             
-            if [[ " ${MISSING_SECRETS[*]} " =~ " EC2_HOST " ]]; then
-              echo "   EC2_HOST: Your EC2 IP (e.g., 54.123.45.67)"
+            if [[ " ${MISSING_SECRETS[*]} " =~ " SSH_HOSTNAME " ]]; then
+              echo "   SSH_HOSTNAME: Your Server IP (e.g., 54.123.45.67)"
             fi
             
-            if [[ " ${MISSING_SECRETS[*]} " =~ " EC2_USER " ]]; then
-              echo "   EC2_USER: SSH username (e.g., ubuntu)"
+            if [[ " ${MISSING_SECRETS[*]} " =~ " SSH_USERNAME " ]]; then
+              echo "   SSH_USERNAME: SSH username (e.g., ubuntu)"
             fi
             
-            if [[ " ${MISSING_SECRETS[*]} " =~ " EC2_SSH_KEY " ]]; then
-              echo "   EC2_SSH_KEY: Run 'cat ~/.ssh/id_rsa' and copy output"
+            if [[ " ${MISSING_SECRETS[*]} " =~ " SSH_ID_RSA " ]]; then
+              echo "   SSH_ID_RSA: Run 'cat ~/.ssh/id_rsa' and copy output"
             fi
             
             echo ""
@@ -293,9 +302,54 @@ jobs:
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/deploy_key
+          echo "${{ secrets.SSH_ID_RSA }}" > ~/.ssh/deploy_key
           chmod 600 ~/.ssh/deploy_key
-          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts"""
+          ssh-keyscan -H ${{ secrets.SSH_HOSTNAME }} >> ~/.ssh/known_hosts
+          
+          # Create SSH config to use the key for the specific host
+          cat > ~/.ssh/config <<EOF
+          Host ${{ secrets.SSH_HOSTNAME }}
+            User ${{ secrets.SSH_USERNAME }}
+            IdentityFile ~/.ssh/deploy_key
+            StrictHostKeyChecking no
+          EOF"""
+
+    def _step_hydrate_env(self) -> str:
+        return """
+      - name: Hydrate Environment Files from Secrets
+        env:
+          SECRETS_CONTEXT: ${{ toJSON(secrets) }}
+        run: |
+          # Use vm_tool to create local env files from secrets based on compose file
+          vm_tool hydrate-env \\
+            --compose-file docker-compose.yml \\
+            --secrets "$SECRETS_CONTEXT"
+          echo "✅ Hydrated environment files from secrets"
+"""
+
+    def _step_combine_compose(self) -> str:
+        return """
+      - name: Combine Docker Compose files
+        run: |
+          # Combine base and prod compose files if prod exists
+          if [ -f docker/docker-compose.prod.yml ]; then
+            echo "Merging docker-compose.yml and docker/docker-compose.prod.yml..."
+            docker compose -f docker-compose.yml -f docker/docker-compose.prod.yml config > docker-compose.released.yml
+          elif [ -f docker-compose.prod.yml ]; then
+             echo "Merging docker-compose.yml and docker-compose.prod.yml..."
+             docker compose -f docker-compose.yml -f docker-compose.prod.yml config > docker-compose.released.yml
+          else
+            echo "No prod overriding file found, using base file..."
+            docker compose -f docker-compose.yml config > docker-compose.released.yml
+          fi
+          
+          # Replace absolute paths (from CI runner) with relative paths
+          # This assumes the structure: /home/runner/work/repo/repo/ -> ./
+          sed -i 's|/home/runner/work/[^/]*/[^/]*||g' docker-compose.released.yml
+          
+          echo "✅ Generated combined Docker Compose file"
+          cat docker-compose.released.yml
+"""
 
     def _step_validate_ssh(self) -> str:
         return """
@@ -356,25 +410,52 @@ jobs:
     def _step_deploy(self) -> str:
         return """
       - name: Deploy with vm_tool (Ansible-based)
+        env:
+          # Define deployment command for the released file
+          DEPLOY_COMMAND: "docker compose -f docker-compose.released.yml up -d --remove-orphans"
         run: |
           # Create inventory file for Ansible
           cat > inventory.yml << EOF
           all:
             hosts:
               production:
-                ansible_host: ${{ secrets.EC2_HOST }}
-                ansible_user: ${{ secrets.EC2_USER }}
+                ansible_host: ${{ secrets.SSH_HOSTNAME }}
+                ansible_user: ${{ secrets.SSH_USERNAME }}
                 ansible_ssh_private_key_file: ~/.ssh/deploy_key
           EOF
           
           # Deploy using vm_tool (uses Ansible under the hood)
           export GITHUB_REPOSITORY_OWNER=${{ github.repository_owner }}
-          vm_tool deploy-docker \\
-            --host ${{ secrets.EC2_HOST }} \\
-            --user ${{ secrets.EC2_USER }} \\
-            --compose-file ~/app/docker-compose.yml \\
-            --inventory inventory.yml \\
-            --force"""
+          
+          # Determine Project Directory based on user (handle root case)
+          if [ "${{ secrets.SSH_USERNAME }}" = "root" ]; then
+            HOME_DIR="/root"
+          else
+            HOME_DIR="/home/${{ secrets.SSH_USERNAME }}"
+          fi
+          PROJECT_DIR="${HOME_DIR}/apps/${{ github.event.repository.name }}"
+          
+          # Prepare arguments
+          ARGS=(
+            "--inventory" "inventory.yml"
+            "--compose-file" "docker-compose.released.yml"
+            "--project-dir" "$PROJECT_DIR"
+            "--deploy-command" "${{ env.DEPLOY_COMMAND }}"
+            "--force"
+            "--health-url" "http://${{ secrets.SSH_HOSTNAME }}:${{ env.APP_PORT }}/health"
+            "--host" "${{ secrets.SSH_HOSTNAME }}"
+            "--user" "${{ secrets.SSH_USERNAME }}"
+          )
+
+          # Move .env if it exists and add to args
+          if [ -f .env ]; then
+            mkdir -p env
+            mv .env env/.env
+            ARGS+=("--env-file" "env/.env")
+          fi
+          
+          vm_tool deploy-docker "${ARGS[@]}"
+"""
 
     def _step_health_check(self) -> str:
         return f"""
@@ -394,10 +475,13 @@ jobs:
         return """
       - name: Verify
         run: |
-          ssh -i ~/.ssh/deploy_key ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'EOF'
-            cd ~/app
-            docker-compose ps
-            docker-compose logs --tail=20
+          # Use absolute path for verify step too
+          PROJECT_DIR="/home/${{ secrets.SSH_USERNAME }}/apps/${{ github.event.repository.name }}"
+          
+          ssh -i ~/.ssh/deploy_key ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOSTNAME }} << EOF
+            cd $PROJECT_DIR
+            docker compose ps
+            docker compose logs --tail=20
           EOF"""
 
     def _step_rollback(self) -> str:
@@ -406,12 +490,12 @@ jobs:
         if: failure()
         run: |
           echo "⚠️  Rolling back..."
-          ssh -i ~/.ssh/deploy_key ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'EOF'
+          # Note: Rollback logic might need adjustment for absolute paths, keeping simple for now
+          ssh -i ~/.ssh/deploy_key ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOSTNAME }} << 'EOF'
             BACKUP=$(ls -t ~/backups/*.tar.gz 2>/dev/null | head -1)
             if [ -n "$BACKUP" ]; then
-              cd ~/app && tar -xzf $BACKUP
-              docker-compose up -d
-              echo "✅ Rolled back"
+              # TODO: Improve rollback to handle dynamic dirs
+              echo "Rollback not fully implemented for dynamic paths yet"
             fi
           EOF"""
 
@@ -420,7 +504,7 @@ jobs:
       - name: Cleanup
         if: success()
         run: |
-          ssh -i ~/.ssh/deploy_key ${{ secrets.EC2_USER }}@${{ secrets.EC2_HOST }} << 'EOF'
+          ssh -i ~/.ssh/deploy_key ${{ secrets.SSH_USERNAME }}@${{ secrets.SSH_HOSTNAME }} << 'EOF'
             cd ~/backups 2>/dev/null || exit 0
             ls -t *.tar.gz 2>/dev/null | tail -n +6 | xargs rm -f || true
           EOF"""
@@ -431,7 +515,7 @@ jobs:
         if: always()
         run: |
           if [ "${{ job.status }}" == "success" ]; then
-            echo "✅ Deployed to ${{ secrets.EC2_HOST }}:${{ env.APP_PORT }}"
+            echo "✅ Deployed to ${{ secrets.SSH_HOSTNAME }}:${{ env.APP_PORT }}"
           else
             echo "❌ Deployment failed"
           fi"""