anyscale 0.26.64__py3-none-any.whl → 0.26.66__py3-none-any.whl

anyscale/controllers/cloud_controller.py

@@ -48,7 +48,6 @@ from anyscale.client.openapi_client.models import (
     FileStorage,
     GCPConfig,
     GCPFileStoreConfig,
-    KubernetesConfig,
     NetworkingMode,
     NFSMountTarget,
     ObjectStorage,
@@ -188,7 +187,10 @@ class CloudController(BaseController):
             )
 
     def list_clouds(
-        self, cloud_name: Optional[str], cloud_id: Optional[str], max_items: int
+        self,
+        cloud_name: Optional[str],
+        cloud_id: Optional[str],
+        max_items: Optional[int] = None,
     ) -> str:
         if cloud_id is not None:
             clouds = [
@@ -201,12 +203,23 @@ class CloudController(BaseController):
                 ).result
             ]
         else:
-            clouds = self.api_client.list_clouds_api_v2_clouds_get(
-                count=max_items
-            ).results
-        output = clouds_formatter.format_clouds_output(
-            clouds=clouds[:max_items], json_format=False
-        )
+            clouds = []
+            next_token = None
+            while True:
+                response = self.api_client.list_clouds_api_v2_clouds_get(
+                    paging_token=next_token,
+                )
+                clouds.extend(response.results)
+                if not response.metadata.next_paging_token:
+                    break
+                if max_items is not None and len(clouds) >= max_items:
+                    break
+                next_token = response.metadata.next_paging_token
+
+        if max_items is not None:
+            clouds = clouds[:max_items]
+
+        output = clouds_formatter.format_clouds_output(clouds=clouds, json_format=False)
         return str(output)
 
     def _get_anyscale_cross_account_iam_policies(
@@ -2642,23 +2655,12 @@ class CloudController(BaseController):
                 f"Overall Result: ALL {total_count} cloud resources verified successfully"
             )
 
-    def register_azure_or_generic_cloud(  # noqa: PLR0913
+    def register_azure_or_generic_cloud(
         self,
         name: str,
         provider: str,
+        cloud_resource: CloudDeployment,
         auto_add_user: bool = False,
-        # Optional cloud-resource-scoped parameters.
-        # Some of these are conditionally required.
-        region: Optional[str] = "default",
-        cloud_storage_bucket_name: Optional[str] = None,
-        cloud_storage_bucket_endpoint: Optional[str] = None,
-        cloud_storage_bucket_region: Optional[str] = None,
-        nfs_mount_targets: Optional[List[str]] = None,
-        nfs_mount_path: Optional[str] = None,
-        persistent_volume_claim: Optional[str] = None,
-        csi_ephemeral_volume_driver: Optional[str] = None,
-        kubernetes_zones: Optional[List[str]] = None,
-        anyscale_operator_iam_identity: Optional[str] = None,
     ) -> None:
         cloud_provider = (
             CloudProviders.AZURE if provider == "azure" else CloudProviders.GENERIC
@@ -2670,29 +2672,12 @@ class CloudController(BaseController):
             CloudAnalyticsEventName.COMMAND_START, succeeded=True
         )
 
-        # Handle parsing / conversion of nfs_mount_targets.
-        mount_targets: List[NFSMountTarget] = []
-        for target in nfs_mount_targets or []:
-            parts = [part.strip() for part in target.split(",")]
-            if len(parts) == 1:
-                mount_targets.append(NFSMountTarget(address=parts[0]))
-            elif len(parts) == 2:
-                mount_targets.append(NFSMountTarget(address=parts[1], zone=parts[0]))
-            else:
-                raise ClickException(
-                    f"Invalid mount target {target}; expected (zone,address) tuple or a singular address."
-                )
-
-        # Handle defaulting of region.
-        if not region:
-            region = "default"
-
         # Attempt to create the cloud.
         try:
             created_cloud = self.api_client.create_cloud_api_v2_clouds_post(
                 write_cloud=WriteCloud(
                     name=name,
-                    region=region,
+                    region=cloud_resource.region,
                     provider=cloud_provider,
                     is_bring_your_own_resource=True,
                     cluster_management_stack_version=ClusterManagementStackVersions.V2,
@@ -2717,30 +2702,7 @@ class CloudController(BaseController):
         try:
             with self.log.spinner("Registering Anyscale cloud resources..."):
                 self.api_client.add_cloud_resource_api_v2_clouds_cloud_id_add_resource_put(
-                    cloud_id=cloud_id,
-                    cloud_deployment=CloudDeployment(
-                        compute_stack=ComputeStack.K8S,
-                        provider=cloud_provider,
-                        region=region,
-                        object_storage=ObjectStorage(
-                            bucket_name=cloud_storage_bucket_name,
-                            region=cloud_storage_bucket_region or region,
-                            endpoint=cloud_storage_bucket_endpoint,
-                        )
-                        if cloud_storage_bucket_name
-                        else None,
-                        file_storage=FileStorage(
-                            mount_targets=mount_targets,
-                            mount_path=nfs_mount_path,
-                            persistent_volume_claim=persistent_volume_claim,
-                            csi_ephemeral_volume_driver=csi_ephemeral_volume_driver,
-                        )
-                        if mount_targets
-                        or persistent_volume_claim
-                        or csi_ephemeral_volume_driver
-                        else None,
-                        kubernetes_config=KubernetesConfig(zones=kubernetes_zones,),
-                    ),
+                    cloud_id=cloud_id, cloud_deployment=cloud_resource,
                 )
 
             self.cloud_event_producer.produce(
@@ -2776,10 +2738,13 @@ class CloudController(BaseController):
         helm_command = self._generate_helm_upgrade_command(
             provider=provider,
             cloud_deployment_id=cloud_resource_id,
-            region=region if cloud_provider == CloudProviders.AZURE else None,
-            operator_iam_identity=anyscale_operator_iam_identity
+            region=cloud_resource.region
             if cloud_provider == CloudProviders.AZURE
             else None,
+            operator_iam_identity=cloud_resource.kubernetes_config.anyscale_operator_iam_identity
+            if cloud_provider == CloudProviders.AZURE
+            and cloud_resource.kubernetes_config
+            else None,
             anyscale_cli_token=None,  # TODO: use $ANYSCALE_CLI_TOKEN placeholder
         )
 
@@ -2787,48 +2752,42 @@ class CloudController(BaseController):
             f"Cloud registration complete! To install the Anyscale operator, run:\n\n{helm_command}"
         )
 
-    def register_aws_cloud(  # noqa: PLR0913, PLR0912, C901
+    def register_aws_cloud(  # noqa: C901, PLR0912
         self,
         *,
-        region: str,
         name: str,
-        vpc_id: str,
-        subnet_ids: List[str],
-        efs_id: Optional[str],
-        anyscale_iam_role_id: str,
-        instance_iam_role_id: str,
-        security_group_ids: List[str],
-        cloud_storage_bucket_name: str,
-        memorydb_cluster_id: Optional[str],
-        functional_verify: Optional[str],
-        private_network: bool,
-        cluster_management_stack_version: ClusterManagementStackVersions,
+        cloud_resource: CloudDeployment,
+        functional_verify: Optional[str] = None,
+        cluster_management_stack_version: ClusterManagementStackVersions = ClusterManagementStackVersions.V2,
         yes: bool = False,
         skip_verifications: bool = False,
         auto_add_user: bool = False,
-        external_id: Optional[str] = None,
-        # Default to ComputeStack.VM for backwards compatibility
-        # for SDK users who do not specify a compute stack here.
-        compute_stack: ComputeStack = ComputeStack.VM,
-        kubernetes_zones: Optional[List[str]] = None,
-        anyscale_operator_iam_identity: Optional[str] = None,
-        persistent_volume_claim: Optional[str] = None,
-        csi_ephemeral_volume_driver: Optional[str] = None,
     ):
         functions_to_verify = self._validate_functional_verification_args(
             functional_verify
         )
+
         if not validate_aws_credentials(self.log):
             raise ClickException(
                 "Cloud registration requires valid AWS credentials to be set locally. Learn more: https://boto3.amazonaws.com/v1/documentation/api/latest/guide/credentials.html"
             )
 
-        # We accept both the full ARN and the bucket name as input
-        # but we unify it to the bucket name here
-        if cloud_storage_bucket_name.startswith(S3_ARN_PREFIX):
-            cloud_storage_bucket_name = cloud_storage_bucket_name[len(S3_ARN_PREFIX) :]
-        if not cloud_storage_bucket_name.startswith(S3_STORAGE_PREFIX):
-            cloud_storage_bucket_name = S3_STORAGE_PREFIX + cloud_storage_bucket_name
+        assert cloud_resource.aws_config
+
+        if not (
+            cloud_resource.object_storage and cloud_resource.object_storage.bucket_name
+        ):
+            raise click.ClickException(
+                "Cloud object storage is required for AWS cloud registration."
+            )
+        if cloud_resource.object_storage.bucket_name.startswith(S3_ARN_PREFIX):
+            cloud_resource.object_storage.bucket_name = cloud_resource.object_storage.bucket_name[
+                len(S3_ARN_PREFIX) :
+            ]
+        if not cloud_resource.object_storage.bucket_name.startswith(S3_STORAGE_PREFIX):
+            cloud_resource.object_storage.bucket_name = (
+                S3_STORAGE_PREFIX + cloud_resource.object_storage.bucket_name
+            )
 
         self.cloud_event_producer.init_trace_context(
             CloudAnalyticsEventCommandName.REGISTER, CloudProviders.AWS
@@ -2837,27 +2796,29 @@ class CloudController(BaseController):
             CloudAnalyticsEventName.COMMAND_START, succeeded=True
         )
 
-        credentials = anyscale_iam_role_id
-        if compute_stack == ComputeStack.K8S:
+        if cloud_resource.compute_stack == ComputeStack.K8S:
             # On K8S, we don't need to collect credentials;
             # instead, write a random value into this field
             # to maintain the property that each cloud's
             # credentials are unique.
             credentials = uuid.uuid4().hex
+        else:
+            credentials = cloud_resource.aws_config.anyscale_iam_role_id
 
         # Create a cloud without cloud resources first
         try:
             created_cloud = self.api_client.create_cloud_api_v2_clouds_post(
                 write_cloud=WriteCloud(
                     provider="AWS",
-                    region=region,
+                    region=cloud_resource.region,
                     credentials=credentials,
                     name=name,
                     is_bring_your_own_resource=True,
-                    is_private_cloud=private_network,
+                    is_private_cloud=cloud_resource.networking_mode
+                    == NetworkingMode.PRIVATE,
                     cluster_management_stack_version=cluster_management_stack_version,
                     auto_add_user=auto_add_user,
-                    external_id=external_id,
+                    external_id=cloud_resource.aws_config.external_id,
                 )
             )
             cloud_id = created_cloud.result.id
@@ -2874,37 +2835,6 @@ class CloudController(BaseController):
             raise
 
         try:
-            cloud_resource = CloudDeployment(
-                compute_stack=compute_stack,
-                provider=CloudProviders.AWS,
-                region=region,
-                networking_mode=NetworkingMode.PRIVATE
-                if private_network
-                else NetworkingMode.PUBLIC,
-                object_storage=ObjectStorage(bucket_name=cloud_storage_bucket_name),
-                file_storage=FileStorage(
-                    file_storage_id=efs_id,
-                    persistent_volume_claim=persistent_volume_claim,
-                    csi_ephemeral_volume_driver=csi_ephemeral_volume_driver,
-                )
-                if efs_id or persistent_volume_claim or csi_ephemeral_volume_driver
-                else None,
-                aws_config=AWSConfig(
-                    vpc_id=vpc_id,
-                    subnet_ids=subnet_ids,
-                    security_group_ids=security_group_ids,
-                    anyscale_iam_role_id=anyscale_iam_role_id,
-                    external_id=external_id,
-                    cluster_iam_role_id=instance_iam_role_id,
-                    memorydb_cluster_name=memorydb_cluster_id,
-                ),
-                kubernetes_config=KubernetesConfig(
-                    anyscale_operator_iam_identity=anyscale_operator_iam_identity,
-                    zones=kubernetes_zones,
-                )
-                if compute_stack == ComputeStack.K8S
-                else None,
-            )
             role, iam_role_original_policy = self._preprocess_aws(
                 cloud_id=cloud_id, deployment=cloud_resource
             )
@@ -2930,7 +2860,10 @@ class CloudController(BaseController):
                 cloud_id=cloud_id
             )
             try:
-                if iam_role_original_policy is not None and external_id is None:
+                if (
+                    iam_role_original_policy is not None
+                    and cloud_resource.aws_config.external_id is None
+                ):
                     # Revert the assume policy back to the original policy
                     role.AssumeRolePolicy().update(  # type: ignore
                         PolicyDocument=json.dumps(iam_role_original_policy)
@@ -2945,7 +2878,7 @@ class CloudController(BaseController):
             # Verify cloud resources meet our requirement
             # Verification is only performed for VM compute stack.
             # TODO (shomilj): Add verification to the K8S compute stack as well.
-            if compute_stack == ComputeStack.VM:
+            if cloud_resource.compute_stack != ComputeStack.K8S:
                 with self.log.spinner("Verifying cloud resources...") as spinner:
                     if (
                         not skip_verifications
@@ -2983,7 +2916,10 @@ class CloudController(BaseController):
                 cloud_id=cloud_id
             )
             try:
-                if iam_role_original_policy is not None and external_id is None:
+                if (
+                    iam_role_original_policy is not None
+                    and cloud_resource.aws_config.external_id is None
+                ):
                     # Revert the assume policy back to the original policy
                     role.AssumeRolePolicy().update(  # type: ignore
                         PolicyDocument=json.dumps(iam_role_original_policy)
@@ -3006,9 +2942,7 @@ class CloudController(BaseController):
             # For now, only wait for the cloud to be active if the compute stack is VM.
             # TODO (shomilj): support this fully for Kubernetes after provider metadata
             # checks are removed.
-            if compute_stack == ComputeStack.VM:
-                self.wait_for_cloud_to_be_active(cloud_id, CloudProviders.AWS)
-            if compute_stack == ComputeStack.K8S:
+            if cloud_resource.compute_stack == ComputeStack.K8S:
                 # Get the cloud resource ID to pass to the helm command.
                 cloud_resources = self.api_client.get_cloud_resources_api_v2_clouds_cloud_id_resources_get(
                     cloud_id=cloud_id,
@@ -3021,11 +2955,13 @@ class CloudController(BaseController):
                 helm_command = self._generate_helm_upgrade_command(
                     provider="aws",
                     cloud_deployment_id=cloud_resource_id,
-                    region=region,
+                    region=cloud_resource.region,
                 )
                 self.log.info(
                     f"Cloud registration complete! To install the Anyscale operator, run:\n\n{helm_command}"
                 )
+            else:
+                self.wait_for_cloud_to_be_active(cloud_id, CloudProviders.AWS)
             self.cloud_event_producer.produce(
                 CloudAnalyticsEventName.INFRA_SETUP_COMPLETE, succeeded=True
             )
@@ -3042,7 +2978,10 @@ class CloudController(BaseController):
                 cloud_id=cloud_id
             )
             try:
-                if iam_role_original_policy is not None and external_id is None:
+                if (
+                    iam_role_original_policy is not None
+                    and cloud_resource.aws_config.external_id is None
+                ):
                     # Revert the assume policy back to the original policy
                     role.AssumeRolePolicy().update(  # type: ignore
                         PolicyDocument=json.dumps(iam_role_original_policy)
@@ -3281,52 +3220,77 @@ class CloudController(BaseController):
             ]
         )
 
-    def register_gcp_cloud(  # noqa: PLR0913, PLR0912, C901
+    def _validate_gcp_config(self, compute_stack: ComputeStack, gcp_config: GCPConfig):
+        if gcp_config.project_id and gcp_config.project_id[0].isdigit():
+            # project ID should start with a letter
+            raise click.ClickException(
+                "Please provide a valid project ID. Note that project ID is not project number, see https://cloud.google.com/resource-manager/docs/creating-managing-projects#before_you_begin for details."
+            )
+
+        if (
+            compute_stack != ComputeStack.K8S
+            and re.search(
+                "projects\\/[0-9]*\\/locations\\/global\\/workloadIdentityPools\\/.+\\/providers\\/[a-z0-9-]*$",
+                gcp_config.provider_name,
+            )
+            is None
+        ):
+            raise click.ClickException(
+                "Please provide a valid, fully qualified provider name. Only lowercase letters, numbers, and dashes are allowed. Example: projects/<project number>/locations/global/workloadIdentityPools/<pool name>/providers/<provider id>"
+            )
+
+        if (
+            gcp_config.memorystore_instance_name is not None
+            and re.search(
+                "projects/.+/locations/.+/instances/.+",
+                gcp_config.memorystore_instance_name,
+            )
+            is None
+        ):
+            raise click.ClickException(
+                "Please provide a valid memorystore instance name. Example: projects/<project number>/locations/<location>/instances/<instance id>"
+            )
+
+        if (
+            gcp_config.host_project_id is not None
+            and gcp_config.host_project_id[0].isdigit()
+        ):
+            # project ID should start with a letter
+            raise click.ClickException(
+                "Please provide a valid host project ID. Note that project ID is not project number, see https://cloud.google.com/resource-manager/docs/creating-managing-projects#before_you_begin for details."
+            )
+
+    def register_gcp_cloud(  # noqa: C901, PLR0912
         self,
         *,
-        region: str,
         name: str,
-        project_id: str,
-        vpc_name: str,
-        subnet_names: List[str],
-        filestore_instance_id: str,
-        filestore_location: str,
-        anyscale_service_account_email: str,
-        instance_service_account_email: str,
-        provider_id: str,
-        firewall_policy_names: List[str],
-        cloud_storage_bucket_name: str,
-        memorystore_instance_name: Optional[str],
-        functional_verify: Optional[str],
-        private_network: bool,
-        cluster_management_stack_version: ClusterManagementStackVersions,
-        host_project_id: Optional[str] = None,
+        cloud_resource: CloudDeployment,
+        functional_verify: Optional[str] = None,
+        cluster_management_stack_version: ClusterManagementStackVersions = ClusterManagementStackVersions.V2,
         yes: bool = False,
         skip_verifications: bool = False,
         auto_add_user: bool = False,
-        # Default to ComputeStack.VM for backwards compatibility
-        # for SDK users who do not specify a compute stack here.
-        compute_stack: ComputeStack = ComputeStack.VM,
-        kubernetes_zones: Optional[List[str]] = None,
-        anyscale_operator_iam_identity: Optional[str] = None,
-        persistent_volume_claim: Optional[str] = None,
-        csi_ephemeral_volume_driver: Optional[str] = None,
     ):
         functions_to_verify = self._validate_functional_verification_args(
             functional_verify
         )
 
-        # Create a cloud without cloud resources first
-        # Provider ID is optional for K8s clouds.
-        if compute_stack != ComputeStack.K8S:
-            provider_id_re_result = re.search(
-                "projects\\/[0-9]*\\/locations\\/global\\/workloadIdentityPools\\/.+\\/providers\\/[a-z0-9-]*$",
-                provider_id,
+        assert cloud_resource.compute_stack
+        assert cloud_resource.gcp_config
+        self._validate_gcp_config(
+            cloud_resource.compute_stack, cloud_resource.gcp_config
+        )
+
+        if not (
+            cloud_resource.object_storage and cloud_resource.object_storage.bucket_name
+        ):
+            raise click.ClickException(
+                "Cloud object storage is required for GCP cloud registration."
+            )
+        if not cloud_resource.object_storage.bucket_name.startswith(GCS_STORAGE_PREFIX):
+            cloud_resource.object_storage.bucket_name = (
+                GCS_STORAGE_PREFIX + cloud_resource.object_storage.bucket_name
             )
-            if provider_id_re_result is None:
-                raise ClickException(
-                    f"Invalid provider_id {provider_id}. Only lowercase letters, numbers, and dashes are allowed."
-                )
 
         self.cloud_event_producer.init_trace_context(
             CloudAnalyticsEventCommandName.REGISTER, CloudProviders.GCP
@@ -3336,16 +3300,7 @@ class CloudController(BaseController):
         )
 
         try:
-            credentials_dict = {
-                "project_id": project_id or "",
-                "provider_id": provider_id or "",
-                "service_account_email": anyscale_service_account_email or "",
-            }
-            if host_project_id:
-                credentials_dict["host_project_id"] = host_project_id
-            credentials = json.dumps(credentials_dict)
-
-            if compute_stack == ComputeStack.K8S:
+            if cloud_resource.compute_stack == ComputeStack.K8S:
                 # On K8S, we don't need to collect credentials;
                 # instead, write a random trace_id into this field
                 # to maintain the property that each cloud's
@@ -3358,19 +3313,34 @@ class CloudController(BaseController):
                         "service_account_email": random_id,
                     }
                 )
+            else:
+                credentials_dict = {
+                    "project_id": cloud_resource.gcp_config.project_id or "",
+                    "provider_id": cloud_resource.gcp_config.provider_name or "",
+                    "service_account_email": cloud_resource.gcp_config.anyscale_service_account_email
+                    or "",
+                }
+                if cloud_resource.gcp_config.host_project_id:
+                    credentials_dict[
+                        "host_project_id"
+                    ] = cloud_resource.gcp_config.host_project_id
+                credentials = json.dumps(credentials_dict)
 
             # NOTE: For now we set the is_private_service_cloud to be the same as is_private_cloud
             # We don't expose this to the user yet since it's not recommended.
-            is_private_service_cloud = private_network
+            is_private_network = (
+                cloud_resource.networking_mode == NetworkingMode.PRIVATE
+            )
+            is_private_service_cloud = is_private_network
 
             created_cloud = self.api_client.create_cloud_api_v2_clouds_post(
                 write_cloud=WriteCloud(
                     provider="GCP",
-                    region=region,
+                    region=cloud_resource.region,
                     credentials=credentials,
                     name=name,
                     is_bring_your_own_resource=True,
-                    is_private_cloud=private_network,
+                    is_private_cloud=is_private_network,
                     cluster_management_stack_version=cluster_management_stack_version,
                     is_private_service_cloud=is_private_service_cloud,
                     auto_add_user=auto_add_user,
@@ -3390,69 +3360,31 @@ class CloudController(BaseController):
             raise
 
         try:
-            enable_filestore = filestore_location and filestore_instance_id
+            file_storage = cloud_resource.file_storage
+            # Check if filestore is enabled
+            enable_filestore = file_storage and file_storage.file_storage_id
 
             # Normally, for Kubernetes clouds, we don't need a VPC name, since networking is managed by Kubernetes.
             # For Kubernetes clouds on GCP where Filestore is enabled, we require the VPC name, since it is needed
             # to look up the relevant Mount Target IP for Filestore in the VPC.
-            if compute_stack == ComputeStack.K8S:
-                if enable_filestore and not vpc_name:
+            if cloud_resource.compute_stack == ComputeStack.K8S:
+                if enable_filestore and not cloud_resource.gcp_config.vpc_name:
                     raise ClickException(
                         "Please provide the name of the VPC that your Kubernetes cluster is running inside of."
                     )
-                if (enable_filestore or memorystore_instance_name) and not project_id:
-                    raise ClickException("Please provide a project ID.")
-
-            if not cloud_storage_bucket_name.startswith(GCS_STORAGE_PREFIX):
-                cloud_storage_bucket_name = (
-                    GCS_STORAGE_PREFIX + cloud_storage_bucket_name
+                memorystore_instance_name = (
+                    cloud_resource.gcp_config.memorystore_instance_name
                 )
-
-            cloud_resource = CloudDeployment(
-                compute_stack=compute_stack,
-                provider=CloudProviders.GCP,
-                region=region,
-                networking_mode=NetworkingMode.PRIVATE
-                if private_network
-                else NetworkingMode.PUBLIC,
-                object_storage=ObjectStorage(bucket_name=cloud_storage_bucket_name),
-                file_storage=FileStorage(
-                    file_storage_id="projects/{}/locations/{}/instances/{}".format(
-                        project_id, filestore_location, filestore_instance_id
-                    )
-                    if filestore_instance_id
-                    else None,
-                    persistent_volume_claim=persistent_volume_claim,
-                    csi_ephemeral_volume_driver=csi_ephemeral_volume_driver,
-                )
-                if filestore_instance_id
-                or persistent_volume_claim
-                or csi_ephemeral_volume_driver
-                else None,
-                gcp_config=GCPConfig(
-                    project_id=project_id,
-                    host_project_id=host_project_id,
-                    provider_name=provider_id,
-                    vpc_name=vpc_name,
-                    subnet_names=subnet_names,
-                    firewall_policy_names=firewall_policy_names,
-                    anyscale_service_account_email=anyscale_service_account_email,
-                    cluster_service_account_email=instance_service_account_email,
-                    memorystore_instance_name=memorystore_instance_name,
-                ),
-                kubernetes_config=KubernetesConfig(
-                    anyscale_operator_iam_identity=anyscale_operator_iam_identity,
-                    zones=kubernetes_zones,
-                )
-                if compute_stack == ComputeStack.K8S
-                else None,
-            )
+                if (
+                    enable_filestore or memorystore_instance_name
+                ) and not cloud_resource.gcp_config.project_id:
+                    raise ClickException("Please provide a project ID.")
 
             self._preprocess_gcp(cloud_resource)
 
             # Verification is only performed for VM compute stack.
             # TODO (shomilj): Add verification to the K8S compute stack as well.
-            if compute_stack == ComputeStack.VM:
+            if cloud_resource.compute_stack != ComputeStack.K8S:
                 if (
                     not skip_verifications
                     and not self.verify_gcp_cloud_resources_from_cloud_deployment(
@@ -3500,9 +3432,7 @@ class CloudController(BaseController):
             # For now, only wait for the cloud to be active if the compute stack is VM.
             # TODO (shomilj): support this fully for Kubernetes after provider metadata
             # checks are removed.
-            if compute_stack == ComputeStack.VM:
-                self.wait_for_cloud_to_be_active(cloud_id, CloudProviders.GCP)
-            if compute_stack == ComputeStack.K8S:
+            if cloud_resource.compute_stack == ComputeStack.K8S:
                 # Get the cloud resource ID to pass to the helm command.
                 cloud_resources = self.api_client.get_cloud_resources_api_v2_clouds_cloud_id_resources_get(
                     cloud_id=cloud_id,
@@ -3515,20 +3445,24 @@ class CloudController(BaseController):
                 helm_command = self._generate_helm_upgrade_command(
                     provider="gcp",
                     cloud_deployment_id=cloud_resource_id,
-                    region=region,
-                    operator_iam_identity=anyscale_service_account_email,
+                    region=cloud_resource.region,
+                    operator_iam_identity=cloud_resource.gcp_config.anyscale_service_account_email,
                 )
                 gcloud_command = self._generate_gcp_workload_identity_command(
-                    anyscale_service_account_email=anyscale_service_account_email,
-                    project_id=project_id,
+                    anyscale_service_account_email=cloud_resource.gcp_config.anyscale_service_account_email,
+                    project_id=cloud_resource.gcp_config.project_id,
                     namespace="<namespace>",
                 )
                 self.log.info(
                     f"Cloud registration complete! To install the Anyscale operator, run:\n\n{helm_command}\n\nThen configure workload identity by running:\n\n{gcloud_command}"
                 )
+            else:
+                self.wait_for_cloud_to_be_active(cloud_id, CloudProviders.GCP)
+
             self.cloud_event_producer.produce(
                 CloudAnalyticsEventName.INFRA_SETUP_COMPLETE, succeeded=True
             )
+
         except Exception as e:  # noqa: BLE001
             self.log.error(str(e))
             self.cloud_event_producer.produce(
@@ -3657,7 +3591,7 @@ class CloudController(BaseController):
             )
 
         # Tear down admin zone and mark cloud as deleted
-        with self.log.spinner("Deleting Anyscale cloud..."):
+        with self.log.spinner("Deleting Anyscale cloud (this may take 2-5 minutes)..."):
             try:
                 self.api_client.delete_cloud_api_v2_clouds_cloud_id_delete(
                     cloud_id=cloud_id