diff --git a/go.mod b/go.mod index 8db0e42af6..b4ef6bca75 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 3aec188fc5..b65fb4d772 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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= diff --git a/tencentcloud/resource_tc_elasticsearch_instance.go b/tencentcloud/resource_tc_elasticsearch_instance.go index 03baceeb46..fff218c513 100755 --- a/tencentcloud/resource_tc_elasticsearch_instance.go +++ b/tencentcloud/resource_tc_elasticsearch_instance.go @@ -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) } @@ -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) } @@ -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) } @@ -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)) @@ -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) } diff --git a/tencentcloud/service_tencentcloud_elasticsearch.go b/tencentcloud/service_tencentcloud_elasticsearch.go index 32e2604c45..3373037663 100755 --- a/tencentcloud/service_tencentcloud_elasticsearch.go +++ b/tencentcloud/service_tencentcloud_elasticsearch.go @@ -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 @@ -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 { diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/client.go index a1e428e811..b6bffa8834 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/client.go @@ -113,6 +113,9 @@ func (c *Client) sendWithoutSignature(request tchttp.Request, response tchttp.Re if request.GetHttpMethod() == "POST" { httpRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded") } + for k, v := range request.GetHeader() { + httpRequest.Header.Set(k, v) + } httpResponse, err := c.sendWithRateLimitRetry(httpRequest, isRetryable(request)) if err != nil { return err @@ -139,6 +142,11 @@ func (c *Client) sendWithSignatureV1(request tchttp.Request, response tchttp.Res if request.GetHttpMethod() == "POST" { httpRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded") } + + for k, v := range request.GetHeader() { + httpRequest.Header.Set(k, v) + } + httpResponse, err := c.sendWithRateLimitRetry(httpRequest, isRetryable(request)) if err != nil { return err @@ -183,6 +191,16 @@ func (c *Client) sendWithSignatureV3(request tchttp.Request, response tchttp.Res } } + for k, v := range request.GetHeader() { + switch k { + case "X-TC-Action", "X-TC-Version", "X-TC-Timestamp", "X-TC-RequestClient", + "X-TC-Language", "Content-Type", "X-TC-Region", "X-TC-Token": + log.Printf("Skip header \"%s\": can not specify built-in header", k) + default: + headers[k] = v + } + } + if !isOctetStream && request.GetContentType() == octetStream { isOctetStream = true b, _ := json.Marshal(request) diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/common_request.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/common_request.go index 41503432b7..8188821600 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/common_request.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/common_request.go @@ -14,8 +14,6 @@ type actionParameters map[string]interface{} type CommonRequest struct { *BaseRequest - // custom header, may be overwritten - header map[string]string actionParameters } @@ -56,7 +54,7 @@ func (cr *CommonRequest) SetActionParameters(data interface{}) error { } func (cr *CommonRequest) IsOctetStream() bool { - v, ok := cr.header["Content-Type"] + v, ok := cr.GetHeader()["Content-Type"] if !ok || v != octetStream { return false } @@ -75,11 +73,17 @@ func (cr *CommonRequest) SetHeader(header map[string]string) { if header == nil { return } - cr.header = header + if cr.BaseRequest == nil { + cr.BaseRequest = &BaseRequest{} + } + cr.BaseRequest.SetHeader(header) } func (cr *CommonRequest) GetHeader() map[string]string { - return cr.header + if cr.BaseRequest == nil { + return nil + } + return cr.BaseRequest.GetHeader() } // SetOctetStreamParameters set request body to your data, and set head Content-Type to application/octet-stream @@ -90,7 +94,7 @@ func (cr *CommonRequest) SetOctetStreamParameters(header map[string]string, body header = map[string]string{} } header["Content-Type"] = octetStream - cr.header = header + cr.SetHeader(header) parameter["OctetStreamBody"] = body cr.actionParameters = parameter } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go index ed16f98e8c..bcd3fe1359 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go @@ -39,6 +39,7 @@ type Request interface { GetVersion() string GetContentType() string GetContext() context.Context + GetHeader() map[string]string SetScheme(string) SetRootDomain(string) SetDomain(string) @@ -47,6 +48,7 @@ type Request interface { SetContentType(string) SetBody([]byte) SetContext(context.Context) + SetHeader(header map[string]string) } type BaseRequest struct { @@ -58,6 +60,7 @@ type BaseRequest struct { path string params map[string]string formParams map[string]string + header map[string]string service string version string @@ -188,6 +191,17 @@ func (r *BaseRequest) SetContext(ctx context.Context) { r.context = ctx } +func (r *BaseRequest) GetHeader() map[string]string { + return r.header +} + +func (r *BaseRequest) SetHeader(header map[string]string) { + if header == nil { + return + } + r.header = header +} + func GetUrlQueriesEncoded(params map[string]string) string { values := url.Values{} for key, value := range params { @@ -240,7 +254,7 @@ func CompleteCommonParams(request Request, region string) { params["Action"] = request.GetAction() params["Timestamp"] = strconv.FormatInt(time.Now().Unix(), 10) params["Nonce"] = strconv.Itoa(rand.Int()) - params["RequestClient"] = "SDK_GO_1.0.378" + params["RequestClient"] = "SDK_GO_1.0.383" } func ConstructParams(req Request) (err error) { diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/client.go index 4eeaea0825..6ce1982307 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/client.go @@ -15,6 +15,8 @@ package v20180416 import ( + "context" + "errors" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile" @@ -34,7 +36,7 @@ func NewClientWithSecretId(secretId, secretKey, region string) (client *Client, return } -func NewClient(credential *common.Credential, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { +func NewClient(credential common.CredentialIface, region string, clientProfile *profile.ClientProfile) (client *Client, err error) { client = &Client{} client.Init(region). WithCredential(credential). @@ -48,6 +50,8 @@ func NewCreateInstanceRequest() (request *CreateInstanceRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "CreateInstance") + + return } @@ -71,11 +75,38 @@ func NewCreateInstanceResponse() (response *CreateInstanceResponse) { // RESOURCEINUSE = "ResourceInUse" // RESOURCEINSUFFICIENT = "ResourceInsufficient" // RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// RESOURCEINSUFFICIENT_HIDDENZONE = "ResourceInsufficient.HiddenZone" // RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" func (c *Client) CreateInstance(request *CreateInstanceRequest) (response *CreateInstanceResponse, err error) { + return c.CreateInstanceWithContext(context.Background(), request) +} + +// CreateInstance +// 创建指定规格的ES集群实例 +// +// 可能返回的错误码: +// FAILEDOPERATION_CLUSTERRESOURCELIMITERROR = "FailedOperation.ClusterResourceLimitError" +// FAILEDOPERATION_DISKCOUNTPARAMERROR = "FailedOperation.DiskCountParamError" +// FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// FAILEDOPERATION_NOTAUTHENTICATED = "FailedOperation.NotAuthenticated" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// RESOURCEINSUFFICIENT_HIDDENZONE = "ResourceInsufficient.HiddenZone" +// RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" +func (c *Client) CreateInstanceWithContext(ctx context.Context, request *CreateInstanceRequest) (response *CreateInstanceResponse, err error) { if request == nil { request = NewCreateInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("CreateInstance require credential") + } + + request.SetContext(ctx) + response = NewCreateInstanceResponse() err = c.Send(request, response) return @@ -86,6 +117,8 @@ func NewDeleteInstanceRequest() (request *DeleteInstanceRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "DeleteInstance") + + return } @@ -105,9 +138,28 @@ func NewDeleteInstanceResponse() (response *DeleteInstanceResponse) { // RESOURCEINUSE = "ResourceInUse" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) DeleteInstance(request *DeleteInstanceRequest) (response *DeleteInstanceResponse, err error) { + return c.DeleteInstanceWithContext(context.Background(), request) +} + +// DeleteInstance +// 销毁集群实例 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) DeleteInstanceWithContext(ctx context.Context, request *DeleteInstanceRequest) (response *DeleteInstanceResponse, err error) { if request == nil { request = NewDeleteInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("DeleteInstance require credential") + } + + request.SetContext(ctx) + response = NewDeleteInstanceResponse() err = c.Send(request, response) return @@ -118,6 +170,8 @@ func NewDescribeInstanceLogsRequest() (request *DescribeInstanceLogsRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "DescribeInstanceLogs") + + return } @@ -135,9 +189,26 @@ func NewDescribeInstanceLogsResponse() (response *DescribeInstanceLogsResponse) // INTERNALERROR = "InternalError" // INVALIDPARAMETER = "InvalidParameter" func (c *Client) DescribeInstanceLogs(request *DescribeInstanceLogsRequest) (response *DescribeInstanceLogsResponse, err error) { + return c.DescribeInstanceLogsWithContext(context.Background(), request) +} + +// DescribeInstanceLogs +// 查询用户该地域下符合条件的ES集群的日志 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +func (c *Client) DescribeInstanceLogsWithContext(ctx context.Context, request *DescribeInstanceLogsRequest) (response *DescribeInstanceLogsResponse, err error) { if request == nil { request = NewDescribeInstanceLogsRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("DescribeInstanceLogs require credential") + } + + request.SetContext(ctx) + response = NewDescribeInstanceLogsResponse() err = c.Send(request, response) return @@ -148,6 +219,8 @@ func NewDescribeInstanceOperationsRequest() (request *DescribeInstanceOperations BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "DescribeInstanceOperations") + + return } @@ -166,9 +239,27 @@ func NewDescribeInstanceOperationsResponse() (response *DescribeInstanceOperatio // INVALIDPARAMETER = "InvalidParameter" // RESOURCEINUSE = "ResourceInUse" func (c *Client) DescribeInstanceOperations(request *DescribeInstanceOperationsRequest) (response *DescribeInstanceOperationsResponse, err error) { + return c.DescribeInstanceOperationsWithContext(context.Background(), request) +} + +// DescribeInstanceOperations +// 查询实例指定条件下的操作记录 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) DescribeInstanceOperationsWithContext(ctx context.Context, request *DescribeInstanceOperationsRequest) (response *DescribeInstanceOperationsResponse, err error) { if request == nil { request = NewDescribeInstanceOperationsRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("DescribeInstanceOperations require credential") + } + + request.SetContext(ctx) + response = NewDescribeInstanceOperationsResponse() err = c.Send(request, response) return @@ -179,6 +270,8 @@ func NewDescribeInstancesRequest() (request *DescribeInstancesRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "DescribeInstances") + + return } @@ -197,19 +290,90 @@ func NewDescribeInstancesResponse() (response *DescribeInstancesResponse) { // INTERNALERROR = "InternalError" // INVALIDPARAMETER = "InvalidParameter" func (c *Client) DescribeInstances(request *DescribeInstancesRequest) (response *DescribeInstancesResponse, err error) { + return c.DescribeInstancesWithContext(context.Background(), request) +} + +// DescribeInstances +// 查询用户该地域下符合条件的所有实例 +// +// 可能返回的错误码: +// AUTHFAILURE_UNAUTHORIZEDOPERATION = "AuthFailure.UnAuthorizedOperation" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +func (c *Client) DescribeInstancesWithContext(ctx context.Context, request *DescribeInstancesRequest) (response *DescribeInstancesResponse, err error) { if request == nil { request = NewDescribeInstancesRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("DescribeInstances require credential") + } + + request.SetContext(ctx) + response = NewDescribeInstancesResponse() err = c.Send(request, response) return } +func NewDescribeViewsRequest() (request *DescribeViewsRequest) { + request = &DescribeViewsRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("es", APIVersion, "DescribeViews") + + + return +} + +func NewDescribeViewsResponse() (response *DescribeViewsResponse) { + response = &DescribeViewsResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return +} + +// DescribeViews +// 查询集群各视图数据,包括集群维度、节点维度、Kibana维度 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) DescribeViews(request *DescribeViewsRequest) (response *DescribeViewsResponse, err error) { + return c.DescribeViewsWithContext(context.Background(), request) +} + +// DescribeViews +// 查询集群各视图数据,包括集群维度、节点维度、Kibana维度 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) DescribeViewsWithContext(ctx context.Context, request *DescribeViewsRequest) (response *DescribeViewsResponse, err error) { + if request == nil { + request = NewDescribeViewsRequest() + } + + if c.GetCredential() == nil { + return nil, errors.New("DescribeViews require credential") + } + + request.SetContext(ctx) + + response = NewDescribeViewsResponse() + err = c.Send(request, response) + return +} + func NewDiagnoseInstanceRequest() (request *DiagnoseInstanceRequest) { request = &DiagnoseInstanceRequest{ BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "DiagnoseInstance") + + return } @@ -231,9 +395,30 @@ func NewDiagnoseInstanceResponse() (response *DiagnoseInstanceResponse) { // RESOURCEINSUFFICIENT = "ResourceInsufficient" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) DiagnoseInstance(request *DiagnoseInstanceRequest) (response *DiagnoseInstanceResponse, err error) { + return c.DiagnoseInstanceWithContext(context.Background(), request) +} + +// DiagnoseInstance +// 智能运维诊断集群 +// +// 可能返回的错误码: +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) DiagnoseInstanceWithContext(ctx context.Context, request *DiagnoseInstanceRequest) (response *DiagnoseInstanceResponse, err error) { if request == nil { request = NewDiagnoseInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("DiagnoseInstance require credential") + } + + request.SetContext(ctx) + response = NewDiagnoseInstanceResponse() err = c.Send(request, response) return @@ -244,6 +429,8 @@ func NewGetRequestTargetNodeTypesRequest() (request *GetRequestTargetNodeTypesRe BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "GetRequestTargetNodeTypes") + + return } @@ -262,9 +449,27 @@ func NewGetRequestTargetNodeTypesResponse() (response *GetRequestTargetNodeTypes // INVALIDPARAMETER = "InvalidParameter" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) GetRequestTargetNodeTypes(request *GetRequestTargetNodeTypesRequest) (response *GetRequestTargetNodeTypesResponse, err error) { + return c.GetRequestTargetNodeTypesWithContext(context.Background(), request) +} + +// GetRequestTargetNodeTypes +// 获取接收客户端请求的节点类型 +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) GetRequestTargetNodeTypesWithContext(ctx context.Context, request *GetRequestTargetNodeTypesRequest) (response *GetRequestTargetNodeTypesResponse, err error) { if request == nil { request = NewGetRequestTargetNodeTypesRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("GetRequestTargetNodeTypes require credential") + } + + request.SetContext(ctx) + response = NewGetRequestTargetNodeTypesResponse() err = c.Send(request, response) return @@ -275,6 +480,8 @@ func NewRestartInstanceRequest() (request *RestartInstanceRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "RestartInstance") + + return } @@ -293,9 +500,27 @@ func NewRestartInstanceResponse() (response *RestartInstanceResponse) { // INVALIDPARAMETER = "InvalidParameter" // RESOURCEINUSE = "ResourceInUse" func (c *Client) RestartInstance(request *RestartInstanceRequest) (response *RestartInstanceResponse, err error) { + return c.RestartInstanceWithContext(context.Background(), request) +} + +// RestartInstance +// 重启ES集群实例(用于系统版本更新等操作) +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) RestartInstanceWithContext(ctx context.Context, request *RestartInstanceRequest) (response *RestartInstanceResponse, err error) { if request == nil { request = NewRestartInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("RestartInstance require credential") + } + + request.SetContext(ctx) + response = NewRestartInstanceResponse() err = c.Send(request, response) return @@ -306,6 +531,8 @@ func NewRestartKibanaRequest() (request *RestartKibanaRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "RestartKibana") + + return } @@ -324,9 +551,27 @@ func NewRestartKibanaResponse() (response *RestartKibanaResponse) { // INVALIDPARAMETER = "InvalidParameter" // RESOURCEINUSE = "ResourceInUse" func (c *Client) RestartKibana(request *RestartKibanaRequest) (response *RestartKibanaResponse, err error) { + return c.RestartKibanaWithContext(context.Background(), request) +} + +// RestartKibana +// 重启Kibana +// +// 可能返回的错误码: +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) RestartKibanaWithContext(ctx context.Context, request *RestartKibanaRequest) (response *RestartKibanaResponse, err error) { if request == nil { request = NewRestartKibanaRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("RestartKibana require credential") + } + + request.SetContext(ctx) + response = NewRestartKibanaResponse() err = c.Send(request, response) return @@ -337,6 +582,8 @@ func NewRestartNodesRequest() (request *RestartNodesRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "RestartNodes") + + return } @@ -357,9 +604,29 @@ func NewRestartNodesResponse() (response *RestartNodesResponse) { // RESOURCEINUSE = "ResourceInUse" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) RestartNodes(request *RestartNodesRequest) (response *RestartNodesResponse, err error) { + return c.RestartNodesWithContext(context.Background(), request) +} + +// RestartNodes +// 用于重启集群节点 +// +// 可能返回的错误码: +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) RestartNodesWithContext(ctx context.Context, request *RestartNodesRequest) (response *RestartNodesResponse, err error) { if request == nil { request = NewRestartNodesRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("RestartNodes require credential") + } + + request.SetContext(ctx) + response = NewRestartNodesResponse() err = c.Send(request, response) return @@ -370,6 +637,8 @@ func NewUpdateDiagnoseSettingsRequest() (request *UpdateDiagnoseSettingsRequest) BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpdateDiagnoseSettings") + + return } @@ -391,19 +660,89 @@ func NewUpdateDiagnoseSettingsResponse() (response *UpdateDiagnoseSettingsRespon // RESOURCEINSUFFICIENT = "ResourceInsufficient" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpdateDiagnoseSettings(request *UpdateDiagnoseSettingsRequest) (response *UpdateDiagnoseSettingsResponse, err error) { + return c.UpdateDiagnoseSettingsWithContext(context.Background(), request) +} + +// UpdateDiagnoseSettings +// 更新智能运维配置 +// +// 可能返回的错误码: +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdateDiagnoseSettingsWithContext(ctx context.Context, request *UpdateDiagnoseSettingsRequest) (response *UpdateDiagnoseSettingsResponse, err error) { if request == nil { request = NewUpdateDiagnoseSettingsRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpdateDiagnoseSettings require credential") + } + + request.SetContext(ctx) + response = NewUpdateDiagnoseSettingsResponse() err = c.Send(request, response) return } +func NewUpdateDictionariesRequest() (request *UpdateDictionariesRequest) { + request = &UpdateDictionariesRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("es", APIVersion, "UpdateDictionaries") + + + return +} + +func NewUpdateDictionariesResponse() (response *UpdateDictionariesResponse) { + response = &UpdateDictionariesResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return +} + +// UpdateDictionaries +// 更新ES集群词典 +// +// 可能返回的错误码: +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) UpdateDictionaries(request *UpdateDictionariesRequest) (response *UpdateDictionariesResponse, err error) { + return c.UpdateDictionariesWithContext(context.Background(), request) +} + +// UpdateDictionaries +// 更新ES集群词典 +// +// 可能返回的错误码: +// RESOURCEINUSE = "ResourceInUse" +func (c *Client) UpdateDictionariesWithContext(ctx context.Context, request *UpdateDictionariesRequest) (response *UpdateDictionariesResponse, err error) { + if request == nil { + request = NewUpdateDictionariesRequest() + } + + if c.GetCredential() == nil { + return nil, errors.New("UpdateDictionaries require credential") + } + + request.SetContext(ctx) + + response = NewUpdateDictionariesResponse() + err = c.Send(request, response) + return +} + func NewUpdateInstanceRequest() (request *UpdateInstanceRequest) { request = &UpdateInstanceRequest{ BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpdateInstance") + + return } @@ -435,7 +774,10 @@ func NewUpdateInstanceResponse() (response *UpdateInstanceResponse) { // FAILEDOPERATION_CLUSTERRESOURCELIMITERROR = "FailedOperation.ClusterResourceLimitError" // FAILEDOPERATION_DISKCOUNTPARAMERROR = "FailedOperation.DiskCountParamError" // FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" // FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// FAILEDOPERATION_UNSUPPORTRESETNODETYPEANDSCALEOUTDISK = "FailedOperation.UnsupportResetNodeTypeAndScaleoutDisk" +// FAILEDOPERATION_UNSUPPORTRESETSCALEDOWNANDMODIFYDISK = "FailedOperation.UnsupportResetScaledownAndModifyDisk" // FAILEDOPERATION_UNSUPPORTREVERSEREGULATIONNODETYPEANDDISK = "FailedOperation.UnsupportReverseRegulationNodeTypeAndDisk" // INTERNALERROR = "InternalError" // INVALIDPARAMETER = "InvalidParameter" @@ -445,19 +787,136 @@ func NewUpdateInstanceResponse() (response *UpdateInstanceResponse) { // RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpdateInstance(request *UpdateInstanceRequest) (response *UpdateInstanceResponse, err error) { + return c.UpdateInstanceWithContext(context.Background(), request) +} + +// UpdateInstance +// 对集群进行节点规格变更,修改实例名称,修改配置,重置密码, 添加Kibana黑白名单等操作。参数中InstanceId为必传参数,ForceRestart为选填参数,剩余参数传递组合及含义如下: +// +// - InstanceName:修改实例名称(仅用于标识实例) +// +// - NodeInfoList: 修改节点配置(节点横向扩缩容,纵向扩缩容,增加主节点,增加冷节点等) +// +// - EsConfig:修改集群配置 +// +// - Password:修改默认用户elastic的密码 +// +// - EsAcl:修改访问控制列表 +// +// - CosBackUp: 设置集群COS自动备份信息 +// +// 以上参数组合只能传递一种,多传或少传均会导致请求失败 +// +// 可能返回的错误码: +// FAILEDOPERATION_CLUSTERRESOURCELIMITERROR = "FailedOperation.ClusterResourceLimitError" +// FAILEDOPERATION_DISKCOUNTPARAMERROR = "FailedOperation.DiskCountParamError" +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" +// FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// FAILEDOPERATION_UNSUPPORTRESETNODETYPEANDSCALEOUTDISK = "FailedOperation.UnsupportResetNodeTypeAndScaleoutDisk" +// FAILEDOPERATION_UNSUPPORTRESETSCALEDOWNANDMODIFYDISK = "FailedOperation.UnsupportResetScaledownAndModifyDisk" +// FAILEDOPERATION_UNSUPPORTREVERSEREGULATIONNODETYPEANDDISK = "FailedOperation.UnsupportReverseRegulationNodeTypeAndDisk" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdateInstanceWithContext(ctx context.Context, request *UpdateInstanceRequest) (response *UpdateInstanceResponse, err error) { if request == nil { request = NewUpdateInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpdateInstance require credential") + } + + request.SetContext(ctx) + response = NewUpdateInstanceResponse() err = c.Send(request, response) return } +func NewUpdateJdkRequest() (request *UpdateJdkRequest) { + request = &UpdateJdkRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + request.Init().WithApiInfo("es", APIVersion, "UpdateJdk") + + + return +} + +func NewUpdateJdkResponse() (response *UpdateJdkResponse) { + response = &UpdateJdkResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return +} + +// UpdateJdk +// 更新实例Jdk配置 +// +// 可能返回的错误码: +// FAILEDOPERATION = "FailedOperation" +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATENOREPLICATION = "FailedOperation.ErrorClusterStateNoReplication" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCENOTFOUND = "ResourceNotFound" +// RESOURCEUNAVAILABLE = "ResourceUnavailable" +// RESOURCESSOLDOUT = "ResourcesSoldOut" +// UNAUTHORIZEDOPERATION = "UnauthorizedOperation" +// UNKNOWNPARAMETER = "UnknownParameter" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdateJdk(request *UpdateJdkRequest) (response *UpdateJdkResponse, err error) { + return c.UpdateJdkWithContext(context.Background(), request) +} + +// UpdateJdk +// 更新实例Jdk配置 +// +// 可能返回的错误码: +// FAILEDOPERATION = "FailedOperation" +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATENOREPLICATION = "FailedOperation.ErrorClusterStateNoReplication" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCENOTFOUND = "ResourceNotFound" +// RESOURCEUNAVAILABLE = "ResourceUnavailable" +// RESOURCESSOLDOUT = "ResourcesSoldOut" +// UNAUTHORIZEDOPERATION = "UnauthorizedOperation" +// UNKNOWNPARAMETER = "UnknownParameter" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdateJdkWithContext(ctx context.Context, request *UpdateJdkRequest) (response *UpdateJdkResponse, err error) { + if request == nil { + request = NewUpdateJdkRequest() + } + + if c.GetCredential() == nil { + return nil, errors.New("UpdateJdk require credential") + } + + request.SetContext(ctx) + + response = NewUpdateJdkResponse() + err = c.Send(request, response) + return +} + func NewUpdatePluginsRequest() (request *UpdatePluginsRequest) { request = &UpdatePluginsRequest{ BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpdatePlugins") + + return } @@ -473,6 +932,8 @@ func NewUpdatePluginsResponse() (response *UpdatePluginsResponse) { // // 可能返回的错误码: // FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATENOREPLICATION = "FailedOperation.ErrorClusterStateNoReplication" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" // FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" // INTERNALERROR = "InternalError" // INVALIDPARAMETER = "InvalidParameter" @@ -481,9 +942,34 @@ func NewUpdatePluginsResponse() (response *UpdatePluginsResponse) { // RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpdatePlugins(request *UpdatePluginsRequest) (response *UpdatePluginsResponse, err error) { + return c.UpdatePluginsWithContext(context.Background(), request) +} + +// UpdatePlugins +// 变更插件列表 +// +// 可能返回的错误码: +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_ERRORCLUSTERSTATENOREPLICATION = "FailedOperation.ErrorClusterStateNoReplication" +// FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" +// FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdatePluginsWithContext(ctx context.Context, request *UpdatePluginsRequest) (response *UpdatePluginsResponse, err error) { if request == nil { request = NewUpdatePluginsRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpdatePlugins require credential") + } + + request.SetContext(ctx) + response = NewUpdatePluginsResponse() err = c.Send(request, response) return @@ -494,6 +980,8 @@ func NewUpdateRequestTargetNodeTypesRequest() (request *UpdateRequestTargetNodeT BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpdateRequestTargetNodeTypes") + + return } @@ -515,9 +1003,30 @@ func NewUpdateRequestTargetNodeTypesResponse() (response *UpdateRequestTargetNod // RESOURCENOTFOUND = "ResourceNotFound" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpdateRequestTargetNodeTypes(request *UpdateRequestTargetNodeTypesRequest) (response *UpdateRequestTargetNodeTypesResponse, err error) { + return c.UpdateRequestTargetNodeTypesWithContext(context.Background(), request) +} + +// UpdateRequestTargetNodeTypes +// 更新接收客户端请求的节点类型 +// +// 可能返回的错误码: +// AUTHFAILURE = "AuthFailure" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCENOTFOUND = "ResourceNotFound" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpdateRequestTargetNodeTypesWithContext(ctx context.Context, request *UpdateRequestTargetNodeTypesRequest) (response *UpdateRequestTargetNodeTypesResponse, err error) { if request == nil { request = NewUpdateRequestTargetNodeTypesRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpdateRequestTargetNodeTypes require credential") + } + + request.SetContext(ctx) + response = NewUpdateRequestTargetNodeTypesResponse() err = c.Send(request, response) return @@ -528,6 +1037,8 @@ func NewUpgradeInstanceRequest() (request *UpgradeInstanceRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpgradeInstance") + + return } @@ -552,9 +1063,33 @@ func NewUpgradeInstanceResponse() (response *UpgradeInstanceResponse) { // RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpgradeInstance(request *UpgradeInstanceRequest) (response *UpgradeInstanceResponse, err error) { + return c.UpgradeInstanceWithContext(context.Background(), request) +} + +// UpgradeInstance +// 升级ES集群版本 +// +// 可能返回的错误码: +// FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" +// FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpgradeInstanceWithContext(ctx context.Context, request *UpgradeInstanceRequest) (response *UpgradeInstanceResponse, err error) { if request == nil { request = NewUpgradeInstanceRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpgradeInstance require credential") + } + + request.SetContext(ctx) + response = NewUpgradeInstanceResponse() err = c.Send(request, response) return @@ -565,6 +1100,8 @@ func NewUpgradeLicenseRequest() (request *UpgradeLicenseRequest) { BaseRequest: &tchttp.BaseRequest{}, } request.Init().WithApiInfo("es", APIVersion, "UpgradeLicense") + + return } @@ -587,9 +1124,31 @@ func NewUpgradeLicenseResponse() (response *UpgradeLicenseResponse) { // RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" // UNSUPPORTEDOPERATION = "UnsupportedOperation" func (c *Client) UpgradeLicense(request *UpgradeLicenseRequest) (response *UpgradeLicenseResponse, err error) { + return c.UpgradeLicenseWithContext(context.Background(), request) +} + +// UpgradeLicense +// 升级ES商业特性 +// +// 可能返回的错误码: +// FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" +// INTERNALERROR = "InternalError" +// INVALIDPARAMETER = "InvalidParameter" +// RESOURCEINUSE = "ResourceInUse" +// RESOURCEINSUFFICIENT = "ResourceInsufficient" +// RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" +// UNSUPPORTEDOPERATION = "UnsupportedOperation" +func (c *Client) UpgradeLicenseWithContext(ctx context.Context, request *UpgradeLicenseRequest) (response *UpgradeLicenseResponse, err error) { if request == nil { request = NewUpgradeLicenseRequest() } + + if c.GetCredential() == nil { + return nil, errors.New("UpgradeLicense require credential") + } + + request.SetContext(ctx) + response = NewUpgradeLicenseResponse() err = c.Send(request, response) return diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/errors.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/errors.go index e9161d356b..7340a9bc38 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/errors.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/errors.go @@ -23,6 +23,9 @@ const ( // 操作未授权。 AUTHFAILURE_UNAUTHORIZEDOPERATION = "AuthFailure.UnAuthorizedOperation" + // 操作失败。 + FAILEDOPERATION = "FailedOperation" + // 集群资源配额限制错误。 FAILEDOPERATION_CLUSTERRESOURCELIMITERROR = "FailedOperation.ClusterResourceLimitError" @@ -32,12 +35,24 @@ const ( // 集群状态错误。 FAILEDOPERATION_ERRORCLUSTERSTATE = "FailedOperation.ErrorClusterState" + // 集群索引没有副本存在。 + FAILEDOPERATION_ERRORCLUSTERSTATENOREPLICATION = "FailedOperation.ErrorClusterStateNoReplication" + + // 集群状态不健康。 + FAILEDOPERATION_ERRORCLUSTERSTATEUNHEALTH = "FailedOperation.ErrorClusterStateUnhealth" + // 账户未绑定信用卡或paypal,无法支付。 FAILEDOPERATION_NOPAYMENT = "FailedOperation.NoPayment" // 用户未实名认证。 FAILEDOPERATION_NOTAUTHENTICATED = "FailedOperation.NotAuthenticated" + // 不支持在滚动重启扩容计算资源同时扩容磁盘数量。 + FAILEDOPERATION_UNSUPPORTRESETNODETYPEANDSCALEOUTDISK = "FailedOperation.UnsupportResetNodeTypeAndScaleoutDisk" + + // 不支持滚动缩容计算资源同时修改磁盘大小。 + FAILEDOPERATION_UNSUPPORTRESETSCALEDOWNANDMODIFYDISK = "FailedOperation.UnsupportResetScaledownAndModifyDisk" + // 不支持反向调节节点配置和磁盘容量。 FAILEDOPERATION_UNSUPPORTREVERSEREGULATIONNODETYPEANDDISK = "FailedOperation.UnsupportReverseRegulationNodeTypeAndDisk" @@ -56,12 +71,27 @@ const ( // 账户余额不足。 RESOURCEINSUFFICIENT_BALANCE = "ResourceInsufficient.Balance" + // 隐藏可用区专用主节点资源不足。 + RESOURCEINSUFFICIENT_HIDDENZONE = "ResourceInsufficient.HiddenZone" + // 子网剩余ip数量不足。 RESOURCEINSUFFICIENT_SUBNET = "ResourceInsufficient.Subnet" // 资源不存在。 RESOURCENOTFOUND = "ResourceNotFound" + // 资源不可用。 + RESOURCEUNAVAILABLE = "ResourceUnavailable" + + // 资源售罄。 + RESOURCESSOLDOUT = "ResourcesSoldOut" + + // 未授权操作。 + UNAUTHORIZEDOPERATION = "UnauthorizedOperation" + + // 未知参数错误。 + UNKNOWNPARAMETER = "UnknownParameter" + // 操作不支持。 UNSUPPORTEDOPERATION = "UnsupportedOperation" ) diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/models.go index 04cccd2ac3..8491a7b522 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es/v20180416/models.go @@ -20,6 +20,77 @@ import ( tchttp "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http" ) +type ClusterView struct { + + // 集群健康状态 + Health *float64 `json:"Health,omitempty" name:"Health"` + + // 集群是否可见 + Visible *float64 `json:"Visible,omitempty" name:"Visible"` + + // 集群是否熔断 + Break *float64 `json:"Break,omitempty" name:"Break"` + + // 平均磁盘使用率 + AvgDiskUsage *float64 `json:"AvgDiskUsage,omitempty" name:"AvgDiskUsage"` + + // 平均内存使用率 + AvgMemUsage *float64 `json:"AvgMemUsage,omitempty" name:"AvgMemUsage"` + + // 平均cpu使用率 + AvgCpuUsage *float64 `json:"AvgCpuUsage,omitempty" name:"AvgCpuUsage"` + + // 集群总存储大小 + TotalDiskSize *uint64 `json:"TotalDiskSize,omitempty" name:"TotalDiskSize"` + + // 客户端请求节点 + TargetNodeTypes []*string `json:"TargetNodeTypes,omitempty" name:"TargetNodeTypes"` + + // 在线节点数 + NodeNum *int64 `json:"NodeNum,omitempty" name:"NodeNum"` + + // 总节点数 + TotalNodeNum *int64 `json:"TotalNodeNum,omitempty" name:"TotalNodeNum"` + + // 数据节点数 + DataNodeNum *int64 `json:"DataNodeNum,omitempty" name:"DataNodeNum"` + + // 索引数 + IndexNum *int64 `json:"IndexNum,omitempty" name:"IndexNum"` + + // 文档数 + DocNum *int64 `json:"DocNum,omitempty" name:"DocNum"` + + // 磁盘已使用字节数 + DiskUsedInBytes *int64 `json:"DiskUsedInBytes,omitempty" name:"DiskUsedInBytes"` + + // 分片个数 + ShardNum *int64 `json:"ShardNum,omitempty" name:"ShardNum"` + + // 主分片个数 + PrimaryShardNum *int64 `json:"PrimaryShardNum,omitempty" name:"PrimaryShardNum"` + + // 迁移中的分片个数 + RelocatingShardNum *int64 `json:"RelocatingShardNum,omitempty" name:"RelocatingShardNum"` + + // 初始化中的分片个数 + InitializingShardNum *int64 `json:"InitializingShardNum,omitempty" name:"InitializingShardNum"` + + // 未分配的分片个数 + UnassignedShardNum *int64 `json:"UnassignedShardNum,omitempty" name:"UnassignedShardNum"` + + // 企业版COS存储容量大小,单位GB + TotalCosStorage *int64 `json:"TotalCosStorage,omitempty" name:"TotalCosStorage"` + + // 企业版集群可搜索快照cos存放的bucket名称 + // 注意:此字段可能返回 null,表示取不到有效值。 + SearchableSnapshotCosBucket *string `json:"SearchableSnapshotCosBucket,omitempty" name:"SearchableSnapshotCosBucket"` + + // 企业版集群可搜索快照cos所属appid + // 注意:此字段可能返回 null,表示取不到有效值。 + SearchableSnapshotCosAppId *string `json:"SearchableSnapshotCosAppId,omitempty" name:"SearchableSnapshotCosAppId"` +} + type CosBackup struct { // 是否开启cos自动备份 @@ -126,6 +197,9 @@ type CreateInstanceRequest struct { // 可视化节点配置 WebNodeTypeInfo *WebNodeTypeInfo `json:"WebNodeTypeInfo,omitempty" name:"WebNodeTypeInfo"` + + // 创建https集群,默认是http + Protocol *string `json:"Protocol,omitempty" name:"Protocol"` } func (r *CreateInstanceRequest) ToJsonString() string { @@ -169,6 +243,7 @@ func (r *CreateInstanceRequest) FromJsonString(s string) error { delete(f, "BasicSecurityType") delete(f, "SceneType") delete(f, "WebNodeTypeInfo") + delete(f, "Protocol") if len(f) > 0 { return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "CreateInstanceRequest has unknown keys!", "") } @@ -182,6 +257,10 @@ type CreateInstanceResponse struct { // 实例ID InstanceId *string `json:"InstanceId,omitempty" name:"InstanceId"` + // 订单号 + // 注意:此字段可能返回 null,表示取不到有效值。 + DealName *string `json:"DealName,omitempty" name:"DealName"` + // 唯一请求 ID,每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 RequestId *string `json:"RequestId,omitempty" name:"RequestId"` } `json:"Response"` @@ -427,6 +506,12 @@ type DescribeInstancesRequest struct { // 私有网络vip列表 IpList []*string `json:"IpList,omitempty" name:"IpList"` + + // 可用区列表 + ZoneList []*string `json:"ZoneList,omitempty" name:"ZoneList"` + + // 健康状态筛列表 + HealthStatus []*int64 `json:"HealthStatus,omitempty" name:"HealthStatus"` } func (r *DescribeInstancesRequest) ToJsonString() string { @@ -450,6 +535,8 @@ func (r *DescribeInstancesRequest) FromJsonString(s string) error { delete(f, "OrderByType") delete(f, "TagList") delete(f, "IpList") + delete(f, "ZoneList") + delete(f, "HealthStatus") if len(f) > 0 { return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "DescribeInstancesRequest has unknown keys!", "") } @@ -482,6 +569,64 @@ func (r *DescribeInstancesResponse) FromJsonString(s string) error { return json.Unmarshal([]byte(s), &r) } +type DescribeViewsRequest struct { + *tchttp.BaseRequest + + // 集群实例ID + InstanceId *string `json:"InstanceId,omitempty" name:"InstanceId"` +} + +func (r *DescribeViewsRequest) ToJsonString() string { + b, _ := json.Marshal(r) + return string(b) +} + +// FromJsonString It is highly **NOT** recommended to use this function +// because it has no param check, nor strict type check +func (r *DescribeViewsRequest) FromJsonString(s string) error { + f := make(map[string]interface{}) + if err := json.Unmarshal([]byte(s), &f); err != nil { + return err + } + delete(f, "InstanceId") + if len(f) > 0 { + return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "DescribeViewsRequest has unknown keys!", "") + } + return json.Unmarshal([]byte(s), &r) +} + +type DescribeViewsResponse struct { + *tchttp.BaseResponse + Response *struct { + + // 集群维度视图 + // 注意:此字段可能返回 null,表示取不到有效值。 + ClusterView *ClusterView `json:"ClusterView,omitempty" name:"ClusterView"` + + // 节点维度视图 + // 注意:此字段可能返回 null,表示取不到有效值。 + NodesView []*NodeView `json:"NodesView,omitempty" name:"NodesView"` + + // Kibana维度视图 + // 注意:此字段可能返回 null,表示取不到有效值。 + KibanasView []*KibanaView `json:"KibanasView,omitempty" name:"KibanasView"` + + // 唯一请求 ID,每次请求都会返回。定位问题时需要提供该次请求的 RequestId。 + RequestId *string `json:"RequestId,omitempty" name:"RequestId"` + } `json:"Response"` +} + +func (r *DescribeViewsResponse) ToJsonString() string { + b, _ := json.Marshal(r) + return string(b) +} + +// FromJsonString It is highly **NOT** recommended to use this function +// because it has no param check, nor strict type check +func (r *DescribeViewsResponse) FromJsonString(s string) error { + return json.Unmarshal([]byte(s), &r) +} + type DiagnoseInstanceRequest struct { *tchttp.BaseRequest @@ -744,27 +889,27 @@ type InstanceInfo struct { // 注意:此字段可能返回 null,表示取不到有效值。 EnableHotWarmMode *bool `json:"EnableHotWarmMode,omitempty" name:"EnableHotWarmMode"` - // 冷节点规格