emr support autorenew

Author: mikatong

tencentcloud/services/emr/resource_tc_emr_cluster.go

@@ -205,6 +205,12 @@ func ResourceTencentCloudEmrCluster() *schema.Resource {
 				Computed:    true,
 				Description: "Tag description list.",
 			},
+			"auto_renew": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Computed:    true,
+				Description: "0 means turn off automatic renewal, 1 means turn on automatic renewal. Default is 0.",
+			},
 		},
 	}
 }
@@ -214,7 +220,7 @@ func resourceTencentCloudEmrClusterUpdate(d *schema.ResourceData, meta interface
 	logId := tccommon.GetLogId(tccommon.ContextNil)
 	ctx := context.WithValue(context.TODO(), tccommon.LogIdKey, logId)
 
-	immutableFields := []string{"placement", "placement_info", "display_strategy", "login_settings", "resource_spec.0.master_count", "resource_spec.0.task_count", "resource_spec.0.core_count"}
+	immutableFields := []string{"auto_renew", "placement", "placement_info", "display_strategy", "login_settings", "resource_spec.0.master_count", "resource_spec.0.task_count", "resource_spec.0.core_count"}
 	for _, f := range immutableFields {
 		if d.HasChange(f) {
 			return fmt.Errorf("cannot update argument `%s`", f)
@@ -394,6 +400,35 @@ func resourceTencentCloudEmrClusterDelete(d *schema.ResourceData, meta interface
 		return err
 	}
 
+	// 预付费删除
+	payMode := d.Get("pay_mode").(int)
+	if payMode == 1 {
+		if err = emrService.DeleteInstance(ctx, d); err != nil {
+			return err
+		}
+		err = resource.Retry(10*tccommon.ReadRetryTimeout, func() *resource.RetryError {
+			clusters, err := emrService.DescribeInstancesById(ctx, instanceId, DisplayStrategyIsclusterList)
+
+			if e, ok := err.(*errors.TencentCloudSDKError); ok {
+				if e.GetCode() == "ResourceNotFound.InstanceNotFound" {
+					return nil
+				}
+			}
+
+			if len(clusters) > 0 {
+				return resource.RetryableError(fmt.Errorf("%v being destroyed", instanceId))
+			}
+
+			if err != nil {
+				return resource.RetryableError(err)
+			}
+			return nil
+		})
+		if err != nil {
+			return err
+		}
+	}
+
 	if metaDB != nil && *metaDB != "" {
 		// remove metadb
 		mysqlService := svccdb.NewMysqlService(meta.(tccommon.ProviderMeta).GetAPIV3Conn())
@@ -625,5 +660,22 @@ func resourceTencentCloudEmrClusterRead(d *schema.ResourceData, meta interface{}
 		return err
 	}
 	_ = d.Set("tags", tags)
+	err = resource.Retry(tccommon.ReadRetryTimeout, func() *resource.RetryError {
+		result, err := emrService.DescribeClusterNodes(ctx, instanceId, "all", "all", 0, 10)
+
+		if err != nil {
+			return resource.RetryableError(err)
+		}
+
+		if len(result) > 0 {
+			_ = d.Set("auto_renew", result[0].IsAutoRenew)
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return err
+	}
 	return nil
 }

tencentcloud/services/emr/resource_tc_emr_cluster_test.go

@@ -130,7 +130,7 @@ func init() {
 
 var testEmrClusterResourceKey = "tencentcloud_emr_cluster.emrrrr"
 
-func TestAccTencentCloudEmrClusterResource(t *testing.T) {
+func TestAccTencentCloudEmrClusterResource_Basic(t *testing.T) {
 	t.Parallel()
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { tcacctest.AccPreCheck(t) },
@@ -166,6 +166,38 @@ func TestAccTencentCloudEmrClusterResource(t *testing.T) {
 		},
 	})
 }
+func TestAccTencentCloudEmrClusterResource_Prepay(t *testing.T) {
+	t.Parallel()
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { tcacctest.AccPreCheck(t) },
+		Providers: tcacctest.AccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testEmrBasicPrepay,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckEmrExists(testEmrClusterResourceKey),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "product_id", "38"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "vpc_settings.vpc_id", tcacctest.DefaultEMRVpcId),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "vpc_settings.subnet_id", tcacctest.DefaultEMRSubnetId),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "softwares.#", "5"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "support_ha", "0"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "instance_name", "emr-test-demo"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "resource_spec.#", "1"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "login_settings.password", "Tencent@cloud123"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "time_span", "1"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "time_unit", "m"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "pay_mode", "1"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "placement_info.0.zone", "ap-guangzhou-3"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "placement_info.0.project_id", "0"),
+					resource.TestCheckResourceAttrSet(testEmrClusterResourceKey, "instance_id"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "sg_id", tcacctest.DefaultEMRSgId),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "tags.emr-key", "emr-value"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "auto_renew", "1"),
+				),
+			},
+		},
+	})
+}
 
 func TestAccTencentCloudEmrClusterResource_NotNeedMasterWan(t *testing.T) {
 	t.Parallel()
@@ -295,6 +327,75 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
   }
 `
 
+const testEmrBasicPrepay = tcacctest.DefaultEMRVariable + `
+data "tencentcloud_instance_types" "cvm4c8m" {
+	exclude_sold_out=true
+	cpu_core_count=4
+	memory_size=8
+    filter {
+      name   = "instance-charge-type"
+      values = ["POSTPAID_BY_HOUR"]
+    }
+    filter {
+    name   = "zone"
+    values = ["ap-guangzhou-3"]
+  }
+}
+
+resource "tencentcloud_emr_cluster" "emrrrr" {
+	product_id=38
+	vpc_settings={
+	  vpc_id=var.vpc_id
+	  subnet_id=var.subnet_id
+	}
+	softwares = [
+	  "hdfs-2.8.5",
+	  "knox-1.6.1",
+	  "openldap-2.4.44",
+	  "yarn-2.8.5",
+	  "zookeeper-3.6.3",
+	]
+	support_ha=0
+	instance_name="emr-test-demo"
+	resource_spec {
+	  master_resource_spec {
+		mem_size=8192
+		cpu=4
+		disk_size=100
+		disk_type="CLOUD_PREMIUM"
+		spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
+		storage_type=5
+		root_size=50
+	  }
+	  core_resource_spec {
+		mem_size=8192
+		cpu=4
+		disk_size=100
+		disk_type="CLOUD_PREMIUM"
+		spec="CVM.${data.tencentcloud_instance_types.cvm4c8m.instance_types.0.family}"
+		storage_type=5
+		root_size=50
+	  }
+	  master_count=1
+	  core_count=2
+	}
+	login_settings={
+	  password="Tencent@cloud123"
+	}
+	time_span=1
+	time_unit="m"
+	pay_mode=1
+	placement_info {
+	  zone="ap-guangzhou-3"
+	  project_id=0
+	}
+	sg_id=var.sg_id
+	tags = {
+        emr-key = "emr-value"
+    }
+	auto_renew=1
+  }
+`
 const testEmrNotNeedMasterWan = tcacctest.DefaultEMRVariable + `
 data "tencentcloud_instance_types" "cvm4c8m" {
 	exclude_sold_out=true

tencentcloud/services/emr/service_tencentcloud_emr.go

@@ -60,6 +60,11 @@ func (me *EMRService) DeleteInstance(ctx context.Context, d *schema.ResourceData
 func (me *EMRService) CreateInstance(ctx context.Context, d *schema.ResourceData) (id string, err error) {
 	logId := tccommon.GetLogId(ctx)
 	request := emr.NewCreateInstanceRequest()
+
+	if v, ok := d.GetOk("auto_renew"); ok {
+		request.AutoRenew = common.Uint64Ptr((uint64)(v.(int)))
+	}
+
 	if v, ok := d.GetOk("product_id"); ok {
 		request.ProductId = common.Uint64Ptr((uint64)(v.(int)))
 	}

website/docs/r/emr_cluster.html.markdown

@@ -124,6 +124,7 @@ The following arguments are supported:
 * `softwares` - (Required, Set: [`String`], ForceNew) The softwares of a EMR instance.
 * `support_ha` - (Required, Int, ForceNew) The flag whether the instance support high availability.(0=>not support, 1=>support).
 * `vpc_settings` - (Required, Map, ForceNew) The private net config of EMR instance.
+* `auto_renew` - (Optional, Int) 0 means turn off automatic renewal, 1 means turn on automatic renewal. Default is 0.
 * `display_strategy` - (Optional, String, **Deprecated**) It will be deprecated in later versions. Display strategy of EMR instance.
 * `extend_fs_field` - (Optional, String) Access the external file system.
 * `login_settings` - (Optional, Map) Instance login settings. There are two optional fields:- password: Instance login password: 8-16 characters, including uppercase letters, lowercase letters, numbers and special characters. Special symbols only support! @% ^ *. The first bit of the password cannot be a special character;- public_key_id: Public key id. After the key is associated, the instance can be accessed through the corresponding private key.