es import with default value (#1655)

* es import with default value

* es import with default value

Author: hellertang

.changelog/1655.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_elasticsearch_instance: set `basic_security_type` default 1 when import instance
+```

tencentcloud/extension_elasticsearch.go

@@ -42,6 +42,7 @@ var ES_DEPLOY_MODE = []int{
 var ES_LICENSE_TYPE = []string{
 	ES_LICENSE_TYPE_BASIC,
 	ES_LICENSE_TYPE_PLATINUM,
+	ES_LICENSE_TYPE_OSS,
 }
 
 var ES_BASIC_SECURITY_TYPE = []int{

tencentcloud/resource_tc_elasticsearch_instance.go

@@ -71,7 +71,9 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 		Update: resourceTencentCloudElasticsearchInstanceUpdate,
 		Delete: resourceTencentCloudElasticsearchInstanceDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: helper.ImportWithDefaultValue(map[string]interface{}{
+				"basic_security_type": ES_BASIC_SECURITY_TYPE_OFF,
+			}),
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -214,7 +216,7 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 				Optional:     true,
 				Default:      ES_LICENSE_TYPE_PLATINUM,
 				ValidateFunc: validateAllowedStringValue(ES_LICENSE_TYPE),
-				Description:  "License type. Valid values are `basic` and `platinum`. The default value is `platinum`.",
+				Description:  "License type. Valid values are `oss`, `basic` and `platinum`. The default value is `platinum`.",
 			},
 			"node_info_list": {
 				Type:        schema.TypeList,
@@ -267,7 +269,7 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 				Optional:     true,
 				Default:      ES_BASIC_SECURITY_TYPE_OFF,
 				ValidateFunc: validateAllowedIntValue(ES_BASIC_SECURITY_TYPE),
-				Description:  "Whether to enable X-Pack security authentication in Basic Edition 6.8 and above. Valid values are `1` and `2`. `1` is disabled, `2` is enabled, and default value is `1`. Notice: this parameter is only for `basic edition.",
+				Description:  "Whether to enable X-Pack security authentication in Basic Edition 6.8 and above. Valid values are `1` and `2`. `1` is disabled, `2` is enabled, and default value is `1`. Notice: this parameter is only take effect on `basic` license.",
 			},
 			"tags": {
 				Type:        schema.TypeMap,

website/docs/r/elasticsearch_instance.html.markdown

@@ -59,13 +59,13 @@ The following arguments are supported:
 * `version` - (Required, String) Version of the instance. Valid values are `5.6.4`, `6.4.3`, `6.8.2` and `7.5.1`.
 * `vpc_id` - (Required, String, ForceNew) The ID of a VPC network.
 * `availability_zone` - (Optional, String, ForceNew) Availability zone. When create multi-az es, this parameter must be omitted.
-* `basic_security_type` - (Optional, Int) Whether to enable X-Pack security authentication in Basic Edition 6.8 and above. Valid values are `1` and `2`. `1` is disabled, `2` is enabled, and default value is `1`. Notice: this parameter is only for `basic edition.
+* `basic_security_type` - (Optional, Int) Whether to enable X-Pack security authentication in Basic Edition 6.8 and above. Valid values are `1` and `2`. `1` is disabled, `2` is enabled, and default value is `1`. Notice: this parameter is only take effect on `basic` license.
 * `charge_period` - (Optional, Int, ForceNew) The tenancy of the prepaid instance, and uint is month. NOTE: it only works when charge_type is set to `PREPAID`.
 * `charge_type` - (Optional, String, ForceNew) The charge type of instance. Valid values are `PREPAID` and `POSTPAID_BY_HOUR`.
 * `deploy_mode` - (Optional, Int, ForceNew) Cluster deployment mode. Valid values are `0` and `1`. `0` is single-AZ deployment, and `1` is multi-AZ deployment. Default value is `0`.
 * `es_acl` - (Optional, List) Kibana Access Control Configuration.
 * `instance_name` - (Optional, String) Name of the instance, which can contain 1 to 50 English letters, Chinese characters, digits, dashes(-), or underscores(_).
-* `license_type` - (Optional, String) License type. Valid values are `basic` and `platinum`. The default value is `platinum`.
+* `license_type` - (Optional, String) License type. Valid values are `oss`, `basic` and `platinum`. The default value is `platinum`.
 * `multi_zone_infos` - (Optional, List, ForceNew) Details of AZs in multi-AZ deployment mode (which is required when deploy_mode is `1`).
 * `renew_flag` - (Optional, String, ForceNew) When enabled, the instance will be renew automatically when it reach the end of the prepaid tenancy. Valid values are `RENEW_FLAG_AUTO` and `RENEW_FLAG_MANUAL`. NOTE: it only works when charge_type is set to `PREPAID`.
 * `subnet_id` - (Optional, String, ForceNew) The ID of a VPC subnetwork. When create multi-az es, this parameter must be omitted.