fix: support root_size and sg_id params (#923)

* fix: support root_size and sg_id params

* fix: unit test repeat create sg

Co-authored-by: mikatong <[email protected]>

Author: tongyiming

tencentcloud/data_source_tc_emr_nodes_test.go

@@ -65,6 +65,7 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
     zone="ap-guangzhou-3"
     project_id=0
   }
+  sg_id="sg-qyy7jd2b"
 }
 data "tencentcloud_emr_nodes" "my_emr_nodes" {
   node_flag="master"

tencentcloud/extension_emr.go

@@ -36,6 +36,7 @@ func buildResourceSpecSchema() *schema.Schema {
 				"mem_size":     {Type: schema.TypeInt, Optional: true},
 				"cpu":          {Type: schema.TypeInt, Optional: true},
 				"disk_size":    {Type: schema.TypeInt, Optional: true},
+				"root_size":    {Type: schema.TypeInt, Optional: true},
 			},
 		},
 	}

tencentcloud/resource_tc_emr_cluster.go

@@ -187,6 +187,12 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 				- NOT_NEED_MASTER_WAN: Indicates that it is not turned on.
 				By default, the cluster Master node internet is enabled.`,
 			},
+			"sg_id": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				ForceNew:    true,
+				Description: "The ID of the security group to which the instance belongs, in the form of sg-xxxxxxxx.",
+			},
 		},
 	}
 }

tencentcloud/resource_tc_emr_cluster_test.go

@@ -37,6 +37,7 @@ func TestAccTencentCloudEmrClusterResource(t *testing.T) {
 					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "placement.zone", "ap-guangzhou-3"),
 					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "placement.project_id", "0"),
 					resource.TestCheckResourceAttrSet(testEmrClusterResourceKey, "instance_id"),
+					resource.TestCheckResourceAttr(testEmrClusterResourceKey, "sg_id", "sg-qyy7jd2b"),
 				),
 			},
 		},
@@ -108,6 +109,7 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
 		disk_type="CLOUD_PREMIUM"
 		spec="CVM.S2"
 		storage_type=5
+		root_size=50
 	  }
 	  core_resource_spec {
 		mem_size=8192
@@ -116,6 +118,7 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
 		disk_type="CLOUD_PREMIUM"
 		spec="CVM.S2"
 		storage_type=5
+		root_size=50
 	  }
 	  master_count=1
 	  core_count=2
@@ -130,5 +133,6 @@ resource "tencentcloud_emr_cluster" "emrrrr" {
 	  zone="ap-guangzhou-3"
 	  project_id=0
 	}
+	sg_id="sg-qyy7jd2b"
   }
 `

tencentcloud/service_tencentcloud_emr.go

@@ -156,6 +156,9 @@ func (me *EMRService) CreateInstance(ctx context.Context, d *schema.ResourceData
 			request.LoginSettings.PublicKeyId = common.StringPtr(publicKeyId.(string))
 		}
 	}
+	if v, ok := d.GetOk("sg_id"); ok {
+		request.SgId = common.StringPtr(v.(string))
+	}
 
 	ratelimit.Check(request.GetAction())
 	//API: https://cloud.tencent.com/document/api/589/34261

website/docs/r/emr_cluster.html.markdown

@@ -78,6 +78,7 @@ When TimeUnit is m, the number filled in by this parameter indicates the length
 				- NOT_NEED_MASTER_WAN: Indicates that it is not turned on.
 				By default, the cluster Master node internet is enabled.
 * `resource_spec` - (Optional) Resource specification of EMR instance.
+* `sg_id` - (Optional, ForceNew) The ID of the security group to which the instance belongs, in the form of sg-xxxxxxxx.
 
 The `resource_spec` object supports the following: