Add support for dataproc cluster_tier (#14595) (#10453)

[upstream:d69d1e450e8b72f29303dbdb26015122440048ea]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/14595.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataproc: added `cluster_config.cluster_tier` field to `google_dataproc_cluster` resource
+```

google-beta/services/dataproc/resource_dataproc_cluster.go

@@ -118,6 +118,7 @@ var (
 	}
 
 	clusterConfigKeys = []string{
+		"cluster_config.0.cluster_tier",
 		"cluster_config.0.staging_bucket",
 		"cluster_config.0.temp_bucket",
 		"cluster_config.0.gce_cluster_config",
@@ -568,7 +569,15 @@ func ResourceDataprocCluster() *schema.Resource {
 				Description: `Allows you to configure various aspects of the cluster.`,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
-
+						"cluster_tier": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							Computed:     true,
+							Description:  `Specifies the tier of the cluster created.`,
+							AtLeastOneOf: clusterConfigKeys,
+							ForceNew:     true,
+							ValidateFunc: validation.StringInSlice([]string{"CLUSTER_TIER_UNSPECIFIED", "CLUSTER_TIER_STANDARD", "CLUSTER_TIER_PREMIUM"}, false),
+						},
 						"staging_bucket": {
 							Type:         schema.TypeString,
 							Optional:     true,
@@ -2089,6 +2098,10 @@ func expandClusterConfig(d *schema.ResourceData, config *transport_tpg.Config) (
 		conf.TempBucket = v.(string)
 	}
 
+	if v, ok := d.GetOk("cluster_config.0.cluster_tier"); ok {
+		conf.ClusterTier = v.(string)
+	}
+
 	c, err := expandGceClusterConfig(d, config)
 	if err != nil {
 		return nil, err
@@ -2985,8 +2998,8 @@ func flattenClusterConfig(d *schema.ResourceData, cfg *dataproc.ClusterConfig) (
 	}
 
 	data := map[string]interface{}{
-		"staging_bucket": d.Get("cluster_config.0.staging_bucket").(string),
-
+		"staging_bucket":            d.Get("cluster_config.0.staging_bucket").(string),
+		"cluster_tier":              d.Get("cluster_config.0.cluster_tier").(string),
 		"bucket":                    cfg.ConfigBucket,
 		"temp_bucket":               cfg.TempBucket,
 		"gce_cluster_config":        flattenGceClusterConfig(d, cfg.GceClusterConfig),

google-beta/services/dataproc/resource_dataproc_cluster_meta.yaml

@@ -92,6 +92,7 @@ fields:
   - field: 'cluster_config.software_config.properties'
   - field: 'cluster_config.staging_bucket'
   - field: 'cluster_config.temp_bucket'
+  - field: 'cluster_config.cluster_tier'
   - field: 'cluster_config.worker_config.accelerators.accelerator_count'
   - field: 'cluster_config.worker_config.accelerators.accelerator_type'
   - field: 'cluster_config.worker_config.disk_config.boot_disk_size_gb'

google-beta/services/dataproc/resource_dataproc_cluster_test.go

@@ -1240,6 +1240,76 @@ func TestAccDataprocCluster_withMetastoreConfig(t *testing.T) {
 	})
 }
 
+func TestAccDataprocCluster_withClusterTier(t *testing.T) {
+	t.Parallel()
+
+	var cluster dataproc.Cluster
+	rnd := acctest.RandString(t, 10)
+	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")
+	subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName)
+	acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckDataprocClusterDestroy(t),
+		Steps: []resource.TestStep{
+			{
+				// Set tier to CLUSTER_TIER_STANDARD
+				Config: testAccDataprocCluster_withClusterTier(rnd, subnetworkName, "CLUSTER_TIER_STANDARD"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.tier_cluster", &cluster),
+					resource.TestCheckResourceAttr("google_dataproc_cluster.tier_cluster", "cluster_config.0.cluster_tier", "CLUSTER_TIER_STANDARD"),
+				),
+			},
+			{
+				// Set tier to CLUSTER_TIER_PREMIUM
+				Config: testAccDataprocCluster_withClusterTier(rnd, subnetworkName, "CLUSTER_TIER_PREMIUM"),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.tier_cluster", &cluster),
+					resource.TestCheckResourceAttr("google_dataproc_cluster.tier_cluster", "cluster_config.0.cluster_tier", "CLUSTER_TIER_PREMIUM"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataprocCluster_withClusterTier(rnd, subnetworkName, tier string) string {
+	tierConfig := ""
+	if tier != "" {
+		tierConfig = fmt.Sprintf(`cluster_tier = "%s"`, tier)
+	}
+	clusterName := fmt.Sprintf("tf-test-dproc-tier-%s", rnd)
+	bucketName := clusterName + "-temp-bucket"
+
+	return fmt.Sprintf(`
+resource "google_storage_bucket" "bucket" {
+  name          = "%s"
+  location      = "US"
+  force_destroy = "true"
+}
+
+resource "google_dataproc_cluster" "tier_cluster" {
+  name   = "%s"
+  region = "us-central1"
+
+  cluster_config {
+	%s
+	staging_bucket = google_storage_bucket.bucket.name
+	temp_bucket = google_storage_bucket.bucket.name
+
+    software_config {
+      image_version = "2.3.4-debian12"
+    }
+
+    gce_cluster_config {
+      subnetwork = "%s"
+    }
+  }
+}
+`, bucketName, clusterName, tierConfig, subnetworkName)
+}
+
 func testAccCheckDataprocClusterDestroy(t *testing.T) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		config := acctest.GoogleProviderConfig(t)

website/docs/r/dataproc_cluster.html.markdown

@@ -59,6 +59,8 @@ resource "google_dataproc_cluster" "mycluster" {
   cluster_config {
     staging_bucket = "dataproc-staging-bucket"
 
+    cluster_tier = "CLUSTER_TIER_STANDARD"
+
     master_config {
       num_instances = 1
       machine_type  = "e2-medium"
@@ -355,6 +357,8 @@ resource "google_dataproc_cluster" "accelerated_cluster" {
    and jobs data, such as Spark and MapReduce history files.
    Note: If you don't explicitly specify a `temp_bucket` then GCP will auto create / assign one for you.
 
+* `cluster_tier` - (Optional) The tier of the cluster.
+
 * `gce_cluster_config` (Optional) Common config settings for resources of Google Compute Engine cluster
    instances, applicable to all instances in the cluster. Structure [defined below](#nested_gce_cluster_config).