golem-vm-provider 0.1.14__py3-none-any.whl → 0.1.17__py3-none-any.whl

{golem_vm_provider-0.1.14.dist-info → golem_vm_provider-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.14
+Version: 0.1.17
 Summary: VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network
 Keywords: golem,vm,provider,cloud,decentralized
 Author: Phillip Jensen

{golem_vm_provider-0.1.14.dist-info → golem_vm_provider-0.1.17.dist-info}/RECORD

@@ -2,7 +2,7 @@ provider/__init__.py,sha256=HO1fkPpZqPO3z8O8-eVIyx8xXSMIVuTR_b1YF0RtXOg,45
 provider/api/__init__.py,sha256=ssX1ugDqEPt8Fn04IymgmG-Ev8PiXLsCSaiZVvHQnec,344
 provider/api/models.py,sha256=JOzoNf1oE5N97UqTN5xuIrTkqn2tCHqPDaIzGA3jUyo,3513
 provider/api/routes.py,sha256=P27RQvNqFWn6PacRwr1PaVz-yv5KAWsp9KeORejkXSI,6452
-provider/config.py,sha256=tq23K-FHjqQM0cu9GIjKi6_a96YHCEyqpprMwzK36oI,10344
+provider/config.py,sha256=btSyU6cB6z8o9nHWpNEOBDxKqsEha1yStM-6of3Np0s,13237
 provider/discovery/__init__.py,sha256=VR3NRoQtZRH5Vs8FG7jnGLR7p7wn7XeZdLaBb3t8e1g,123
 provider/discovery/advertiser.py,sha256=yv7RbRf1K43qOLAEa2Olj9hhN8etl2qsBuoHok0xoVs,6784
 provider/discovery/resource_tracker.py,sha256=8dYhJxoe_jLRwisHoA0jr575YhUKmLIqSXfW88KshcQ,6000
@@ -14,13 +14,13 @@ provider/utils/logging.py,sha256=C_elr0sJROHKQgErYpHJQvfujgh0k4Zf2gg8ZKfrmVk,259
 provider/utils/port_display.py,sha256=5d_604Eo-82dqx_yV2ZScq7bKQ8IsXacc-yXC_KAz3A,11031
 provider/utils/retry.py,sha256=ekP2ucaSJNN-lBcrIvyHa4QYPKNITMl1a5V1X6BBvsw,1560
 provider/vm/__init__.py,sha256=JGs50tUmzOR1rQ_w4fMY_3XWylmiA1G7KKWZkVw51mY,501
-provider/vm/cloud_init.py,sha256=o2CWLjl1ZN9fSEFHAWO-glh7BW-DxAMSe0MbqhzKNTg,1709
+provider/vm/cloud_init.py,sha256=E5dDH7dqStRcJNDfbarBBe83-c9N63W8B5ycIrHI8eU,4627
 provider/vm/models.py,sha256=zkfvP5Z50SPDNajwZTt9NTDIMRQIsZLvSOsuirHEcJM,6256
-provider/vm/multipass.py,sha256=RLUqCeoYz4PG8RL7dBu_TzjNEAmgIz9NonBtSuYc4kw,16431
+provider/vm/multipass.py,sha256=FOcsfcJ-NrgBg_fvq_CKOKsQ0xOmk7Z34KXi3ag_Vl8,16603
 provider/vm/name_mapper.py,sha256=MrshNeJ4Dw-WBsyiIVcn9N5xyOxaBKX4Yqhyh_m5IFg,4103
 provider/vm/port_manager.py,sha256=d03uwU76vx6LgADMN8ffBT9t400XQ3vtYlXr6cLIFN0,9831
 provider/vm/proxy_manager.py,sha256=cu0FPPbeCc3CR6NRE_CnLjiRg7xVdSFUylVUOL1g1sI,10154
-golem_vm_provider-0.1.14.dist-info/METADATA,sha256=a5GRzycDL9296fLDQnI1XHKA-gDOq10WVgNifEve5Ts,10594
-golem_vm_provider-0.1.14.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-golem_vm_provider-0.1.14.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
-golem_vm_provider-0.1.14.dist-info/RECORD,,
+golem_vm_provider-0.1.17.dist-info/METADATA,sha256=Lu9EpHlgFmOQP56l89vLyowyM0j48TI5BTGfT_EQxtQ,10594
+golem_vm_provider-0.1.17.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+golem_vm_provider-0.1.17.dist-info/entry_points.txt,sha256=E4rCWo_Do_2zCG_GewNuftfVlHF_8b_OvioZre0dfeA,54
+golem_vm_provider-0.1.17.dist-info/RECORD,,

provider/config.py

@@ -56,6 +56,73 @@ class Settings(BaseSettings):
     DEFAULT_VM_IMAGE: str = "ubuntu:24.04"
     VM_DATA_DIR: str = ""
     SSH_KEY_DIR: str = ""
+    CLOUD_INIT_DIR: str = ""
+    CLOUD_INIT_FALLBACK_DIR: str = ""  # Will be set to a temp directory if needed
+
+    @validator("CLOUD_INIT_DIR", pre=True)
+    def resolve_cloud_init_dir(cls, v: str) -> str:
+        """Resolve and create cloud-init directory path."""
+        import platform
+        import tempfile
+        
+        def verify_dir_permissions(path: Path) -> bool:
+            """Verify directory has correct permissions and is accessible."""
+            try:
+                # Create test file
+                test_file = path / "permission_test"
+                test_file.write_text("test")
+                test_file.unlink()
+                return True
+            except Exception:
+                return False
+
+        if v:
+            path = Path(v)
+            if not path.is_absolute():
+                path = Path.home() / path
+        else:
+            system = platform.system().lower()
+            # Try OS-specific paths first
+            if system == "linux" and Path("/snap/bin/multipass").exists():
+                # Linux with snap
+                path = Path("/var/snap/multipass/common/cloud-init")
+            elif system == "linux":
+                # Linux without snap
+                path = Path("/var/lib/multipass/cloud-init")
+            elif system == "darwin":
+                # macOS
+                path = Path("/Library/Application Support/multipass/cloud-init")
+            elif system == "windows":
+                # Windows
+                path = Path(os.path.expandvars("%ProgramData%\\Multipass\\cloud-init"))
+            else:
+                path = Path.home() / ".golem" / "provider" / "cloud-init"
+
+        try:
+            # Try to create and verify the directory
+            path.mkdir(parents=True, exist_ok=True)
+            if platform.system().lower() != "windows":
+                path.chmod(0o755)  # Readable and executable by owner and others, writable by owner
+
+            if verify_dir_permissions(path):
+                logger.debug(f"Created cloud-init directory at {path}")
+                return str(path)
+            
+            # If verification fails, fall back to temp directory
+            fallback_path = Path(tempfile.gettempdir()) / "golem" / "cloud-init"
+            fallback_path.mkdir(parents=True, exist_ok=True)
+            if platform.system().lower() != "windows":
+                fallback_path.chmod(0o755)
+            
+            if verify_dir_permissions(fallback_path):
+                logger.warning(f"Using fallback cloud-init directory at {fallback_path}")
+                return str(fallback_path)
+            
+            raise ValueError("Could not create a writable cloud-init directory")
+            
+        except Exception as e:
+            logger.error(f"Failed to create cloud-init directory at {path}: {e}")
+            raise ValueError(f"Failed to create cloud-init directory: {e}")
 
     @validator("VM_DATA_DIR", pre=True)
     def resolve_vm_data_dir(cls, v: str) -> str:

provider/vm/cloud_init.py

@@ -1,14 +1,44 @@
 import yaml
-import tempfile
+import os
+import subprocess
+from datetime import datetime
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Dict, Optional, Tuple
+
+from ..config import settings
+from ..utils.logging import setup_logger
+
+logger = setup_logger(__name__)
+
+def validate_cloud_init(content: str) -> bool:
+    """Validate cloud-init configuration content.
+    
+    Args:
+        content: YAML content to validate
+        
+    Returns:
+        True if valid, False otherwise
+    """
+    try:
+        # First validate YAML syntax
+        yaml.safe_load(content)
+        
+        # Check for required #cloud-config header
+        if not content.startswith("#cloud-config\n"):
+            logger.error("Cloud-init config missing #cloud-config header")
+            return False
+            
+        return True
+    except Exception as e:
+        logger.error(f"Cloud-init validation failed: {e}")
+        return False
 
 def generate_cloud_init(
     hostname: str,
     ssh_key: str,
     packages: Optional[list[str]] = None,
     runcmd: Optional[list[str]] = None
-) -> str:
+) -> Tuple[str, str]:
     """Generate cloud-init configuration.
     
     Args:
@@ -18,50 +48,90 @@ def generate_cloud_init(
         runcmd: List of commands to run on first boot
     
     Returns:
-        Path to cloud-init configuration file
+        Tuple of (path to cloud-init configuration file, config_id for debugging)
     """
