diff --git a/.changelog/3631.txt b/.changelog/3631.txt new file mode 100644 index 0000000000..c79f849ad1 --- /dev/null +++ b/.changelog/3631.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/tencentcloud_cynosdb_cluster_transparent_encrypt: Supports modification of is_open_global_encryption. +``` \ No newline at end of file diff --git a/go.mod b/go.mod index 921a30eec3..7797662326 100644 --- a/go.mod +++ b/go.mod @@ -46,10 +46,10 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.1107 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.1033 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.1206 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.652 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.633 diff --git a/go.sum b/go.sum index a34846b2ac..9e6ccb2a6a 100644 --- a/go.sum +++ b/go.sum @@ -947,6 +947,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3 h1:r05ohL github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.3/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4 h1:k8QEWznn11evs+N5ZGQMCCPnzAHxnul2mRIZJB8Lwbo= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7 h1:MCrz0g4LDxoCdCgz6Dtas8b7HHLMfgTpIIF/tlor0Hw= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993 h1:WlPgXldQCxt7qi5Xrc6j6zTrsXWzN5BcOGs7Irq7fwQ= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/controlcenter v1.0.993/go.mod h1:Z9U8zNtyuyKhjS0698wqsrG/kLx1TQ5CEixXBwVe7xY= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip v1.0.860 h1:F3esKBIT3HW9+7Gt8cVgf8X06VdGIczpgLBUECzSEzU= @@ -957,6 +959,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 h1:2egy69S github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762/go.mod h1:1XylIfNUbAzmNqi4XMhwcM3VhmUHdu1OYybOeaJ4sOw= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52 h1:h/OquZHmxmfZXHfo07dmh74DrclFVjyUV3tfk66oP9o= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52/go.mod h1:0F66TApiFl1wlux8XGoJTVLbrE48FNd5OJOX5V9OvBQ= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7 h1:HvkbNkVwUdg//O4BKwd87BqSJIH3NJKOLVROdHeCcVQ= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7/go.mod h1:k0qhXvE8aIHsC3tjaXr7VvOxcD8pEW+ohsFS5vMZquE= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970 h1:qVIRHgG1twsqF4aVN/x2T2yMRfPpsZBTNefDkqzM06M= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970/go.mod h1:NJuuQD4z6vcnsZnC7Tvz2U9hElNS1wroc34UQbZvP2U= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335 h1:D8qrelkK5udv8RzJJIABMzItGIyaZoYnxEVeIsYqiNw= diff --git a/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt.go b/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt.go index c0178328b5..e83235651e 100644 --- a/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt.go +++ b/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt.go @@ -130,7 +130,7 @@ func resourceTencentCloudCynosdbClusterTransparentEncryptUpdate(d *schema.Resour clusterId := d.Id() needChange := false - mutableArgs := []string{"cluster_id", "key_type", "key_id", "key_region", "is_open_global_encryption"} + mutableArgs := []string{"cluster_id", "key_type", "key_id", "key_region"} for _, v := range mutableArgs { if d.HasChange(v) { needChange = true @@ -158,12 +158,40 @@ func resourceTencentCloudCynosdbClusterTransparentEncryptUpdate(d *schema.Resour request.KeyRegion = helper.String(v.(string)) } + reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCynosdbClient().OpenClusterTransparentEncryptWithContext(ctx, request) + if e != nil { + return tccommon.RetryError(e) + } else { + log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), result.ToJsonString()) + } + response = result + return nil + }) + if reqErr != nil { + log.Printf("[CRITAL]%s update cynosdb cluster transparent encrypt failed, reason:%+v", logId, reqErr) + return reqErr + } + + taskId := *response.Response.TaskId + service := CynosdbService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()} + conf := tccommon.BuildStateChangeConf([]string{}, []string{"success"}, 10*tccommon.ReadRetryTimeout, time.Second, service.taskStateRefreshFunc(strconv.FormatInt(taskId, 10), []string{})) + if _, e := conf.WaitForState(); e != nil { + return e + } + } + + if d.HasChange("is_open_global_encryption") && !d.IsNewResource() { + request := cynosdbv20190107.NewModifyClusterGlobalEncryptionRequest() + response := cynosdbv20190107.NewModifyClusterGlobalEncryptionResponse() + request.ClusterId = helper.String(clusterId) + if v, ok := d.GetOkExists("is_open_global_encryption"); ok { request.IsOpenGlobalEncryption = helper.Bool(v.(bool)) } reqErr := resource.Retry(tccommon.WriteRetryTimeout, func() *resource.RetryError { - result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCynosdbClient().OpenClusterTransparentEncryptWithContext(ctx, request) + result, e := meta.(tccommon.ProviderMeta).GetAPIV3Conn().UseCynosdbClient().ModifyClusterGlobalEncryptionWithContext(ctx, request) if e != nil { return tccommon.RetryError(e) } else { @@ -173,7 +201,7 @@ func resourceTencentCloudCynosdbClusterTransparentEncryptUpdate(d *schema.Resour return nil }) if reqErr != nil { - log.Printf("[CRITAL]%s update cynosdb cluster transparent encrypt failed, reason:%+v", logId, reqErr) + log.Printf("[CRITAL]%s update cynosdb cluster is_open_global_encryption failed, reason:%+v", logId, reqErr) return reqErr } diff --git a/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt_test.go b/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt_test.go index 28839f032b..b188024817 100644 --- a/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt_test.go +++ b/tencentcloud/services/cynosdb/resource_tc_cynosdb_cluster_transparent_encrypt_test.go @@ -29,11 +29,64 @@ func TestAccTencentCloudCynosdbClusterTransparentEncryptResource_basic(t *testin ResourceName: "tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", ImportState: true, }, + { + Config: testAccCynosdbClusterTransparentEncryptUp, + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "id"), + resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_id"), + resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_region"), + resource.TestCheckResourceAttrSet("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "key_type"), + resource.TestCheckResourceAttr("tencentcloud_cynosdb_cluster_transparent_encrypt.cynosdb_cluster_transparent_encrypt", "is_open_global_encryption", "true"), + ), + }, }, }) } -const testAccCynosdbClusterTransparentEncrypt = testAccCynosdbCluster + ` +const testAccCynosdbClusterTransparentEncrypt = ` +resource "tencentcloud_cynosdb_cluster" "foo" { + auto_renew_flag = 0 + available_zone = "ap-guangzhou-3" + charge_type = "POSTPAID_BY_HOUR" + cluster_name = "cynosdbmysql-8iy4bgap" + db_type = "MYSQL" + db_version = "8.0" + instance_cpu_core = 2 + instance_maintain_duration = 3600 + instance_maintain_start_time = 10800 + force_delete = true + # cynos_version = "3.1.15.006" + instance_maintain_weekdays = [ + "Fri", + "Mon", + "Sat", + "Sun", + "Thu", + "Tue", + "Wed", + ] + instance_memory_size = 4 + port = 3306 + project_id = 0 + password = "iac@123456" + rw_group_sg = [ + "sg-5275dorp", + ] + serverless_status = null + storage_pay_mode = 0 + subnet_id = "subnet-oi7ya2j6" + tags = {} + vpc_id = "vpc-axrsmmrv" + param_items { + name = "lower_case_table_names" + current_value = "0" + } + lifecycle { + ignore_changes = [ + param_items["lower_case_table_names"] + ] + } +} resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_transparent_encrypt" { cluster_id = tencentcloud_cynosdb_cluster.foo.id is_open_global_encryption = false @@ -42,3 +95,56 @@ resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_tra key_type = "custom" } ` + +const testAccCynosdbClusterTransparentEncryptUp = ` +resource "tencentcloud_cynosdb_cluster" "foo" { + auto_renew_flag = 0 + available_zone = "ap-guangzhou-3" + charge_type = "POSTPAID_BY_HOUR" + cluster_name = "cynosdbmysql-8iy4bgap" + db_type = "MYSQL" + db_version = "8.0" + instance_cpu_core = 2 + instance_maintain_duration = 3600 + instance_maintain_start_time = 10800 + force_delete = true + # cynos_version = "3.1.15.006" + instance_maintain_weekdays = [ + "Fri", + "Mon", + "Sat", + "Sun", + "Thu", + "Tue", + "Wed", + ] + instance_memory_size = 4 + port = 3306 + project_id = 0 + password = "iac@123456" + rw_group_sg = [ + "sg-5275dorp", + ] + serverless_status = null + storage_pay_mode = 0 + subnet_id = "subnet-oi7ya2j6" + tags = {} + vpc_id = "vpc-axrsmmrv" + param_items { + name = "lower_case_table_names" + current_value = "0" + } + lifecycle { + ignore_changes = [ + param_items["lower_case_table_names"] + ] + } +} +resource "tencentcloud_cynosdb_cluster_transparent_encrypt" "cynosdb_cluster_transparent_encrypt" { + cluster_id = tencentcloud_cynosdb_cluster.foo.id + is_open_global_encryption = true + key_id = "f063c18b-654b-11ef-9d9f-525400d3a886" + key_region = "ap-guangzhou" + key_type = "custom" +} +` 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 fa3020254f..1c7674a7ce 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 @@ -265,7 +265,7 @@ func CompleteCommonParams(request Request, region string, requestClient string) params["Action"] = request.GetAction() params["Timestamp"] = strconv.FormatInt(time.Now().Unix(), 10) params["Nonce"] = strconv.Itoa(rand.Int()) - params["RequestClient"] = "SDK_GO_1.3.4" + params["RequestClient"] = "SDK_GO_1.3.7" if requestClient != "" { params["RequestClient"] += ": " + requestClient } diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/client.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/client.go index 6e098626d3..15b6a1977e 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/client.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/client.go @@ -7835,6 +7835,62 @@ func (c *Client) ModifyClusterDatabaseWithContext(ctx context.Context, request * return } +func NewModifyClusterGlobalEncryptionRequest() (request *ModifyClusterGlobalEncryptionRequest) { + request = &ModifyClusterGlobalEncryptionRequest{ + BaseRequest: &tchttp.BaseRequest{}, + } + + request.Init().WithApiInfo("cynosdb", APIVersion, "ModifyClusterGlobalEncryption") + + + return +} + +func NewModifyClusterGlobalEncryptionResponse() (response *ModifyClusterGlobalEncryptionResponse) { + response = &ModifyClusterGlobalEncryptionResponse{ + BaseResponse: &tchttp.BaseResponse{}, + } + return + +} + +// ModifyClusterGlobalEncryption +// 开关全局加密 +// +// 可能返回的错误码: +// FAILEDOPERATION_OPERATIONFAILEDERROR = "FailedOperation.OperationFailedError" +// INVALIDPARAMETERVALUE_INVALIDPARAMETERVALUEERROR = "InvalidParameterValue.InvalidParameterValueError" +// RESOURCENOTFOUND_CLUSTERNOTFOUNDERROR = "ResourceNotFound.ClusterNotFoundError" +// UNAUTHORIZEDOPERATION_PERMISSIONDENIED = "UnauthorizedOperation.PermissionDenied" +func (c *Client) ModifyClusterGlobalEncryption(request *ModifyClusterGlobalEncryptionRequest) (response *ModifyClusterGlobalEncryptionResponse, err error) { + return c.ModifyClusterGlobalEncryptionWithContext(context.Background(), request) +} + +// ModifyClusterGlobalEncryption +// 开关全局加密 +// +// 可能返回的错误码: +// FAILEDOPERATION_OPERATIONFAILEDERROR = "FailedOperation.OperationFailedError" +// INVALIDPARAMETERVALUE_INVALIDPARAMETERVALUEERROR = "InvalidParameterValue.InvalidParameterValueError" +// RESOURCENOTFOUND_CLUSTERNOTFOUNDERROR = "ResourceNotFound.ClusterNotFoundError" +// UNAUTHORIZEDOPERATION_PERMISSIONDENIED = "UnauthorizedOperation.PermissionDenied" +func (c *Client) ModifyClusterGlobalEncryptionWithContext(ctx context.Context, request *ModifyClusterGlobalEncryptionRequest) (response *ModifyClusterGlobalEncryptionResponse, err error) { + if request == nil { + request = NewModifyClusterGlobalEncryptionRequest() + } + c.InitBaseRequest(&request.BaseRequest, "cynosdb", APIVersion, "ModifyClusterGlobalEncryption") + + if c.GetCredential() == nil { + return nil, errors.New("ModifyClusterGlobalEncryption require credential") + } + + request.SetContext(ctx) + + response = NewModifyClusterGlobalEncryptionResponse() + err = c.Send(request, response) + return +} + func NewModifyClusterNameRequest() (request *ModifyClusterNameRequest) { request = &ModifyClusterNameRequest{ BaseRequest: &tchttp.BaseRequest{}, diff --git a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/models.go b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/models.go index cb3febbdce..d1b3f2dc5a 100644 --- a/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/models.go +++ b/vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107/models.go @@ -3963,6 +3963,15 @@ type CynosdbInstanceDetail struct { Zone *string `json:"Zone,omitnil,omitempty" name:"Zone"` // 实例状态 + // creating：创建中 + // running：运行中 + // isolating：隔离中 + // isolated：已隔离 + // activating：解隔离中 + // offlining：下线中 + // offlined：已下线 + // deleting：删除中 + // deleted：已删除 Status *string `json:"Status,omitnil,omitempty" name:"Status"` // 实例状态中文描述 @@ -10170,7 +10179,7 @@ type GdnTaskInfo struct { // 从集群ID StandbyClusterId *string `json:"StandbyClusterId,omitnil,omitempty" name:"StandbyClusterId"` - // 从集群别名 + // 从集群名称 StandbyClusterName *string `json:"StandbyClusterName,omitnil,omitempty" name:"StandbyClusterName"` } @@ -12218,6 +12227,70 @@ func (r *ModifyClusterDatabaseResponse) FromJsonString(s string) error { return json.Unmarshal([]byte(s), &r) } +// Predefined struct for user +type ModifyClusterGlobalEncryptionRequestParams struct { + // 集群id + ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"` + + // 开启或关闭全局加密 + IsOpenGlobalEncryption *bool `json:"IsOpenGlobalEncryption,omitnil,omitempty" name:"IsOpenGlobalEncryption"` +} + +type ModifyClusterGlobalEncryptionRequest struct { + *tchttp.BaseRequest + + // 集群id + ClusterId *string `json:"ClusterId,omitnil,omitempty" name:"ClusterId"` + + // 开启或关闭全局加密 + IsOpenGlobalEncryption *bool `json:"IsOpenGlobalEncryption,omitnil,omitempty" name:"IsOpenGlobalEncryption"` +} + +func (r *ModifyClusterGlobalEncryptionRequest) 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 *ModifyClusterGlobalEncryptionRequest) FromJsonString(s string) error { + f := make(map[string]interface{}) + if err := json.Unmarshal([]byte(s), &f); err != nil { + return err + } + delete(f, "ClusterId") + delete(f, "IsOpenGlobalEncryption") + if len(f) > 0 { + return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "ModifyClusterGlobalEncryptionRequest has unknown keys!", "") + } + return json.Unmarshal([]byte(s), &r) +} + +// Predefined struct for user +type ModifyClusterGlobalEncryptionResponseParams struct { + // 异步任务id + TaskId *int64 `json:"TaskId,omitnil,omitempty" name:"TaskId"` + + // 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。 + RequestId *string `json:"RequestId,omitnil,omitempty" name:"RequestId"` +} + +type ModifyClusterGlobalEncryptionResponse struct { + *tchttp.BaseResponse + Response *ModifyClusterGlobalEncryptionResponseParams `json:"Response"` +} + +func (r *ModifyClusterGlobalEncryptionResponse) 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 *ModifyClusterGlobalEncryptionResponse) FromJsonString(s string) error { + return json.Unmarshal([]byte(s), &r) +} + // Predefined struct for user type ModifyClusterNameRequestParams struct { // 集群ID @@ -15287,6 +15360,8 @@ type QueryFilter struct { Name *string `json:"Name,omitnil,omitempty" name:"Name"` // 操作符 + // + // Deprecated: Operator is deprecated. Operator *string `json:"Operator,omitnil,omitempty" name:"Operator"` } @@ -17475,6 +17550,15 @@ type TradePrice struct { // 计费价格单位 ChargeUnit *string `json:"ChargeUnit,omitnil,omitempty" name:"ChargeUnit"` + + // 高精度下不包含优惠价格 + UnitPriceHighPrecision *string `json:"UnitPriceHighPrecision,omitnil,omitempty" name:"UnitPriceHighPrecision"` + + // 高精度下优惠后价格 + UnitPriceDiscountHighPrecision *string `json:"UnitPriceDiscountHighPrecision,omitnil,omitempty" name:"UnitPriceDiscountHighPrecision"` + + // 货币单位 + AmountUnit *string `json:"AmountUnit,omitnil,omitempty" name:"AmountUnit"` } // Predefined struct for user @@ -17781,6 +17865,12 @@ type UpgradeProxyRequestParams struct { // 数据库代理节点信息 ProxyZones []*ProxyZone `json:"ProxyZones,omitnil,omitempty" name:"ProxyZones"` + + // 是否滚动升级 + IsRollUpgrade *string `json:"IsRollUpgrade,omitnil,omitempty" name:"IsRollUpgrade"` + + // 滚动升级等待时间，单位：秒 + RollUpgradeWaitingTime *int64 `json:"RollUpgradeWaitingTime,omitnil,omitempty" name:"RollUpgradeWaitingTime"` } type UpgradeProxyRequest struct { @@ -17809,6 +17899,12 @@ type UpgradeProxyRequest struct { // 数据库代理节点信息 ProxyZones []*ProxyZone `json:"ProxyZones,omitnil,omitempty" name:"ProxyZones"` + + // 是否滚动升级 + IsRollUpgrade *string `json:"IsRollUpgrade,omitnil,omitempty" name:"IsRollUpgrade"` + + // 滚动升级等待时间，单位：秒 + RollUpgradeWaitingTime *int64 `json:"RollUpgradeWaitingTime,omitnil,omitempty" name:"RollUpgradeWaitingTime"` } func (r *UpgradeProxyRequest) ToJsonString() string { @@ -17831,6 +17927,8 @@ func (r *UpgradeProxyRequest) FromJsonString(s string) error { delete(f, "ReloadBalance") delete(f, "IsInMaintainPeriod") delete(f, "ProxyZones") + delete(f, "IsRollUpgrade") + delete(f, "RollUpgradeWaitingTime") if len(f) > 0 { return tcerr.NewTencentCloudSDKError("ClientError.BuildRequestError", "UpgradeProxyRequest has unknown keys!", "") } diff --git a/vendor/modules.txt b/vendor/modules.txt index 173a312d6b..53d1d6c8ee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1170,7 +1170,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit/v20190319 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.1148 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls/v20201016 -# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.4 +# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.7 ## explicit; go 1.11 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors @@ -1190,7 +1190,7 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.762 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp/v20180228 -# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.1.52 +# github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.3.7 ## explicit; go 1.14 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb/v20190107 # github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb v1.0.970