Skip to content

Commit 1dac6e3

Browse files
tongyimingmikatong
andauthored
fix(es): [126176897] update es (#3484)
* update es * add changelog * update doc * update doc --------- Co-authored-by: mikatong <[email protected]>
1 parent b0c8f99 commit 1dac6e3

File tree

12 files changed

+6501
-1800
lines changed

12 files changed

+6501
-1800
lines changed

.changelog/3484.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_elasticsearch_instance: support update protocol, node_info_list support without disk_type and disk_size
3+
```

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107
4747
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148
49-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.8
49+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.10
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206
5151
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762
5252
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.1161
@@ -60,7 +60,7 @@ require (
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.628
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/eb v1.0.760
6262
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115
63-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777
63+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.1.10
6464
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.1145
6666
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.729

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.5/go.mod h1
953953
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
954954
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.8 h1:Qxwajpf0YHFDcDJ0crRzK2QOaWTG5+UNZivhbBbq88w=
955955
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.8/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
956+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.10 h1:hidSlGUhQOJjYuxtE0PpUuap0dIW3IH7GgVd9KHTXGI=
957+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.10/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
956958
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ=
957959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY=
958960
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU=
@@ -991,6 +993,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115 h1:hKzATW
991993
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.1115/go.mod h1:Z9Bv1N30yjQKRACgpTewQXiuIaQrC0lKMrKPH1xF5aA=
992994
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777 h1:G1eX/DkiznhSjNVF97BAQyycFXOiPHxeTxgOadp5J/o=
993995
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.777/go.mod h1:ehbc9eaNknF/VU/kPTFLZbIUmkL06vQ/JYydu6yeXp4=
996+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.1.10 h1:bmdTILfzphJDJNOUy+h8UPw/xspWh/U79/yALWvXvh0=
997+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.1.10/go.mod h1:+IVUcTHHFkYZ+twXncvXJK49O/0HqOE/C9PxF9m6h8k=
994998
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970 h1:Z82LbcEnE2m4CGvcOY024N7REhAN++xdEyE88HG2YBA=
995999
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.970/go.mod h1:qnOT3rycGxlNy4/gmprV58Uqd9CKLUr2CL235R1AvuQ=
9961000
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gwlb v1.0.1127 h1:1ZhrN7aFPBVb4ihclkbCNOF1Mtoql6duT/cI3Q0p074=

tencentcloud/services/es/resource_tc_elasticsearch_instance.go

Lines changed: 123 additions & 50 deletions
Large diffs are not rendered by default.

tencentcloud/services/es/resource_tc_elasticsearch_instance_test.go

Lines changed: 113 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,28 @@ func TestAccTencentCloudElasticsearchInstanceResource_https(t *testing.T) {
249249
},
250250
})
251251
}
252+
func TestAccTencentCloudElasticsearchInstanceResource_httpTohttps(t *testing.T) {
253+
resource.Test(t, resource.TestCase{
254+
PreCheck: func() { tcacctest.AccPreCheck(t) },
255+
Providers: tcacctest.AccProviders,
256+
CheckDestroy: testAccCheckElasticsearchInstanceDestroy,
257+
Steps: []resource.TestStep{
258+
{
259+
Config: testAccElasticsearchInstanceKibanaPublicAccessHttp,
260+
Check: resource.ComposeTestCheckFunc(
261+
testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.es_kibana"),
262+
),
263+
},
264+
{
265+
Config: testAccElasticsearchInstanceKibanaPublicAccessHttps,
266+
Check: resource.ComposeTestCheckFunc(
267+
testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.es_kibana"),
268+
resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.es_kibana", "protocol", "https"),
269+
),
270+
},
271+
},
272+
})
273+
}
252274

253275
func TestAccTencentCloudElasticsearchInstanceResource_nodeInfoList(t *testing.T) {
254276
resource.Test(t, resource.TestCase{
@@ -274,6 +296,23 @@ func TestAccTencentCloudElasticsearchInstanceResource_nodeInfoList(t *testing.T)
274296
})
275297
}
276298

299+
func TestAccTencentCloudElasticsearchInstanceResource_nodeInfoListIO(t *testing.T) {
300+
resource.Test(t, resource.TestCase{
301+
PreCheck: func() { tcacctest.AccPreCheck(t) },
302+
Providers: tcacctest.AccProviders,
303+
CheckDestroy: testAccCheckElasticsearchInstanceDestroy,
304+
Steps: []resource.TestStep{
305+
{
306+
Config: testAccElasticsearchInstanceNodeInfoListIO,
307+
Check: resource.ComposeTestCheckFunc(
308+
testAccCheckElasticsearchInstanceExists("tencentcloud_elasticsearch_instance.es_node_info_list"),
309+
resource.TestCheckResourceAttr("tencentcloud_elasticsearch_instance.es_node_info_list", "node_info_list.#", "2"),
310+
),
311+
},
312+
},
313+
})
314+
}
315+
277316
func TestAccTencentCloudElasticsearchInstanceResource_MultiZoneInfo(t *testing.T) {
278317
resource.Test(t, resource.TestCase{
279318
PreCheck: func() { tcacctest.AccPreCheck(t) },
@@ -594,6 +633,34 @@ resource "tencentcloud_elasticsearch_instance" "es_kibana" {
594633
}
595634
}
596635
`
636+
const testAccElasticsearchInstanceKibanaPublicAccessHttp = tcacctest.DefaultEsVariables + `
637+
resource "tencentcloud_elasticsearch_instance" "es_kibana" {
638+
instance_name = "tf-ci-test-kibana"
639+
availability_zone = var.availability_zone
640+
version = "7.10.1"
641+
vpc_id = var.vpc_id
642+
subnet_id = var.subnet_id
643+
password = "Test1234"
644+
license_type = "basic"
645+
basic_security_type = 2
646+
public_access = "OPEN"
647+
es_acl {
648+
white_list = [
649+
"127.0.0.2"
650+
]
651+
}
652+
es_public_acl {
653+
white_ip_list = [
654+
"127.0.0.2"
655+
]
656+
}
657+
658+
node_info_list {
659+
node_num = 2
660+
node_type = "ES.S1.MEDIUM4"
661+
}
662+
}
663+
`
597664

598665
const testAccElasticsearchInstanceKibanaPublicAccessHttps = tcacctest.DefaultEsVariables + `
599666
resource "tencentcloud_elasticsearch_instance" "es_kibana" {
@@ -625,7 +692,7 @@ resource "tencentcloud_elasticsearch_instance" "es_kibana" {
625692
}
626693
`
627694

628-
const testAccElasticsearchInstanceNodeInfoList = tcacctest.DefaultEsVariables + `
695+
const testAccElasticsearchInstanceNodeInfoListIO = tcacctest.DefaultEsVariables + `
629696
resource "tencentcloud_elasticsearch_instance" "es_node_info_list" {
630697
instance_name = "tf-ci-test-node"
631698
availability_zone = var.availability_zone
@@ -650,9 +717,54 @@ resource "tencentcloud_elasticsearch_instance" "es_node_info_list" {
650717
651718
node_info_list {
652719
node_num = 2
720+
node_type = "ES.I1.4XLARGE64"
721+
type = "hotData"
722+
}
723+
724+
node_info_list {
725+
node_num = 3
653726
node_type = "ES.S1.MEDIUM4"
654727
disk_size = 50
728+
type = "dedicatedMaster"
729+
disk_type = "CLOUD_SSD"
730+
}
731+
}
732+
`
733+
734+
const testAccElasticsearchInstanceNodeInfoList = tcacctest.DefaultEsVariables + `
735+
resource "tencentcloud_elasticsearch_instance" "es_node_info_list" {
736+
instance_name = "tf-ci-test-node"
737+
availability_zone = var.availability_zone
738+
version = "7.10.1"
739+
vpc_id = var.vpc_id
740+
subnet_id = var.subnet_id
741+
password = "Test1234"
742+
license_type = "basic"
743+
basic_security_type = 2
744+
public_access = "OPEN"
745+
protocol = "https"
746+
es_acl {
747+
white_list = [
748+
"127.0.0.2"
749+
]
750+
}
751+
es_public_acl {
752+
white_ip_list = [
753+
"127.0.0.2"
754+
]
755+
}
756+
757+
node_info_list {
758+
node_num = 2
759+
node_type = "ES.I1.4XLARGE64"
655760
type = "hotData"
761+
}
762+
763+
node_info_list {
764+
node_num = 3
765+
node_type = "ES.S1.MEDIUM4"
766+
disk_size = 50
767+
type = "dedicatedMaster"
656768
disk_type = "CLOUD_SSD"
657769
}
658770
}

tencentcloud/services/es/service_tencentcloud_elasticsearch.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (me *ElasticsearchService) DeleteInstance(ctx context.Context, instanceId s
107107
}
108108

109109
// UpdateInstance FIXME: use *Request instead of these suck params
110-
func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId, instanceName, password, kibanaPublicAccess, kibanaPrivateAccess, publicAccess string,
110+
func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId, instanceName, password, kibanaPublicAccess, kibanaPrivateAccess, publicAccess, protocol string,
111111
basicSecurityType int64, nodeList []*es.NodeInfo, nodeTypeInfo *es.WebNodeTypeInfo, esAcl *es.EsAcl, cosBackup *es.CosBackup, esPublicAcl *es.EsPublicAcl, multiZoneInfo []*es.ZoneDetail) error {
112112
logId := tccommon.GetLogId(ctx)
113113
request := es.NewUpdateInstanceRequest()
@@ -148,6 +148,9 @@ func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId,
148148
if len(multiZoneInfo) != 0 {
149149
request.MultiZoneInfo = multiZoneInfo
150150
}
151+
if protocol != "" {
152+
request.Protocol = helper.String(protocol)
153+
}
151154
ratelimit.Check(request.GetAction())
152155
_, err := me.client.UseEsClient().UpdateInstance(request)
153156
if err != nil {

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)