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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vm_tool
-Version: 1.0.41
+Version: 1.0.42
 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.42}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vm_tool"
-version = "1.0.41"
+version = "1.0.42"
 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.42"
 commit = true
 tag = true
 

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

@@ -12,7 +12,7 @@ else:
 
 setup(
     name="vm_tool",
-    version="1.0.41",  # This will be updated by bump2version
+    version="1.0.42",  # 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.42}/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.42")
     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"
@@ -637,6 +660,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
 

{vm_tool-1.0.41 → vm_tool-1.0.42}/vm_tool/runner.py

@@ -171,6 +171,75 @@ class SetupRunner:
         self.env_path = config.env_path
         self.env_data = config.env_data
 
+    def _get_compose_dependencies(self, compose_file: str) -> List[dict]:
+        """
+        Parses docker-compose file to find local file dependencies (env_files, volumes).
+        Returns a list of dicts: {'src': 'local/path', 'dest': 'remote/path'}
+        """
+        dependencies = []
+        if not os.path.exists(compose_file):
+            return dependencies
+
+        try:
+            with open(compose_file, "r") as f:
+                data = yaml.safe_load(f)
+
+            if not data or "services" not in data:
+                return dependencies
+
+            found_paths = set()
+
+            for service in data.get("services", {}).values():
+                # Check env_file
+                env_files = service.get("env_file", [])
+                if isinstance(env_files, str):
+                    env_files = [env_files]
+
+                for env_path in env_files:
+                    # Normalize local path
+                    if env_path.startswith("./"):
+                        clean_path = env_path[2:]
+                    else:
+                        clean_path = env_path
+
+                    # Only include relative paths that are files
+                    if not clean_path.startswith("/") and os.path.exists(clean_path):
+                        if clean_path not in found_paths:
+                            found_paths.add(clean_path)
+                            dependencies.append({"src": clean_path, "dest": clean_path})
+                    elif not os.path.exists(clean_path):
+                        logger.warning(
+                            f"⚠️  Referenced env_file not found locally: {clean_path}"
+                        )
+
+                # Check volumes (bind mounts)
+                volumes = service.get("volumes", [])
+                for vol in volumes:
+                    if isinstance(vol, str):
+                        parts = vol.split(":")
+                        if len(parts) >= 2:
+                            host_path = parts[0]
+                            # Check if it's a relative path bind mount
+                            if (
+                                host_path.startswith("./")
+                                or host_path.startswith("../")
+                            ) and os.path.exists(host_path):
+                                if host_path.startswith("./"):
+                                    clean_path = host_path[2:]
+                                else:
+                                    clean_path = host_path
+
+                                if clean_path not in found_paths:
+                                    found_paths.add(clean_path)
+                                    dependencies.append(
+                                        {"src": clean_path, "dest": clean_path}
+                                    )
+
+        except Exception as e:
+            logger.warning(f"Failed to parse compose file for dependencies: {e}")
+
+        return dependencies
+
     def _get_git_commit(self) -> Optional[str]:
         """Get current git commit hash if in a git repository."""
         import subprocess
@@ -225,6 +294,65 @@ class SetupRunner:
                 f"An error occurred while running the Ansible playbook: {str(e)}"
             )
 
