fix: emr destroy && support need_master_wan param (#908)

Co-authored-by: mikatong <mikatong@tencent.com>

Author: tongyiming

tencentcloud/extension_emr.go

@@ -15,6 +15,13 @@ const (
 	DisplayStrategyIsclusterList = "clusterList"
 )
 
+const (
+	EMR_MASTER_WAN_TYPE_NEED_MASTER_WAN     = "NEED_MASTER_WAN"
+	EMR_MASTER_WAN_TYPE_NOT_NEED_MASTER_WAN = "NOT_NEED_MASTER_WAN"
+)
+
+var EMR_MASTER_WAN_TYPES = []string{EMR_MASTER_WAN_TYPE_NEED_MASTER_WAN, EMR_MASTER_WAN_TYPE_NOT_NEED_MASTER_WAN}
+
 func buildResourceSpecSchema() *schema.Schema {
 	return &schema.Schema{
 		Type:     schema.TypeList,

tencentcloud/resource_tc_emr_cluster.go

@@ -176,6 +176,17 @@ func resourceTencentCloudEmrCluster() *schema.Resource {
 				Computed:    true,
 				Description: "Created EMR instance id.",
 			},
+			"need_master_wan": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				Default:      EMR_MASTER_WAN_TYPE_NEED_MASTER_WAN,
+				ValidateFunc: validateAllowedStringValue(EMR_MASTER_WAN_TYPES),
+				Description: `Whether to enable the cluster Master node public network. Value range:
+				- NEED_MASTER_WAN: Indicates that the cluster Master node public network is enabled.
+				- NOT_NEED_MASTER_WAN: Indicates that it is not turned on.
+				By default, the cluster Master node internet is enabled.`,
+			},
 		},
 	}
 }
@@ -307,6 +318,9 @@ func resourceTencentCloudEmrClusterDelete(d *schema.ResourceData, meta interface
 			if e.GetCode() == "InternalError.ClusterNotFound" {
 				return nil
 			}
+			if e.GetCode() == "UnauthorizedOperation" {
+				return nil
+			}
 		}
 
 		if len(clusters) > 0 {

tencentcloud/service_tencentcloud_emr.go

@@ -121,6 +121,8 @@ func (me *EMRService) CreateInstance(ctx context.Context, d *schema.ResourceData
 		request.InstanceName = common.StringPtr(v.(string))
 	}
 
+	needMasterWan := d.Get("need_master_wan").(string)
+	request.NeedMasterWan = common.StringPtr(needMasterWan)
 	payMode := d.Get("pay_mode")
 	request.PayMode = common.Uint64Ptr((uint64)(payMode.(int)))
 	if v, ok := d.GetOk("placement"); ok {
@@ -186,7 +188,6 @@ func (me *EMRService) DescribeInstances(ctx context.Context, filters map[string]
 	if v, ok := filters["project_id"]; ok {
 		request.ProjectId = common.Int64Ptr(v.(int64))
 	}
-	request.ProjectId = helper.IntInt64(-1)
 	response, err := me.client.UseEmrClient().DescribeInstances(request)
 
 	if err != nil {

website/docs/r/emr_cluster.html.markdown

@@ -73,6 +73,10 @@ The following arguments are supported:
 When TimeUnit is m, the number filled in by this parameter indicates the length of purchase of the monthly instance of the package year, such as 1 for one month of purchase.
 * `time_unit` - (Required) The unit of time in which the instance was purchased. When PayMode is 0, TimeUnit can only take values of s(second). When PayMode is 1, TimeUnit can only take the value m(month).
 * `vpc_settings` - (Required, ForceNew) The private net config of EMR instance.
+* `need_master_wan` - (Optional, ForceNew) Whether to enable the cluster Master node public network. Value range:
+				- NEED_MASTER_WAN: Indicates that the cluster Master node public network is enabled.
+				- 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.
 
 The `resource_spec` object supports the following: