Skip to content

Commit 9716c45

Browse files
authored
update cdb template (#1787)
1 parent d81cc7a commit 9716c45

File tree

9 files changed

+3082
-394
lines changed

9 files changed

+3082
-394
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ require (
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam v1.0.409
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520
3232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591
33-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.576
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/chdfs v1.0.600
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ckafka v1.0.634
3838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.599
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
4040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
41-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.657
41+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.658
4242
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589
4444
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.572

go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -784,8 +784,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520 h1:n4FN0PI
784784
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cat v1.0.520/go.mod h1:gzI+2Qd/iUfPPQQjW30k0G3mJ3m7tXeXrydJMm8jsOo=
785785
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591 h1:TPGLjH6wqkA5Iirl6xCxFkWwrtCZ8ZmeF7ASzqUbsZA=
786786
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cbs v1.0.591/go.mod h1:nCAGfVTXZkVnurkbjF3b0FM6RwGztE9t8D9Ms1unaKo=
787-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.576 h1:0Ob8XAXco+lp19HE3CCH/oQBxq6SdhUB/5O842dJ9Ec=
788-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.576/go.mod h1:kbILC5/kqFl+0UK8X9PGP3ubvZi8VReQLQYxhVw8ZH0=
787+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658 h1:9lcl2TyePN9iL0uxR6foazZmzGxmlL9VszfuQIPrTs0=
788+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdb v1.0.658/go.mod h1:ijeny+Q903x+L0lBzYKT+opPp9/5DSrJ2XcBDeVXuto=
789789
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539 h1:0L6nZhT2bToTc/n1z3HOpNgdu5VX5ulmqIuPY+8UozA=
790790
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cdn v1.0.539/go.mod h1:6Syk7W5fdDf0BLvX+RXL5obQ6unkt3Id4aN2QqVrV6U=
791791
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cfs v1.0.627 h1:nChNdoCUWQZciiJj3gRCWoHBO/8LituLQOdCRREIrS4=
@@ -822,7 +822,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.547/go.mod
822822
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
823823
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.571/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
824824
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
825-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.576/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
826825
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.578/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
827826
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.581/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
828827
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.584/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
@@ -842,10 +841,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.648/go.mod
842841
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.650/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
843842
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.651/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
844843
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.652/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
845-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.656 h1:QCAABhhY3EXW+fNk/t0pIuG//VxDRydIJAdPzkBm7EY=
846844
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.656/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
847-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.657 h1:daDlYUdKRzgi2PxIcXj4vU1enWs6aqrL7K5qD3fKpmo=
848845
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.657/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
846+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.658 h1:q208plt7F8Pj3b1w8D3XDb/vTgHsn/JlEwDCSe+lvyo=
847+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.658/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
849848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624 h1:nEZqsoqt1pEoaP9JjkHQy3/H00suCfzlHW1qOm2nYD8=
850849
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.624/go.mod h1:+TXSVyeKwt1IhZRqKPbTREteBcP+K07Q846/ilNzLWA=
851850
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cwp v1.0.589 h1:LZihgirMH0vsaGScYexxwY0fTss9vHaSZs/YOQUVESg=
@@ -875,8 +874,6 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.514/go.mod h1
875874
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.194/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
876875
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199 h1:rSDQeqvV4khOJUyg6xmMYF26CRd+WtSYvfwP6N72NP0=
877876
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199/go.mod h1:yrBKWhChnDqNz1xuXdSbWXG56XawEq0G5j1lg4VwBD4=
878-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.644 h1:Js416dtCowQ4HP089OWrIHNy7t0IPFmnoUPUzWDCPXw=
879-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.644/go.mod h1:s1pyOiN+/rTq8CLPBpDa4sYkiQzw/VAbRlpBePrPBOY=
880877
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656 h1:g//msFpwifqXoHuSIara75o2NWs4lRYHJ5qWQuBcYEs=
881878
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656/go.mod h1:hvE2a3GX09BXRMTIsk0w0vkAJ4QcagMq+pXCLnFmPNM=
882879
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535 h1:hSwG4ZbcP2Ht+AWHI81EMCvJdDTyTT7zP/qjOe/VcZg=

tencentcloud/resource_tc_mysql_param_template.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,16 @@ func resourceTencentCloudMysqlParamTemplateRead(d *schema.ResourceData, meta int
211211
return fmt.Errorf("resource `MysqlParamTemplate` %s does not exist", d.Id())
212212
}
213213

214+
paramTemplateInfo, err := service.DescribeMysqlParamTemplateInfoById(ctx, templateId)
215+
if err != nil {
216+
return err
217+
}
218+
219+
if paramTemplateInfo == nil {
220+
d.SetId("")
221+
return fmt.Errorf("resource `MysqlParamTemplateInfo` %s does not exist", d.Id())
222+
}
223+
214224
if paramTemplate.Name != nil {
215225
_ = d.Set("name", paramTemplate.Name)
216226
}
@@ -223,6 +233,10 @@ func resourceTencentCloudMysqlParamTemplateRead(d *schema.ResourceData, meta int
223233
_ = d.Set("engine_version", paramTemplate.EngineVersion)
224234
}
225235

236+
if paramTemplateInfo.EngineType != nil {
237+
_ = d.Set("engine_type", paramTemplateInfo.EngineType)
238+
}
239+
226240
params := make([]string, 0)
227241
if v, ok := d.GetOk("param_list"); ok {
228242
for _, item := range v.([]interface{}) {

tencentcloud/service_tencentcloud_mysql.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,35 @@ func (me *MysqlService) DescribeMysqlParamTemplateById(ctx context.Context, temp
13721372
return
13731373
}
13741374

1375+
func (me *MysqlService) DescribeMysqlParamTemplateInfoById(ctx context.Context, templateId string) (paramTemplateInfo *cdb.ParamTemplateInfo, errRet error) {
1376+
logId := getLogId(ctx)
1377+
1378+
request := cdb.NewDescribeParamTemplatesRequest()
1379+
request.TemplateIds = []*int64{helper.StrToInt64Point(templateId)}
1380+
1381+
defer func() {
1382+
if errRet != nil {
1383+
log.Printf("[CRITAL]%s api[%s] fail, request body [%s], reason[%s]\n", logId, request.GetAction(), request.ToJsonString(), errRet.Error())
1384+
}
1385+
}()
1386+
1387+
ratelimit.Check(request.GetAction())
1388+
1389+
response, err := me.client.UseMysqlClient().DescribeParamTemplates(request)
1390+
if err != nil {
1391+
errRet = err
1392+
return
1393+
}
1394+
log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
1395+
1396+
items := response.Response.Items
1397+
if len(items) < 1 {
1398+
return
1399+
}
1400+
paramTemplateInfo = items[0]
1401+
return
1402+
}
1403+
13751404
func (me *MysqlService) DeleteMysqlParamTemplateById(ctx context.Context, templateId string) (errRet error) {
13761405
logId := getLogId(ctx)
13771406

0 commit comments

Comments
 (0)