cluster-builder 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

cluster_builder/swarmchestrate.py

@@ -50,9 +50,7 @@ class Swarmchestrate:
 
         # Initialise components
         self.template_manager = TemplateManager()
-        self.cluster_config = ClusterConfig(
-            self.template_manager, output_dir, self.pg_config
-        )
+        self.cluster_config = ClusterConfig(self.template_manager, output_dir)
 
         logger.info(
             f"Initialised with template_dir={template_dir}, output_dir={output_dir}"
@@ -79,23 +77,17 @@ class Swarmchestrate:
         """
         return self.cluster_config.generate_random_name()
 
-    def _validate_node_config(self, config: dict[str, any]) -> None:
+    def validate_configuration(self, cloud: str, config: dict) -> list:
         """
-        Validate node configuration.
+        Validate a configuration against the required variables for a cloud provider.
 
         Args:
-            config: Configuration dictionary
+            cloud: Cloud provider name
+            config: Configuration dictionary provided by the user
 
-        Raises:
-            ValueError: If configuration is invalid
+        Returns:
+            List of missing required variables (empty if all required variables are present)
         """
-        # Check required fields
-        if "cloud" not in config:
-            raise ValueError("Cloud provider must be specified in configuration")
-
-        if "k3s_role" not in config:
-            raise ValueError("K3s role must be specified in configuration")
-
         # Master IP validation
         has_master_ip = "master_ip" in config and config["master_ip"]
         role = config["k3s_role"]
@@ -103,13 +95,24 @@ class Swarmchestrate:
         # Cannot add a master node to an existing cluster
         if has_master_ip and role == "master":
             raise ValueError(
-                "Cannot add a master node to an existing cluster (master_ip specified with master role)"
+                "Cannot add master to existing cluster (master_ip specified with master role)"
             )
 
         # Worker/HA nodes require a master IP
         if not has_master_ip and role in ["worker", "ha"]:
             raise ValueError(f"Role '{role}' requires master_ip to be specified")
 
+        required_vars = self.template_manager.get_required_variables(cloud)
+
+        # Find missing required variables
+        missing_vars = []
+        for var_name, var_config in required_vars.items():
+            # If variable has no default and is not in config, it's required but missing
+            if "default" not in var_config and var_name not in config:
+                missing_vars.append(var_name)
+
+        return missing_vars
+
     def prepare_infrastructure(
         self, config: dict[str, any]
     ) -> tuple[str, dict[str, any]]:
@@ -131,14 +134,18 @@ class Swarmchestrate:
             RuntimeError: If file operations fail
         """
         try:
-            # Validate the configuration
-            self._validate_node_config(config)
-
-            # Prepare the configuration and files
+            # Prepare the configuration
             cluster_dir, prepared_config = self.cluster_config.prepare(config)
 
+            # Validate the configuration
+            cloud = prepared_config["cloud"]
+            missing_vars = self.validate_configuration(cloud, prepared_config)
+            if missing_vars:
+                raise ValueError(
+                    f"Missing required variables for cloud provider '{cloud}': {', '.join(missing_vars)}"
+                )
+
             # Create provider configuration
-            cloud = config["cloud"]
             self.template_manager.create_provider_config(cluster_dir, cloud)
             logger.info(f"Created provider configuration for {cloud}")
 
@@ -147,9 +154,12 @@ class Swarmchestrate:
             backend_tf_path = os.path.join(cluster_dir, "backend.tf")
 
             # Add backend configuration
+
+            # Add PostgreSQL connection string to config
+            conn_str = self.pg_config.get_connection_string()
             hcl.add_backend_config(
                 backend_tf_path,
-                prepared_config["pg_conn_str"],
+                conn_str,
                 prepared_config["cluster_name"],
             )
             logger.info(f"Added backend configuration to {backend_tf_path}")
@@ -294,7 +304,12 @@ class Swarmchestrate:
                 return
 
             # Plan the deployment
-            CommandExecutor.run_command(["tofu", "plan"], cluster_dir, "OpenTofu plan")
+            CommandExecutor.run_command(
+                ["tofu", "plan", "-input=false"],
+                cluster_dir,
+                "OpenTofu plan",
+                timeout=30,
+            )
 
             # Apply the deployment
             CommandExecutor.run_command(
@@ -335,7 +350,10 @@ class Swarmchestrate:
         try:
             # Plan destruction
             CommandExecutor.run_command(
-                ["tofu", "plan", "-destroy"], cluster_dir, "OpenTofu plan destruction"
+                ["tofu", "plan", "-destroy", "-input=false"],
+                cluster_dir,
+                "OpenTofu plan destruction",
+                timeout=30,
             )
 
             # Execute destruction

{cluster_builder-0.1.0.dist-info → cluster_builder-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cluster-builder
-Version: 0.1.0
+Version: 0.1.2
 Summary: Swarmchestrate cluster builder
 Author-email: Gunjan <G.Kotak@westminster.ac.uk>, Jay <J.Deslauriers@westminster.ac.uk>
 License: Apache2

cluster_builder-0.1.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+cluster_builder/__init__.py,sha256=p2Rb2BTVm-ScqCKE38436WsItY1BjVAnvx7zwmneSLs,256
+cluster_builder/swarmchestrate.py,sha256=JZakXW_uEtp1AmsQj5gEHXPtqgaTZZCMeQ73eojA-Sw,13254
+cluster_builder-0.1.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+cluster_builder-0.1.2.dist-info/METADATA,sha256=DDatkIcPaDuYQQq0usOgytZ5lognhp8-yn8XWr3P9SQ,7563
+cluster_builder-0.1.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cluster_builder-0.1.2.dist-info/top_level.txt,sha256=fTW8EW1mcWoeWprjwxSHRWpqfXYX8iN-ByEt8HPXIcs,16
+cluster_builder-0.1.2.dist-info/RECORD,,

cluster_builder-0.1.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-cluster_builder/__init__.py,sha256=p2Rb2BTVm-ScqCKE38436WsItY1BjVAnvx7zwmneSLs,256
-cluster_builder/swarmchestrate.py,sha256=K3zWA4Ob6XVH0GDlDQW13Q3IHd1gEjHRvBfgtBLi-Wo,12471
-cluster_builder-0.1.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-cluster_builder-0.1.0.dist-info/METADATA,sha256=TLtMwDzzR5Rt79rie7_wkpKClfEbMzkNvljELcot-WM,7563
-cluster_builder-0.1.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cluster_builder-0.1.0.dist-info/top_level.txt,sha256=fTW8EW1mcWoeWprjwxSHRWpqfXYX8iN-ByEt8HPXIcs,16
-cluster_builder-0.1.0.dist-info/RECORD,,