From 3736cc344522b1abced21471af7037d50dc8aa97 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 1 Aug 2024 15:18:36 +0800 Subject: [PATCH 1/4] add --- tencentcloud/services/es/extension_elasticsearch.go | 1 + tencentcloud/services/es/resource_tc_elasticsearch_instance.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tencentcloud/services/es/extension_elasticsearch.go b/tencentcloud/services/es/extension_elasticsearch.go index 0ac8c49dde..f26f9d968f 100644 --- a/tencentcloud/services/es/extension_elasticsearch.go +++ b/tencentcloud/services/es/extension_elasticsearch.go @@ -67,6 +67,7 @@ var ES_NODE_DISK_TYPE = []string{ svccvm.CVM_DISK_TYPE_CLOUD_SSD, svccvm.CVM_DISK_TYPE_CLOUD_PREMIUM, svccvm.CVM_DISK_TYPE_CLOUD_HSSD, + svccvm.CVM_DISK_TYPE_CLOUD_BSSD, } var ES_RENEW_FLAG = []string{ diff --git a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go index 4e27f2ee99..2caaadb1cd 100644 --- a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go +++ b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go @@ -206,7 +206,7 @@ func ResourceTencentCloudElasticsearchInstance() *schema.Resource { Optional: true, Default: svccvm.CVM_DISK_TYPE_CLOUD_SSD, ValidateFunc: tccommon.ValidateAllowedStringValue(ES_NODE_DISK_TYPE), - Description: "Node disk type. Valid values are `CLOUD_SSD` and `CLOUD_PREMIUM`, `CLOUD_HSSD`. The default value is `CLOUD_SSD`.", + Description: "Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD` and `CLOUD_BSSD`. The default value is `CLOUD_SSD`.", }, "disk_size": { Type: schema.TypeInt, From 8238b445c388283a42435ceec7d49ad939a05a0a Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 1 Aug 2024 15:20:29 +0800 Subject: [PATCH 2/4] add --- .changelog/2751.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/2751.txt diff --git a/.changelog/2751.txt b/.changelog/2751.txt new file mode 100644 index 0000000000..e0e25feced --- /dev/null +++ b/.changelog/2751.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_elasticsearch_instance: Update disk_type params +``` From 2ad492650d9827eff254cfad1d5322d82446b1b0 Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 1 Aug 2024 15:21:22 +0800 Subject: [PATCH 3/4] add --- website/docs/r/elasticsearch_instance.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/elasticsearch_instance.html.markdown b/website/docs/r/elasticsearch_instance.html.markdown index 9ad32b9b7e..843575cc6a 100644 --- a/website/docs/r/elasticsearch_instance.html.markdown +++ b/website/docs/r/elasticsearch_instance.html.markdown @@ -189,7 +189,7 @@ The `node_info_list` object supports the following: * `node_num` - (Required, Int) Number of nodes. * `node_type` - (Required, String) Node specification, and valid values refer to [document of tencentcloud](https://intl.cloud.tencent.com/document/product/845/18376). * `disk_size` - (Optional, Int) Node disk size. Unit is GB, and default value is `100`. -* `disk_type` - (Optional, String) Node disk type. Valid values are `CLOUD_SSD` and `CLOUD_PREMIUM`, `CLOUD_HSSD`. The default value is `CLOUD_SSD`. +* `disk_type` - (Optional, String) Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD` and `CLOUD_BSSD`. The default value is `CLOUD_SSD`. * `encrypt` - (Optional, Bool) Decides to encrypt this disk or not. * `type` - (Optional, String) Node type. Valid values are `hotData`, `warmData` and `dedicatedMaster`. The default value is 'hotData`. From 59aaad6836cb9da094d6a97cf494866c058a77bf Mon Sep 17 00:00:00 2001 From: SevenEarth <391613297@qq.com> Date: Thu, 1 Aug 2024 15:48:31 +0800 Subject: [PATCH 4/4] add --- tencentcloud/services/cvm/extension_cvm.go | 2 ++ tencentcloud/services/es/extension_elasticsearch.go | 2 ++ tencentcloud/services/es/resource_tc_elasticsearch_instance.go | 2 +- website/docs/r/elasticsearch_instance.html.markdown | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tencentcloud/services/cvm/extension_cvm.go b/tencentcloud/services/cvm/extension_cvm.go index e0d8dd1fc2..1d22b627f3 100644 --- a/tencentcloud/services/cvm/extension_cvm.go +++ b/tencentcloud/services/cvm/extension_cvm.go @@ -35,6 +35,8 @@ const ( CVM_DISK_TYPE_CLOUD_BSSD = "CLOUD_BSSD" CVM_DISK_TYPE_CLOUD_HSSD = "CLOUD_HSSD" CVM_DISK_TYPE_CLOUD_TSSD = "CLOUD_TSSD" + CVM_DISK_TYPE_CLOUD_BIGDATA = "CLOUD_BIGDATA" + CVM_DISK_TYPE_CLOUD_HIGHIO = "CLOUD_HIGHIO" CVM_PLACEMENT_GROUP_TYPE_HOST = "HOST" CVM_PLACEMENT_GROUP_TYPE_SW = "SW" diff --git a/tencentcloud/services/es/extension_elasticsearch.go b/tencentcloud/services/es/extension_elasticsearch.go index f26f9d968f..cd680f21b2 100644 --- a/tencentcloud/services/es/extension_elasticsearch.go +++ b/tencentcloud/services/es/extension_elasticsearch.go @@ -68,6 +68,8 @@ var ES_NODE_DISK_TYPE = []string{ svccvm.CVM_DISK_TYPE_CLOUD_PREMIUM, svccvm.CVM_DISK_TYPE_CLOUD_HSSD, svccvm.CVM_DISK_TYPE_CLOUD_BSSD, + svccvm.CVM_DISK_TYPE_CLOUD_BIGDATA, + svccvm.CVM_DISK_TYPE_CLOUD_HIGHIO, } var ES_RENEW_FLAG = []string{ diff --git a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go index 2caaadb1cd..7a5862036c 100644 --- a/tencentcloud/services/es/resource_tc_elasticsearch_instance.go +++ b/tencentcloud/services/es/resource_tc_elasticsearch_instance.go @@ -206,7 +206,7 @@ func ResourceTencentCloudElasticsearchInstance() *schema.Resource { Optional: true, Default: svccvm.CVM_DISK_TYPE_CLOUD_SSD, ValidateFunc: tccommon.ValidateAllowedStringValue(ES_NODE_DISK_TYPE), - Description: "Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD` and `CLOUD_BSSD`. The default value is `CLOUD_SSD`.", + Description: "Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD`, `CLOUD_BSSD`, `CLOUD_BIGDATA` and `CLOUD_HIGHIO`. The default value is `CLOUD_SSD`.", }, "disk_size": { Type: schema.TypeInt, diff --git a/website/docs/r/elasticsearch_instance.html.markdown b/website/docs/r/elasticsearch_instance.html.markdown index 843575cc6a..52be4997c8 100644 --- a/website/docs/r/elasticsearch_instance.html.markdown +++ b/website/docs/r/elasticsearch_instance.html.markdown @@ -189,7 +189,7 @@ The `node_info_list` object supports the following: * `node_num` - (Required, Int) Number of nodes. * `node_type` - (Required, String) Node specification, and valid values refer to [document of tencentcloud](https://intl.cloud.tencent.com/document/product/845/18376). * `disk_size` - (Optional, Int) Node disk size. Unit is GB, and default value is `100`. -* `disk_type` - (Optional, String) Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD` and `CLOUD_BSSD`. The default value is `CLOUD_SSD`. +* `disk_type` - (Optional, String) Node disk type. Valid values are `CLOUD_SSD`, `CLOUD_PREMIUM`, `CLOUD_HSSD`, `CLOUD_BSSD`, `CLOUD_BIGDATA` and `CLOUD_HIGHIO`. The default value is `CLOUD_SSD`. * `encrypt` - (Optional, Bool) Decides to encrypt this disk or not. * `type` - (Optional, String) Node type. Valid values are `hotData`, `warmData` and `dedicatedMaster`. The default value is 'hotData`.