Cluster API: Naming things and refactoring

Author: amotl

cratedb_toolkit/cluster/core.py

@@ -10,7 +10,7 @@
 import click
 from boltons.urlutils import URL
 
-from cratedb_toolkit.cluster.croud import CloudManager
+from cratedb_toolkit.cluster.croud import CloudClusterServices, CloudRootServices
 from cratedb_toolkit.cluster.guide import DataImportGuide
 from cratedb_toolkit.cluster.model import ClientBundle, ClusterBase, ClusterInformation
 from cratedb_toolkit.config import CONFIG
@@ -132,7 +132,8 @@ def __init__(
                 "Failed to address cluster: Either cluster identifier or name needs to be specified"
             )
 
-        self.cm = CloudManager()
+        self.root = CloudRootServices()
+        self.cluster: t.Optional[CloudClusterServices] = None
         self._jwt_ctx: t.ContextManager = nullcontext()
         self._client_bundle: t.Optional[ClientBundle] = None
 
@@ -209,6 +210,8 @@ def probe(self) -> "ManagedCluster":
             self.cluster_name = self.info.cloud["name"]
             self.address = DatabaseAddress.from_httpuri(self.info.cloud["url"])
             self._jwt_ctx = jwt_token_patch(self.info.jwt.token)
+            if self.cluster_id:
+                self.cluster = CloudClusterServices(cluster_id=self.cluster_id)
 
         except (CroudException, DatabaseAddressMissingError) as ex:
             self.exists = False
@@ -276,7 +279,7 @@ def deploy(self) -> "ManagedCluster":
         # Find the existing project by name (equals cluster name).
         project_id = None
         try:
-            projects = self.cm.list_projects()
+            projects = self.root.list_projects()
             for project in projects:
                 if project["name"] == self.cluster_name:
                     project_id = project["id"]
@@ -287,11 +290,11 @@ def deploy(self) -> "ManagedCluster":
 
         # Create a new project if none exists.
         if not project_id:
-            project = self.cm.create_project(name=self.cluster_name, organization_id=self.settings.organization_id)
+            project = self.root.create_project(name=self.cluster_name, organization_id=self.settings.organization_id)
             project_id = project["id"]
             logger.info(f"Created project: {project_id}")
 
-        cluster_info = self.cm.deploy_cluster(
+        cluster_info = self.root.deploy_cluster(
             name=self.cluster_name, project_id=project_id, subscription_id=self.settings.subscription_id
         )
 
@@ -309,7 +312,8 @@ def resume(self) -> "ManagedCluster":
         if self.cluster_id is None:
             raise DatabaseAddressMissingError("Need cluster identifier to resume cluster")
         logger.info(f"Resuming CrateDB Cloud Cluster: id={self.cluster_id}, name={self.cluster_name}")
-        self.cm.resume_cluster(identifier=self.cluster_id)
+        if self.cluster:
+            self.cluster.resume()
         self.probe()
         return self
 
@@ -322,7 +326,8 @@ def stop(self) -> "ManagedCluster":
         if self.cluster_id is None:
             raise DatabaseAddressMissingError("Need cluster identifier to stop cluster")
         logger.info(f"Stopping CrateDB Cloud Cluster: id={self.cluster_id}, name={self.cluster_name}")
-        self.cm.suspend_cluster(identifier=self.cluster_id)
+        if self.cluster:
+            self.cluster.suspend()
         self.probe()
         return self