+    def hydrate_env_from_secrets(
+        self, compose_file: str, secrets_map: dict, project_root: str = "."
+    ):
+        """
+        Scans compose file for env_files. If a file is missing locally,
+        checks secrets_map for a matching key (FILENAME_EXT -> FILENAME_EXT output as SNAKE_CASE)
+        and creates the file.
+        Example: env/backend.env -> checks secrets_map['BACKEND_ENV']
+        """
+        dependencies = self._get_compose_dependencies(compose_file)
+
+        # We need to find *potential* dependencies that might not exist yet.
+        # _get_compose_dependencies only returns existing ones.
+        # So we need to parse again broadly or just rely on what we find.
+        # Actually, _get_compose_dependencies skips missing files.
+        # So we should parse manually here to find *missing* ones.
+
+        try:
+            with open(compose_file, "r") as f:
+                data = yaml.safe_load(f)
+
+            if not data or "services" not in data:
+                return
+
+            for service in data.get("services", {}).values():
+                env_files = service.get("env_file", [])
+                if isinstance(env_files, str):
+                    env_files = [env_files]
+
+                for env_path in env_files:
+                    # Resolve path relative to project root
+                    full_path = os.path.join(project_root, env_path)
+
+                    if not os.path.exists(full_path):
+                        # Attempt to hydrate
+                        filename = os.path.basename(env_path)
+                        # Normalize keys: backend.env -> BACKEND_ENV
+                        secret_key = filename.replace(".", "_").upper()
+
+                        secret_value = secrets_map.get(secret_key)
+                        if secret_value:
+                            logger.info(
+                                f"💧 Hydrating {env_path} from secret {secret_key}"
+                            )
+                            # Ensure directory exists
+                            os.makedirs(os.path.dirname(full_path), exist_ok=True)
+                            with open(full_path, "w") as out:
+                                out.write(secret_value)
+                        else:
+                            logger.warning(
+                                f"⚠️  Missing env file {env_path} and no secret found for {secret_key}"
+                            )
+                    else:
+                        logger.debug(f"✅ Env file exists: {env_path}")
+
+        except Exception as e:
+            logger.error(f"Failed to hydrate env files: {e}")
+            raise
+
     def run_setup(self):
         """Runs the setup process using Ansible."""
         extravars = {
@@ -402,6 +530,24 @@ class SetupRunner:
         if deploy_command:
             extravars["DEPLOY_COMMAND"] = deploy_command
 
+        # Dynamic Dependency Detection
+        dependencies = self._get_compose_dependencies(compose_file)
+
+        # Ensure CLI-provided env_file is included in detection logic
+        if env_file:
+            # Normalize and check existence
+            clean_env_path = env_file[2:] if env_file.startswith("./") else env_file
+            if os.path.exists(clean_env_path):
+                # Check if already in dependencies
+                if not any(d["src"] == clean_env_path for d in dependencies):
+                    dependencies.append({"src": clean_env_path, "dest": clean_env_path})
+
+        if dependencies:
+            logger.info(
+                f"📦 Detected dependencies to copy: {[d['src'] for d in dependencies]}"
+            )
+            extravars["FILES_TO_COPY"] = dependencies
+
         playbook_path = os.path.join(
             os.path.dirname(__file__), "vm_setup", "push_code.yml"
         )

{vm_tool-1.0.41 → vm_tool-1.0.42}/vm_tool/vm_setup/push_code_tasks.yml

@@ -31,10 +31,35 @@
     src: "{{ SOURCE_PATH }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
     dest: "{{ project_dest_dir }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
 
+# Handle dynamic dependencies (new method)
+- name: Ensure parent directories for dependencies exist
+  file:
+    path: "{{ project_dest_dir }}/{{ item.dest | dirname }}"
+    state: directory
+    mode: '0755'
+  loop: "{{ FILES_TO_COPY | default([]) }}"
+  when: FILES_TO_COPY is defined and (item.dest | dirname) != ''
+
+- name: Copy dependency files
+  copy:
+    src: "{{ SOURCE_PATH }}/{{ item.src }}"
+    dest: "{{ project_dest_dir }}/{{ item.dest }}"
+  loop: "{{ FILES_TO_COPY | default([]) }}"
+  when: FILES_TO_COPY is defined
+
+# Backward compatibility for single env file
+- name: Ensure Env file parent directory exists
+  file:
+    path: "{{ project_dest_dir }}/{{ ENV_FILE_PATH | default('.env') | dirname }}"
+    state: directory
+    mode: '0755'
+  when: FILES_TO_COPY is not defined and ENV_FILE_PATH is defined and (ENV_FILE_PATH | dirname) != ''
+
 - name: Copy Env file
   copy:
     src: "{{ SOURCE_PATH }}/{{ ENV_FILE_PATH | default('.env') }}"
     dest: "{{ project_dest_dir }}/{{ ENV_FILE_PATH | default('.env') }}"
+  when: FILES_TO_COPY is not defined
   failed_when: false
 
 - name: Deploy application

{vm_tool-1.0.41 → vm_tool-1.0.42}/vm_tool.egg-info/PKG-INFO

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