Skip to content

Commit 806c18e

Browse files
author
rudolfzhao
committed
Merge branch 'master' into GAAP_test_fix
2 parents 4ead765 + 9e46838 commit 806c18e

File tree

51 files changed

+14149
-6370
lines changed

Some content is hidden

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

51 files changed

+14149
-6370
lines changed

‎.changelog/2617.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_teo_origin_group: Incompatible changes
3+
```
4+
5+
```release-note:new-resource
6+
tencentcloud_teo_l4_proxy
7+
```

‎.changelog/2647.txt

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

‎.github/workflows/tfprovider-lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828

2929
- uses: actions/setup-go@v3
3030
with:
31-
go-version-file: .go-version
31+
go-version: 1.18.1
32+
cache: false
3233

3334
- name: install tfproviderlint
3435
run: cd .ci/tools && go install github.com/bflad/tfproviderlint/cmd/tfproviderlint

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 1.81.96 (May 22, 2024)
2+
3+
FEATURES:
4+
5+
* **New Resource:** `tencentcloud_teo_l4_proxy` ([#2617](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2617))
6+
7+
ENHANCEMENTS:
8+
9+
* resource/tencentcloud_teo_origin_group: Incompatible changes ([#2617](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2617))
10+
* tencentcloud_cam_role: `session_duration` increases computed familiarity ([#2641](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2641))
11+
* tencentcloud_mysql_dr_instance: modify doc ([#2647](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/pull/2647))
12+
113
## 1.81.95 (May 17, 2024)
214

315
ENHANCEMENTS:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ require (
9090
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdcpg v1.0.533
9191
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.825
9292
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578
93-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758
93+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912
9494
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916
9595
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/trocket v1.0.756
9696
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tse v1.0.857

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,10 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.873/go.mod
925925
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888 h1:FqVcZ+POUhckq6ZRlwOR819fsXp49YyizpmWZJYAAGg=
926926
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.888/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
927927
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
928+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910 h1:u+rAnHhLixQaNYy8vtnuClj4kYWs77VAHEbi9jl8k/4=
929+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.910/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912 h1:BDqRmR+2vLLHqKWYdgfUl0CDr9+augDBOEOEScLyQ80=
931+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.912/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
928932
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916 h1:30u2fFUGxaPB0VFpVtomiziXATxm/MjG53HCobM8KGI=
929933
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.916/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
930934
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.920 h1:Kmm4rJrdI7D29IMOTT2oNp70h0TGsZ3obaekS8hvYkU=
@@ -1027,6 +1031,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578 h1:vBpQhUr
10271031
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.578/go.mod h1:UlojGQh/9wb7/uXPNi7PvMral1CNAskVDNgqJEV83l0=
10281032
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758 h1:PRxMkSm3MX0vuWQSRO7pY0bwT8M2PEZW2BnKpZdjzK0=
10291033
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.758/go.mod h1:GKX+ZVvPOgussCe/4hAreiglWRa5w9PTDKoxedZ3Wc4=
1034+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912 h1:XGOKd5umgbXDDTSOuLmoLDfNdh712lCIgIzw5SQItrA=
1035+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.912/go.mod h1:iqTDU0pVTQ8RCeMJPk/PAWl9HeI1DFMd1h07yMH7RGU=
10301036
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807 h1:/ziV4FFD7xGFvS4TEFEMRvVtfhl2cQ4vkejOwDwWTqc=
10311037
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.807/go.mod h1:uRsVm3rUbE/YH4+G8o1Ppyl4ENtbLWliUxPk1yDr95k=
10321038
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.916 h1:/ERZ1hNzLfbtvOqjydV9291yC/try3gSJGsrnmT36Xs=

‎tencentcloud/connectivity/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
billing "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/billing/v20180709"
1212
csip "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/csip/v20221121"
13-
"github.com/tencentyun/cos-go-sdk-v5"
13+
cos "github.com/tencentyun/cos-go-sdk-v5"
1414

1515
dasb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dasb/v20191018"
1616

‎tencentcloud/provider.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,7 @@ func Provider() *schema.Provider {
15491549
"tencentcloud_teo_zone": teo.ResourceTencentCloudTeoZone(),
15501550
"tencentcloud_teo_zone_setting": teo.ResourceTencentCloudTeoZoneSetting(),
15511551
"tencentcloud_teo_origin_group": teo.ResourceTencentCloudTeoOriginGroup(),
1552+
"tencentcloud_teo_l4_proxy": teo.ResourceTencentCloudTeoL4Proxy(),
15521553
"tencentcloud_teo_rule_engine": teo.ResourceTencentCloudTeoRuleEngine(),
15531554
"tencentcloud_teo_ownership_verify": teo.ResourceTencentCloudTeoOwnershipVerify(),
15541555
"tencentcloud_teo_certificate_config": teo.ResourceTencentCloudTeoCertificateConfig(),

‎tencentcloud/provider.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,6 +1404,7 @@ TencentCloud EdgeOne(TEO)
14041404
tencentcloud_teo_ownership_verify
14051405
tencentcloud_teo_certificate_config
14061406
tencentcloud_teo_acceleration_domain
1407+
tencentcloud_teo_l4_proxy
14071408

14081409
TencentCloud ServiceMesh(TCM)
14091410
Data Source

‎tencentcloud/services/cdb/resource_tc_mysql_dr_instance.md

Lines changed: 25 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,38 @@
11
Provides a mysql instance resource to create read-only database instances.
22

3-
~> **NOTE:** Read-only instances can be purchased only for two-node or three-node source instances on MySQL 5.6 or above with the InnoDB engine at a specification of 1 GB memory and 50 GB disk capacity or above.
4-
~> **NOTE:** The terminate operation of read only mysql does NOT take effect immediately, maybe takes for several hours. so during that time, VPCs associated with that mysql instance can't be terminated also.
5-
63
Example Usage
74

85
```hcl
9-
data "tencentcloud_availability_zones_by_product" "zones" {
10-
product = "cdb"
11-
}
12-
13-
resource "tencentcloud_vpc" "vpc" {
14-
name = "vpc-mysql"
15-
cidr_block = "10.0.0.0/16"
16-
}
17-
18-
resource "tencentcloud_subnet" "subnet" {
19-
availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
20-
name = "subnet-mysql"
21-
vpc_id = tencentcloud_vpc.vpc.id
22-
cidr_block = "10.0.0.0/16"
23-
is_multicast = false
24-
}
25-
26-
resource "tencentcloud_security_group" "security_group" {
27-
name = "sg-mysql"
28-
description = "mysql test"
29-
}
30-
31-
resource "tencentcloud_mysql_instance" "example" {
32-
internet_service = 1
33-
engine_version = "5.7"
34-
charge_type = "POSTPAID"
35-
root_password = "PassWord123"
36-
slave_deploy_mode = 0
37-
availability_zone = data.tencentcloud_availability_zones_by_product.zones.zones.0.name
38-
slave_sync_mode = 1
39-
instance_name = "tf-example-mysql"
40-
mem_size = 4000
41-
volume_size = 200
42-
vpc_id = tencentcloud_vpc.vpc.id
43-
subnet_id = tencentcloud_subnet.subnet.id
44-
intranet_port = 3306
45-
security_groups = [tencentcloud_security_group.security_group.id]
46-
47-
tags = {
48-
name = "test"
49-
}
50-
51-
parameters = {
52-
character_set_server = "UTF8"
53-
max_connections = "1000"
54-
}
55-
}
56-
57-
resource "tencentcloud_mysql_readonly_instance" "example" {
58-
master_instance_id = tencentcloud_mysql_instance.example.id
59-
instance_name = "tf-example"
60-
mem_size = 128000
61-
volume_size = 255
62-
vpc_id = tencentcloud_vpc.vpc.id
63-
subnet_id = tencentcloud_subnet.subnet.id
64-
intranet_port = 3306
65-
security_groups = [tencentcloud_security_group.security_group.id]
66-
6+
resource "tencentcloud_mysql_dr_instance" "mysql_dr" {
7+
master_instance_id = "cdb-adjdu3t5"
8+
master_region = "ap-guangzhou"
9+
auto_renew_flag = 0
10+
availability_zone = "ap-shanghai-3"
11+
charge_type = "POSTPAID"
12+
cpu = 4
13+
device_type = "UNIVERSAL"
14+
first_slave_zone = "ap-shanghai-4"
15+
instance_name = "mysql-dr-test-up"
16+
mem_size = 8000
17+
prepaid_period = 1
18+
project_id = 0
19+
security_groups = [
20+
"sg-q4d821qk",
21+
]
22+
slave_deploy_mode = 1
23+
slave_sync_mode = 0
24+
subnet_id = "subnet-5vfntba5"
25+
volume_size = 100
26+
vpc_id = "vpc-h6s1s3aa"
27+
intranet_port = 3360
6728
tags = {
68-
createBy = "terraform"
29+
test = "test-tf"
6930
}
7031
}
7132
```
7233
Import
7334

74-
mysql read-only database instances can be imported using the id, e.g.
35+
mysql dr database instances can be imported using the id, e.g.
7536
```
76-
terraform import tencentcloud_mysql_readonly_instance.default cdb-dnqksd9f
37+
terraform import tencentcloud_mysql_dr_instance.mysql_dr cdb-bcet7sdb
7738
```

0 commit comments

Comments
 (0)