Skip to content

Commit cd963b9

Browse files
authored
Feat/support dcdb resource (#1493)
* update dts mode * support tencentcloud_dcdb_db_instance * update doc * update e2e case * update misspell * support tencentcloud_dcdb_account_privileges * update tencentcloud_dcdb_account_privileges e2e * update e2e case * update provider
1 parent b4d7959 commit cd963b9

25 files changed

+2935
-75
lines changed

.changelog/1493.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
```release-note:new-resource
3+
tencentcloud_dcdb_account_privileges
4+
```

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ require (
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.544
3737
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
38-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.571
38+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.553
4040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488
4141
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
4242
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dbbrain v1.0.542
4343
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.199
44-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.527
44+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.572
4545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.539
4646
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414
47-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.549
47+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.567
4848
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287
4949
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.383
5050
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap v1.0.514

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,12 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.553/go.mod
536536
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.562/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
537537
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564 h1:nAs/LXDw+ut10MI0TmWO+lejvGyqXLIk5Wefzru7MWM=
538538
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.564/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
539+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.567 h1:0IRm7OM1jdBdd1jU3PFf3FOmXcGBwGjICr/pcILEZ3M=
540+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.567/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
539541
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.569 h1:ucwAQxGji/1kHSsnFf/w/BJ35rU7lFaUAq+uUKzwufE=
540542
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.569/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
543+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572 h1:xbcb/bC/cSWpfLB3TW+GBUdIcY/x+T+VrBgsz/jxv5Q=
544+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.572/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
541545
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.571 h1:V4JQJTavl2X8aRBRBBh4vTOInuzrbqQzHlFitmu782U=
542546
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.571/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
543547
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445 h1:Bh7XD0ypNMHYyBOM8hhKsSu+y0VVKUnJVS+YKKhfpGg=
@@ -554,6 +558,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.199 h1:7ShREKvI
554558
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dc v1.0.199/go.mod h1:5WGSrlIZJOhwIqPjjafb6vzrPEZieSHPhPMjjGPXOSU=
555559
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.527 h1:YBswG1ojXMW6hnbPtB7H/E1jdXOqHGuGVTrNXpa2TBQ=
556560
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.527/go.mod h1:VEKM4CcrzOVtNd8AYJvvNw/z3Sew7mUeekhArWyCo6c=
561+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.572 h1:Yn1ZzciHvRg1V694c70VSZQ9tzbgZHrInvlpqE/M7wM=
562+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dcdb v1.0.572/go.mod h1:+kYEqwZE8OlDhFMsb6hu0PD9CXQJOOnju2xOAUHp/dk=
557563
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.539 h1:V+oo20w9aLxAoSSEGVplke2kq72MdUA4OuagCv4gsiY=
558564
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.539/go.mod h1:gtPd3Hy8DA/4EErHNJliWeJB1sxZ9DhqenWiYZ3PF6g=
559565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/domain v1.0.414 h1:egwjvOEUKBaxsoRVn/YSEhp2E8qdh77Ous9A/wftDo0=
@@ -562,6 +568,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.546 h1:GonOZJm
562568
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.546/go.mod h1:IS4LxoCyQ98nqI5Cqp8aJG3+yi9CcAUCG8Sv8FtIjjc=
563569
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.549 h1:ABAR2iLRo3J99J/FkC0GBccc0MG4v1vga0UVy6Jwym0=
564570
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.549/go.mod h1:DygU3Q8E2WT0fhJ81//0sWzMf2faiyFTd0B3wNYtRvc=
571+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.567 h1:N5aTesA129t5GuSlQyzwgrAx69nMg5lsyLChyJHzMUw=
572+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dts v1.0.567/go.mod h1:GkPxIo1C2WtyoX2eMSx8w1Q8DmYR9brs+es/fZc5nb4=
565573
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287 h1:+9COBXAbQmL7aJ39Q/mF50Ykxq4m5kq/y6vbO+u3zgI=
566574
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/emr v1.0.287/go.mod h1:xRvd0xsyCoviCiMRfJMh5lODPnLx+bnTfENNx6GHzFA=
567575
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/es v1.0.383 h1:OhKvreaRPhwBEButv45yBcu6BvfvR1JAEXbU/NTck94=

tencentcloud/common.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,3 +474,14 @@ func Base64ToString(config string) (string, error) {
474474
}
475475
return string(strConfig), nil
476476
}
477+
478+
func BuildStateChangeConf(pending, target []string, timeout, delay time.Duration, refresh resource.StateRefreshFunc) *resource.StateChangeConf {
479+
return &resource.StateChangeConf{
480+
Pending: pending,
481+
Target: target,
482+
Refresh: refresh,
483+
Timeout: timeout,
484+
Delay: delay,
485+
MinTimeout: 3 * time.Second,
486+
}
487+
}

tencentcloud/internal/helper/transform.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ func Int64Uint64(i int64) *uint64 {
3535
return &u
3636
}
3737

38+
func UInt64Int64(i uint64) *int64 {
39+
u := int64(i)
40+
return &u
41+
}
42+
3843
func Strings(strs []string) []*string {
3944
if len(strs) == 0 {
4045
return nil

tencentcloud/provider.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,7 @@ TDSQL for MySQL(DCDB)
755755
tencentcloud_dcdb_account
756756
tencentcloud_dcdb_hourdb_instance
757757
tencentcloud_dcdb_security_group_attachment
758+
tencentcloud_dcdb_account_privileges
758759
759760
Short Message Service(SMS)
760761
Resource
@@ -1523,6 +1524,8 @@ func Provider() terraform.ResourceProvider {
15231524
"tencentcloud_dcdb_account": resourceTencentCloudDcdbAccount(),
15241525
"tencentcloud_dcdb_hourdb_instance": resourceTencentCloudDcdbHourdbInstance(),
15251526
"tencentcloud_dcdb_security_group_attachment": resourceTencentCloudDcdbSecurityGroupAttachment(),
1527+
"tencentcloud_dcdb_db_instance": resourceTencentCloudDcdbDbInstance(),
1528+
"tencentcloud_dcdb_account_privileges": resourceTencentCloudDcdbAccountPrivileges(),
15261529
"tencentcloud_cat_task_set": resourceTencentCloudCatTaskSet(),
15271530
"tencentcloud_mariadb_dedicatedcluster_db_instance": resourceTencentCloudMariadbDedicatedclusterDbInstance(),
15281531
"tencentcloud_mariadb_hour_db_instance": resourceTencentCloudMariadbHourDbInstance(),

0 commit comments

Comments
 (0)