Skip to content

Commit e79a147

Browse files
authored
Merge branch 'master' into dev/organization-resource-policy
2 parents 2f09790 + 5c39960 commit e79a147

10 files changed

+1157
-4
lines changed

.changelog/2596.txt

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

.github/workflows/golangci-lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
golangci-lint:
2020
# The type of runner that the job will run on
2121
runs-on: macos-12
22-
2322
# Steps represent a sequence of tasks that will be executed as part of the job
2423
steps:
2524
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

tencentcloud/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,7 @@ func Provider() *schema.Provider {
11301130
"tencentcloud_mysql_instance": cdb.ResourceTencentCloudMysqlInstance(),
11311131
"tencentcloud_mysql_database": cdb.ResourceTencentCloudMysqlDatabase(),
11321132
"tencentcloud_mysql_readonly_instance": cdb.ResourceTencentCloudMysqlReadonlyInstance(),
1133+
"tencentcloud_mysql_dr_instance": cdb.ResourceTencentCloudMysqlDrInstance(),
11331134
"tencentcloud_mysql_time_window": cdb.ResourceTencentCloudMysqlTimeWindow(),
11341135
"tencentcloud_mysql_param_template": cdb.ResourceTencentCloudMysqlParamTemplate(),
11351136
"tencentcloud_mysql_security_groups_attachment": cdb.ResourceTencentCloudMysqlSecurityGroupsAttachment(),

tencentcloud/provider.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,7 @@ TencentDB for MySQL(cdb)
770770
tencentcloud_mysql_ro_start_replication
771771
tencentcloud_mysql_ro_stop_replication
772772
tencentcloud_mysql_isolate_instance
773+
tencentcloud_mysql_dr_instance
773774

774775
Cloud Monitor(Monitor)
775776
Data Source

0 commit comments

Comments
 (0)