-    config = {
-        "hostname": hostname,
-        "package_update": True,
-        "package_upgrade": True,
-        "ssh_authorized_keys": [ssh_key],
-        "users": [{
-            "name": "root",
-            "ssh_authorized_keys": [ssh_key]
-        }],
-        "write_files": [
-            {
-                "path": "/etc/ssh/sshd_config.d/allow_root.conf",
-                "content": "PermitRootLogin prohibit-password\n",
-                "owner": "root:root",
-                "permissions": "0644"
-            }
-        ],
-        "runcmd": [
-            "systemctl restart ssh"
-        ]
-    }
+    # Generate unique config ID for this cloud-init file
+    config_id = f"{hostname}-{datetime.now().strftime('%Y%m%d-%H%M%S')}"
+    config_path = Path(settings.CLOUD_INIT_DIR) / f"{config_id}.yaml"
+    
+    logger.info(f"Generating cloud-init configuration {config_id}")
+    try:
+        # Start with required #cloud-config header
+        yaml_content = "#cloud-config\n"
+        
+        config = {
+            "version": 1,
+            "hostname": hostname,
+            "package_update": True,
+            "package_upgrade": True,
+            "preserve_hostname": False,
+            "ssh_authorized_keys": [ssh_key],
+            "users": [{
+                "name": "root",
+                "ssh_authorized_keys": [ssh_key]
+            }],
+            "write_files": [
+                {
+                    "path": "/etc/ssh/sshd_config.d/allow_root.conf",
+                    "content": "PermitRootLogin prohibit-password\n",
+                    "owner": "root:root",
+                    "permissions": "0644"
+                }
+            ],
+            "runcmd": [
+                "systemctl restart ssh"
+            ]
+        }
+
+        if packages:
+            config["packages"] = packages
+
+        if runcmd:
+            config["runcmd"].extend(runcmd)
 
