golem-vm-provider 0.1.14__tar.gz → 0.1.16__tar.gz

{golem_vm_provider-0.1.14 → golem_vm_provider-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: golem-vm-provider
-Version: 0.1.14
+Version: 0.1.16
 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 → golem_vm_provider-0.1.16}/provider/config.py

@@ -56,6 +56,27 @@ class Settings(BaseSettings):
     DEFAULT_VM_IMAGE: str = "ubuntu:24.04"
     VM_DATA_DIR: str = ""
     SSH_KEY_DIR: str = ""
+    CLOUD_INIT_DIR: str = ""
+
+    @validator("CLOUD_INIT_DIR", pre=True)
+    def resolve_cloud_init_dir(cls, v: str) -> str:
+        """Resolve and create cloud-init directory path."""
+        if not v:
+            path = Path.home() / ".golem" / "provider" / "cloud-init"
+        else:
+            path = Path(v)
+            if not path.is_absolute():
+                path = Path.home() / path
+        
+        try:
+            path.mkdir(parents=True, exist_ok=True)
+            path.chmod(0o755)  # Readable and executable by owner and others, writable by owner
+            logger.debug(f"Created cloud-init directory at {path}")
+        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}")
+            
+        return str(path)
 
     @validator("VM_DATA_DIR", pre=True)
     def resolve_vm_data_dir(cls, v: str) -> str:

golem_vm_provider-0.1.16/provider/vm/cloud_init.py

@@ -0,0 +1,98 @@
+import yaml
+import os
+from datetime import datetime
+from pathlib import Path
+from typing import Dict, Optional, Tuple
+
+from ..config import settings
+from ..utils.logging import setup_logger
+
+logger = setup_logger(__name__)
+
+def generate_cloud_init(
+    hostname: str,
+    ssh_key: str,
+    packages: Optional[list[str]] = None,
+    runcmd: Optional[list[str]] = None
+) -> Tuple[str, str]:
+    """Generate cloud-init configuration.
+    
+    Args:
+        hostname: VM hostname
+        ssh_key: SSH public key to add to authorized_keys
+        packages: List of packages to install
+        runcmd: List of commands to run on first boot
+    
+    Returns:
+        Tuple of (path to cloud-init configuration file, config_id for debugging)
+    """
+    # 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:
+        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"
+            ]
+        }
+
+        if packages:
+            config["packages"] = packages
+
+        if runcmd:
+            config["runcmd"].extend(runcmd)
+
+        # Validate YAML before writing
+        yaml_content = yaml.safe_dump(config)
+        yaml.safe_load(yaml_content)  # Validate by parsing
+
+        # Write to file in our managed directory
+        with open(config_path, 'w') as f:
+            f.write(yaml_content)
+        
+        # Set proper permissions
+        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
+
+    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")
+        raise Exception(error_msg)
+
+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()
+        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}")

{golem_vm_provider-0.1.14 → golem_vm_provider-0.1.16}/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.

{golem_vm_provider-0.1.14 → golem_vm_provider-0.1.16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "golem-vm-provider"
-version = "0.1.14"
+version = "0.1.16"
 description = "VM on Golem Provider Node - Run your own provider node to offer VMs on the Golem Network"
 authors = ["Phillip Jensen <phillip+vm-on-golem@golemgrid.com>"]
 readme = "README.md"

golem_vm_provider-0.1.14/provider/vm/cloud_init.py

@@ -1,67 +0,0 @@
-import yaml
-import tempfile
-from pathlib import Path
-from typing import Dict, Optional
-
-def generate_cloud_init(
-    hostname: str,
-    ssh_key: str,
-    packages: Optional[list[str]] = None,
-    runcmd: Optional[list[str]] = None
-) -> str:
-    """Generate cloud-init configuration.
-    
-    Args:
-        hostname: VM hostname
-        ssh_key: SSH public key to add to authorized_keys
-        packages: List of packages to install
-        runcmd: List of commands to run on first boot
-    
-    Returns:
-        Path to cloud-init configuration file
-    """
-    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"
-        ]
-    }
-
-    if packages:
-        config["packages"] = packages
-
-    if runcmd:
-        config["runcmd"].extend(runcmd)
-
-    # Create temporary file
-    temp_file = tempfile.NamedTemporaryFile(mode='w', suffix='.yaml', delete=False)
-    yaml.safe_dump(config, temp_file)
-    temp_file.close()
-
-    return temp_file.name
-
-def cleanup_cloud_init(path: str) -> None:
-    """Clean up cloud-init configuration file.
-    
-    Args:
-        path: Path to cloud-init configuration file
-    """
-    try:
-        Path(path).unlink()
-    except Exception:
-        pass