Merge pull request #1697 from tencentcloudstack/feat/enhance_es_acl_set

enhance acl set

Author: gitmkn

.changelog/1697.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_elasticsearch_instance: affect `es_acl` when first apply
+```

tencentcloud/resource_tc_elasticsearch_instance.go

@@ -445,6 +445,34 @@ func resourceTencentCloudElasticsearchInstanceCreate(d *schema.ResourceData, met
 		return err
 	}
 
+	// es acl
+	esAcl := es.EsAcl{}
+	if aclMap, ok := helper.InterfacesHeadMap(d, "es_acl"); ok {
+		if v, ok := aclMap["black_list"]; ok {
+			bList := v.(*schema.Set).List()
+			for _, d := range bList {
+				esAcl.BlackIpList = append(esAcl.BlackIpList, helper.String(d.(string)))
+			}
+		}
+		if v, ok := aclMap["white_list"]; ok {
+			wList := v.(*schema.Set).List()
+			for _, d := range wList {
+				esAcl.WhiteIpList = append(esAcl.WhiteIpList, helper.String(d.(string)))
+			}
+		}
+	}
+
+	err = resource.Retry(writeRetryTimeout*2, func() *resource.RetryError {
+		errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", 0, nil, nil, &esAcl)
+		if errRet != nil {
+			return retryError(errRet)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
 	// tags
 	if tags := helper.GetTags(d, "tags"); len(tags) > 0 {
 		client := meta.(*TencentCloudClient).apiV3Conn
@@ -746,14 +774,14 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
 		esAcl := es.EsAcl{}
 		if aclMap, ok := helper.InterfacesHeadMap(d, "es_acl"); ok {
 			if v, ok := aclMap["black_list"]; ok {
-				blist := v.(*schema.Set).List()
-				for _, d := range blist {
+				bList := v.(*schema.Set).List()
+				for _, d := range bList {
 					esAcl.BlackIpList = append(esAcl.BlackIpList, helper.String(d.(string)))
 				}
 			}
 			if v, ok := aclMap["white_list"]; ok {
-				wlist := v.(*schema.Set).List()
-				for _, d := range wlist {
+				wList := v.(*schema.Set).List()
+				for _, d := range wList {
 					esAcl.WhiteIpList = append(esAcl.WhiteIpList, helper.String(d.(string)))
 				}
 			}