Skip to content

fix: es - support web_node_type_info modiy #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2022
Merged

fix: es - support web_node_type_info modiy #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ require (
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.377
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.294
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.383
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.199
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.376/go.mod
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.377/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378 h1:o+GKr3tHDivmoWxBXX5oeJC8EmmNV64g/yw5s0RjBdg=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.378/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383 h1:1TFCoXSDga/8jO66SGD7K7jMveZGVNJaD4IhX+vfvL0=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.383/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199 h1:ajgJogYSIQ5u1PIbiV5nsvr5K0fYpm1/T7Dy+mxEM6U=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199/go.mod h1:AqyM/ZZMD7q5mHBqNY9YImbSpEpoEe7E/vrTbUWX+po=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351 h1:zqJsH5pxGT57La7NAOOyMQxsuM11pupNBwV1dzXcT24=
Expand All @@ -536,6 +538,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287 h1:+9COBXA
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287/go.mod h1:xRvd0xsyCoviCiMRfJMh5lODPnLx+bnTfENNx6GHzFA=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.199 h1:qMFzKYXp1z7awrl3hhQM+sPb3XEtrR/4pW+6FXQTYcQ=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.199/go.mod h1:UegCt4vv9jAlzpgDu31ZJTuRP5T2BTV8w+jZBTsZIzg=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.383 h1:OhKvreaRPhwBEButv45yBcu6BvfvR1JAEXbU/NTck94=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.383/go.mod h1:WLskTV0GsorWBboZsLUWrgj+f1xGOKGzPGCK9275tdU=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.199 h1:tmjUPp0VBKuzjTqt0IQ5PT6iYt0yLmvM2DUzMFF7SGk=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.199/go.mod h1:tuPVv7O2B2fIpoDsrV/kvC62FO4CE4FihUxZY0JX2ek=
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.194/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
Expand Down
31 changes: 27 additions & 4 deletions tencentcloud/resource_tc_elasticsearch_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
instanceName := d.Get("instance_name").(string)
// Update operation support at most one item at the same time
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, instanceName, "", 0, nil)
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, instanceName, "", 0, nil, nil)
if errRet != nil {
return retryError(errRet)
}
Expand All @@ -519,7 +519,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
if d.HasChange("password") {
password := d.Get("password").(string)
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", password, 0, nil)
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", password, 0, nil, nil)
if errRet != nil {
return retryError(errRet)
}
Expand Down Expand Up @@ -592,7 +592,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
if d.HasChange("basic_security_type") {
basicSecurityType := d.Get("basic_security_type").(int)
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", int64(basicSecurityType), nil)
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", int64(basicSecurityType), nil, nil)
if errRet != nil {
return retryError(errRet)
}
Expand All @@ -604,6 +604,29 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
d.SetPartial("basic_security_type")
}

if d.HasChange("web_node_type_info") {
var err error
infos := d.Get("web_node_type_info").([]interface{})
for _, item := range infos {
value := item.(map[string]interface{})
info := &es.WebNodeTypeInfo{
NodeNum: helper.IntUint64(value["node_num"].(int)),
NodeType: helper.String(value["node_type"].(string)),
}
err = resource.Retry(writeRetryTimeout, func() *resource.RetryError {
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", 0, nil, info)
if errRet != nil {
return retryError(errRet)
}
return nil
})
break
}
if err != nil {
return err
}
}

if d.HasChange("node_info_list") {
nodeInfos := d.Get("node_info_list").([]interface{})
nodeInfoList := make([]*es.NodeInfo, 0, len(nodeInfos))
Expand All @@ -626,7 +649,7 @@ func resourceTencentCloudElasticsearchInstanceUpdate(d *schema.ResourceData, met
nodeInfoList = append(nodeInfoList, &dataDisk)
}
err := resource.Retry(writeRetryTimeout, func() *resource.RetryError {
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", 0, nodeInfoList)
errRet := elasticsearchService.UpdateInstance(ctx, instanceId, "", "", 0, nodeInfoList, nil)
if errRet != nil {
return retryError(errRet)
}
Expand Down
6 changes: 5 additions & 1 deletion tencentcloud/service_tencentcloud_elasticsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ func (me *ElasticsearchService) DeleteInstance(ctx context.Context, instanceId s
return nil
}

func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId, instanceName, password string, basicSecurityType int64, nodeList []*es.NodeInfo) error {
// UpdateInstance FIXME: use *Request instead of these suck params
func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId, instanceName, password string, basicSecurityType int64, nodeList []*es.NodeInfo, nodeTypeInfo *es.WebNodeTypeInfo) error {
logId := getLogId(ctx)
request := es.NewUpdateInstanceRequest()
request.InstanceId = &instanceId
Expand All @@ -110,6 +111,9 @@ func (me *ElasticsearchService) UpdateInstance(ctx context.Context, instanceId,
if nodeList != nil {
request.NodeInfoList = nodeList
}
if nodeTypeInfo != nil {
request.WebNodeTypeInfo = nodeTypeInfo
}
ratelimit.Check(request.GetAction())
_, err := me.client.UseEsClient().UpdateInstance(request)
if err != nil {
Expand Down
18 changes: 18 additions & 0 deletions vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions ...or/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/common_request.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading