Skip to content

Commit 43257b5

Browse files
lyu571lyu571
committed
resolve conflict
2 parents 287d30d + 47277bb commit 43257b5

File tree

70 files changed

+4398
-773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+4398
-773
lines changed

‎.changelog/1864.txt‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
```release-note:new-resource
2+
tencentcloud_mariadb_account_privileges
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_mariadb_backup_time
7+
```
8+
9+
```release-note:new-resource
10+
tencentcloud_mariadb_cancel_dcn_job
11+
```
12+
13+
```release-note:new-resource
14+
tencentcloud_mariadb_flush_binlog
15+
```
16+
17+
```release-note:new-resource
18+
tencentcloud_mariadb_restart_instance
19+
```
20+
21+
```release-note:new-resource
22+
tencentcloud_mariadb_renew_instance
23+
```
24+
25+
```release-note:new-resource
26+
tencentcloud_sqlserver_start_backup_full_migration
27+
```
28+
29+
```release-note:new-resource
30+
tencentcloud_sqlserver_start_backup_incremental_migration
31+
```
32+
33+
```release-note:enhancement
34+
resource/tencentcloud_mariadb_account: support to update `password`
35+
```
36+
37+
```release-note:enhancement
38+
resource/tencentcloud_mariadb_hour_db_instance: support to update `project_id`, `vip`
39+
```
40+
41+
```release-note:enhancement
42+
resource/tencentcloud_mariadb_instance: support to update `project_id`, `vip`
43+
```
44+
45+
```release-note:enhancement
46+
resource/tencentcloud_mariadb_dedicatedcluster_db_instance: support to update `project_id`, `vip`
47+
```
48+
49+
```release-note:new-resource
50+
tencentcloud_mariadb_instance_config
51+
```

‎.changelog/1874.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_mysql_account: support the `max_user_connections` field.
3+
```

‎.changelog/1876.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_ckafka_instance: deprecated the `public_network` field.
3+
```

‎examples/tencentcloud-address-template/main.tf‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎examples/tencentcloud-address-template/version.tf‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.199
5656
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/lighthouse v1.0.656
5757
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/live v1.0.535
58-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.644
58+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mariadb v1.0.672
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb v1.0.651
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor v1.0.616
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mps v1.0.584

‎go.sum‎

Lines changed: 2 additions & 458 deletions
Large diffs are not rendered by default.

‎tencentcloud/extension_mariadb.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package tencentcloud
2+
3+
const (
4+
MARIADB_TASK_SUCCESS = 0
5+
MARIADB_TASK_FAIL = 1
6+
MARIADB_TASK_RUNNING = 2
7+
)
8+
9+
const (
10+
MODIFY_BACKUPTIME_SUCCESS = 0
11+
)
12+
13+
const (
14+
MARIADB_STATUS_ISOLATE = -1
15+
MARIADB_STATUS_FLOW = 1
16+
MARIADB_STATUS_RUNNING = 2
17+
)
18+
19+
const (
20+
RSACCESSSTRATEGY_ENABLE = 1
21+
)
22+
23+
const (
24+
ExtranetAccess_ENABLE = 1
25+
)
26+
27+
const (
28+
NONE_FLOW_TASK = 0
29+
)

‎tencentcloud/provider.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,8 @@ SQLServer
772772
tencentcloud_sqlserver_config_terminate_db_instance
773773
tencentcloud_sqlserver_restore_instance
774774
tencentcloud_sqlserver_rollback_instance
775+
tencentcloud_sqlserver_start_backup_full_migration
776+
tencentcloud_sqlserver_start_backup_incremental_migration
775777
776778
SSL Certificates
777779
Data Source
@@ -1151,6 +1153,15 @@ TencentDB for MariaDB(MariaDB)
11511153
tencentcloud_mariadb_parameters
11521154
tencentcloud_mariadb_log_file_retention_period
11531155
tencentcloud_mariadb_security_groups
1156+
tencentcloud_mariadb_account_privileges
1157+
tencentcloud_mariadb_operate_hour_db_instance
1158+
tencentcloud_mariadb_backup_time
1159+
tencentcloud_mariadb_cancel_dcn_job
1160+
tencentcloud_mariadb_flush_binlog
1161+
tencentcloud_mariadb_switch_ha
1162+
tencentcloud_mariadb_restart_instance
1163+
tencentcloud_mariadb_renew_instance
1164+
tencentcloud_mariadb_instance_config
11541165
11551166
Real User Monitoring(RUM)
11561167
Data Source
@@ -2308,6 +2319,8 @@ func Provider() *schema.Provider {
23082319
"tencentcloud_sqlserver_config_terminate_db_instance": resourceTencentCloudSqlserverConfigTerminateDBInstance(),
23092320
"tencentcloud_sqlserver_restore_instance": resourceTencentCloudSqlserverRestoreInstance(),
23102321
"tencentcloud_sqlserver_rollback_instance": resourceTencentCloudSqlserverRollbackInstance(),
2322+
"tencentcloud_sqlserver_start_backup_full_migration": resourceTencentCloudSqlserverStartBackupFullMigration(),
2323+
"tencentcloud_sqlserver_start_backup_incremental_migration": resourceTencentCloudSqlserverStartBackupIncrementalMigration(),
23112324
"tencentcloud_ckafka_instance": resourceTencentCloudCkafkaInstance(),
23122325
"tencentcloud_ckafka_user": resourceTencentCloudCkafkaUser(),
23132326
"tencentcloud_ckafka_acl": resourceTencentCloudCkafkaAcl(),
@@ -2447,6 +2460,15 @@ func Provider() *schema.Provider {
24472460
"tencentcloud_mariadb_log_file_retention_period": resourceTencentCloudMariadbLogFileRetentionPeriod(),
24482461
"tencentcloud_mariadb_security_groups": resourceTencentCloudMariadbSecurityGroups(),
24492462
"tencentcloud_mariadb_encrypt_attributes": resourceTencentCloudMariadbEncryptAttributes(),
2463+
"tencentcloud_mariadb_account_privileges": resourceTencentCloudMariadbAccountPrivileges(),
2464+
"tencentcloud_mariadb_operate_hour_db_instance": resourceTencentCloudMariadbOperateHourDbInstance(),
2465+
"tencentcloud_mariadb_backup_time": resourceTencentCloudMariadbBackupTime(),
2466+
"tencentcloud_mariadb_cancel_dcn_job": resourceTencentCloudMariadbCancelDcnJob(),
2467+
"tencentcloud_mariadb_flush_binlog": resourceTencentCloudMariadbFlushBinlog(),
2468+
"tencentcloud_mariadb_switch_ha": resourceTencentCloudMariadbSwitchHA(),
2469+
"tencentcloud_mariadb_restart_instance": resourceTencentCloudMariadbRestartInstance(),
2470+
"tencentcloud_mariadb_renew_instance": resourceTencentCloudMariadbRenewInstance(),
2471+
"tencentcloud_mariadb_instance_config": resourceTencentCloudMariadbInstanceConfig(),
24502472
"tencentcloud_tdcpg_cluster": resourceTencentCloudTdcpgCluster(),
24512473
"tencentcloud_tdcpg_instance": resourceTencentCloudTdcpgInstance(),
24522474
"tencentcloud_css_watermark": resourceTencentCloudCssWatermark(),

‎tencentcloud/resource_tc_ckafka_instance.go‎

Lines changed: 79 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,85 @@ Use this resource to create ckafka instance.
55
66
Example Usage
77
8+
Basic Instance
89
```hcl
9-
resource "tencentcloud_ckafka_instance" "foo" {
10-
band_width = 40
11-
disk_size = 500
12-
disk_type = "CLOUD_BASIC"
13-
period = 1
14-
instance_name = "ckafka-instance-tf-test"
15-
specifications_type = "profession"
16-
kafka_version = "1.1.1"
17-
msg_retention_time = 1300
18-
multi_zone_flag = true
19-
partition = 800
20-
public_network = 3
21-
renew_flag = 0
22-
subnet_id = "subnet-4vwihrzk"
23-
vpc_id = "vpc-82p1t1nv"
24-
zone_id = 100006
25-
zone_ids = [
26-
100006,
27-
100007,
10+
variable "vpc_id" {
11+
default = "vpc-68vi2d3h"
12+
}
13+
14+
variable "subnet_id" {
15+
default = "subnet-ob6clqwk"
16+
}
17+
18+
data "tencentcloud_availability_zones_by_product" "gz" {
19+
name = "ap-guangzhou-3"
20+
product = "ckafka"
21+
}
22+
23+
resource "tencentcloud_ckafka_instance" "kafka_instance" {
24+
instance_name = "ckafka-instance-type-tf-test"
25+
zone_id = data.tencentcloud_availability_zones_by_product.gz.zones.0.id
26+
period = 1
27+
vpc_id = var.vpc_id
28+
subnet_id = var.subnet_id
29+
msg_retention_time = 1300
30+
renew_flag = 0
31+
kafka_version = "2.4.1"
32+
disk_size = 1000
33+
disk_type = "CLOUD_BASIC"
34+
35+
specifications_type = "standard"
36+
instance_type = 2
37+
38+
config {
39+
auto_create_topic_enable = true
40+
default_num_partitions = 3
41+
default_replication_factor = 3
42+
}
43+
44+
dynamic_retention_config {
45+
enable = 1
46+
}
47+
}
48+
```
49+
50+
Multi zone Instance
51+
```hcl
52+
variable "vpc_id" {
53+
default = "vpc-68vi2d3h"
54+
}
55+
56+
variable "subnet_id" {
57+
default = "subnet-ob6clqwk"
58+
}
59+
60+
data "tencentcloud_availability_zones_by_product" "gz3" {
61+
name = "ap-guangzhou-3"
62+
product = "ckafka"
63+
}
64+
65+
data "tencentcloud_availability_zones_by_product" "gz6" {
66+
name = "ap-guangzhou-6"
67+
product = "ckafka"
68+
}
69+
70+
resource "tencentcloud_ckafka_instance" "kafka_instance" {
71+
instance_name = "ckafka-instance-maz-tf-test"
72+
zone_id = data.tencentcloud_availability_zones_by_product.gz3.zones.0.id
73+
multi_zone_flag = true
74+
zone_ids = [
75+
data.tencentcloud_availability_zones_by_product.gz3.zones.0.id,
76+
data.tencentcloud_availability_zones_by_product.gz6.zones.0.id
2877
]
78+
period = 1
79+
vpc_id = var.vpc_id
80+
subnet_id = var.subnet_id
81+
msg_retention_time = 1300
82+
renew_flag = 0
83+
kafka_version = "1.1.1"
84+
disk_size = 500
85+
disk_type = "CLOUD_BASIC"
86+
2987
3088
config {
3189
auto_create_topic_enable = true
@@ -34,10 +92,7 @@ resource "tencentcloud_ckafka_instance" "foo" {
3492
}
3593
3694
dynamic_retention_config {
37-
bottom_retention = 0
38-
disk_quota_percentage = 0
39-
enable = 1
40-
step_forward_percentage = 0
95+
enable = 1
4196
}
4297
}
4398
```
@@ -287,6 +342,7 @@ func resourceTencentCloudCkafkaInstance() *schema.Resource {
287342
Type: schema.TypeInt,
288343
Optional: true,
289344
Computed: true,
345+
Deprecated: "It has been deprecated from version 1.81.6. If set public network value, it will cause error.",
290346
Description: "Bandwidth of the public network.",
291347
},
292348
//"dynamic_disk_config": {

0 commit comments

Comments
 (0)