Fix/adjust basic_security_type and license_type logic for the oss and basic edition instance (#1574)

* update dts mode

* fix/adjust license_type because es offlined the oss type

* 1.add changelog. 2.adjust scope of license_type.

* update basic_security_type logic when license_type is the oss edition.

Author: lyu571

.changelog/1574.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/tencentcloud_elasticsearch_instance: adjust the scope of `license_type` field.
+```

tencentcloud/extension_elasticsearch.go

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

tencentcloud/resource_tc_elasticsearch_instance.go

@@ -11,7 +11,7 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
   vpc_id            = var.vpc_id
   subnet_id         = var.subnet_id
   password          = "Test12345"
-  license_type      = "oss"
+  license_type      = "basic"
 
   web_node_type_info {
     node_num = 1
@@ -214,7 +214,7 @@ func resourceTencentCloudElasticsearchInstance() *schema.Resource {
 				Optional:     true,
 				Default:      ES_LICENSE_TYPE_PLATINUM,
 				ValidateFunc: validateAllowedStringValue(ES_LICENSE_TYPE),
-				Description:  "License type. Valid values are `oss`, `basic` and `platinum`. The default value is `platinum`.",
+				Description:  "License type. Valid values are `basic` and `platinum`. The default value is `platinum`.",
 			},
 			"node_info_list": {
 				Type:        schema.TypeList,
@@ -267,7 +267,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`.",
+				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.",
 			},
 			"tags": {
 				Type:        schema.TypeMap,
@@ -356,11 +356,15 @@ func resourceTencentCloudElasticsearchInstanceCreate(d *schema.ResourceData, met
 			}
 		}
 	}
+	var licenseType string
 	if v, ok := d.GetOk("license_type"); ok {
-		request.LicenseType = helper.String(v.(string))
+		licenseType = v.(string)
+		request.LicenseType = helper.String(licenseType)
 	}
 	if v, ok := d.GetOk("basic_security_type"); ok {
-		request.BasicSecurityType = helper.IntUint64(v.(int))
+		if licenseType == ES_LICENSE_TYPE_BASIC { // this field is only valid for the basic edition
+			request.BasicSecurityType = helper.IntUint64(v.(int))
+		}
 	}
 	if v, ok := d.GetOk("web_node_type_info"); ok {
 		infos := v.([]interface{})
@@ -491,7 +495,10 @@ func resourceTencentCloudElasticsearchInstanceRead(d *schema.ResourceData, meta
 	_ = d.Set("renew_flag", instance.RenewFlag)
 	_ = d.Set("deploy_mode", instance.DeployMode)
 	_ = d.Set("license_type", instance.LicenseType)
-	_ = d.Set("basic_security_type", instance.SecurityType)
+	licenseType := instance.LicenseType
+	if licenseType != nil && *licenseType == ES_LICENSE_TYPE_BASIC { // this field is only valid for the basic edition
+		_ = d.Set("basic_security_type", instance.SecurityType)
+	}
 	_ = d.Set("elasticsearch_domain", instance.EsDomain)
 	_ = d.Set("elasticsearch_vip", instance.EsVip)
 	_ = d.Set("elasticsearch_port", instance.EsPort)

tencentcloud/resource_tc_elasticsearch_instance_test.go

@@ -60,7 +60,7 @@ func TestAccTencentCloudElasticsearchInstance_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "version", "7.10.1"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "vpc_id", defaultVpcId),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "subnet_id", defaultSubnetId),
-					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "oss"),
+					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "license_type", "platinum"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.#", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_num", "1"),
 					resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.foo", "web_node_type_info.0.node_type", "ES.S1.MEDIUM4"),
@@ -172,8 +172,7 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
 	vpc_id              = var.vpc_id
 	subnet_id           = var.subnet_id
 	password            = "Test1234"
-	license_type        = "oss"
-  
+
     web_node_type_info {
       node_num = 1
       node_type = "ES.S1.MEDIUM4"

website/docs/r/elasticsearch_instance.html.markdown

@@ -21,7 +21,7 @@ resource "tencentcloud_elasticsearch_instance" "foo" {
   vpc_id            = var.vpc_id
   subnet_id         = var.subnet_id
   password          = "Test12345"
-  license_type      = "oss"
+  license_type      = "basic"
 
   web_node_type_info {
     node_num  = 1
@@ -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`.
+* `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.
 * `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 `oss`, `basic` and `platinum`. The default value is `platinum`.
+* `license_type` - (Optional, String) License type. Valid values are `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.