-    if packages:
-        config["packages"] = packages
+        # Add config to YAML content with document markers
+        yaml_content += "---\n"
+        yaml_content += yaml.safe_dump(config, default_flow_style=False, sort_keys=False)
 
-    if runcmd:
-        config["runcmd"].extend(runcmd)
+        # Validate the configuration
+        if not validate_cloud_init(yaml_content):
+            raise Exception("Cloud-init configuration validation failed")
 
-    # Create temporary file
-    temp_file = tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False)
-    yaml.safe_dump(config, temp_file)
-    temp_file.close()
+        # Write to file in our managed directory
+        with open(config_path, 'w') as f:
+            f.write(yaml_content)
+        
+        # Set proper permissions
+        if os.name != 'nt':  # Skip on Windows
+            config_path.chmod(0o644)  # World readable but only owner writable
+        
+        logger.debug(f"Cloud-init configuration written to {config_path}")
+        logger.debug(f"Cloud-init configuration content:\n{yaml_content}")
+        
+        return str(config_path), config_id
 
-    return temp_file.name
+    except Exception as e:
+        error_msg = f"Failed to generate cloud-init configuration: {str(e)}"
+        logger.error(f"{error_msg}\nConfig ID: {config_id}")
+        # Don't cleanup on error - keep file for debugging
+        if config_path.exists():
+            logger.info(f"Failed config preserved at {config_path} for debugging")
+            # Log the file contents for debugging
+            try:
+                logger.debug(f"Failed config contents:\n{config_path.read_text()}")
+            except Exception as read_error:
+                logger.error(f"Could not read failed config: {read_error}")
+        raise Exception(error_msg)
 
-def cleanup_cloud_init(path: str) -> None:
+def cleanup_cloud_init(path: str, config_id: str) -> None:
     """Clean up cloud-init configuration file.
     
     Args:
         path: Path to cloud-init configuration file
+        config_id: Configuration ID for logging
     """
     try:
         Path(path).unlink()
-    except Exception:
-        pass
+        logger.debug(f"Cleaned up cloud-init configuration {config_id}")
+    except Exception as e:
+        logger.warning(f"Failed to cleanup cloud-init configuration {config_id}: {e}")

provider/vm/multipass.py

@@ -158,20 +158,22 @@ class MultipassProvider(VMProvider):
         """
         multipass_name = f"golem-{config.name}-{datetime.now().strftime('%Y%m%d-%H%M%S')}"
         await self.name_mapper.add_mapping(config.name, multipass_name)
+        cloud_init_path = None
+        config_id = None
 
         # Verify resources are properly allocated
         if not self.resource_tracker.can_accept_resources(config.resources):
             raise VMCreateError("Resources not properly allocated or insufficient")
 
-        # Generate cloud-init config with requestor's public key
-        cloud_init_path = generate_cloud_init(
-            hostname=config.name,
-            ssh_key=config.ssh_key
-        )
-
         try:
+            # Generate cloud-init config with requestor's public key
+            cloud_init_path, config_id = generate_cloud_init(
+                hostname=config.name,
+                ssh_key=config.ssh_key
+            )
+
             # Launch VM
-            logger.process(f"🚀 Launching VM {multipass_name}")
+            logger.process(f"🚀 Launching VM {multipass_name} with config {config_id}")
             launch_cmd = [
                 "launch",
                 config.image,
@@ -237,7 +239,8 @@ class MultipassProvider(VMProvider):
 
         finally:
             # Cleanup cloud-init file
-            cleanup_cloud_init(cloud_init_path)
+            if cloud_init_path and config_id:
+                cleanup_cloud_init(cloud_init_path, config_id)
 
     def _verify_vm_exists(self, vm_id: str) -> bool:
         """Check if VM exists in multipass.