Skip to content

Commit 598b1aa

Browse files
crab21crab21
authored
Merge branch 'master' into cdn_data_source
2 parents e00043a + 8e697ab commit 598b1aa

File tree

80 files changed

+12125
-233
lines changed

Some content is hidden

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

80 files changed

+12125
-233
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
## 1.37.0 (Unreleased)
1+
## 1.38.0 (Unreleased)
22

33
FEATURES:
44

55
* **New Data Source**: `tencentcloud_cdn_domains`
66

7+
## 1.37.0 (June 23, 2020)
8+
9+
FEATURES:
10+
* **New Resource**: `tencentcloud_postgresql_instance`
11+
* **New Data Source**: `tencentcloud_postgresql_instances`
12+
* **New Data Source**: `tencentcloud_postgresql_speccodes`
13+
* **New Data Source**: `tencentcloud_sqlserver_zone_config`
14+
15+
ENHANCEMENTS:
16+
17+
* Resource: `tencentcloud_mongodb_instance` support more machine type.
18+
719
## 1.36.1 (June 12, 2020)
820

921
ENHANCEMENTS:

‎examples/tencentcloud-postgresql/main.tf‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
resource "tencentcloud_vpc" "foo" {
2+
name = "example"
3+
cidr_block = "10.0.0.0/16"
4+
}
5+
6+
resource "tencentcloud_subnet" "foo" {
7+
name = "example"
8+
availability_zone = var.availability_zone
9+
vpc_id = tencentcloud_vpc.foo.id
10+
cidr_block = "10.0.0.0/24"
11+
is_multicast = false
12+
}
13+
14+
resource "tencentcloud_postgresql_instance" "example" {
15+
name = "tf_postsql_instance_111"
16+
availability_zone = var.availability_zone
17+
charge_type = "POSTPAID_BY_HOUR"
18+
vpc_id = tencentcloud_vpc.foo.id
19+
subnet_id = tencentcloud_subnet.foo.id
20+
engine_version = "9.3.5"
21+
root_password = "1qaA2k1wgvfa3ZZZ"
22+
charset = "UTF8"
23+
project_id = 0
24+
memory = 2
25+
storage = 10
26+
}
27+
28+
data "tencentcloud_postgresql_instances" "id_example" {
29+
id = tencentcloud_postgresql_instance.example.id
30+
}
31+
32+
data "tencentcloud_postgresql_instances" "project_example" {
33+
project_id = 0
34+
}
35+
36+
data "tencentcloud_postgresql_instances" "name_example" {
37+
name = tencentcloud_postgresql_instance.example.name
38+
}
39+
40+
data "tencentcloud_postgresql_specinfos" "example" {
41+
availability_zone = var.availability_zone
42+
}

‎examples/tencentcloud-postgresql/variables.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
variable "availability_zone" {
2+
default = "ap-guangzhou-2"
3+
}

‎examples/tencentcloud-postgresql/version.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
terraform {
2+
required_version = ">= 0.12"
3+
}

‎examples/tencentcloud-sqlserver/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
data "tencentcloud_sqlserver_zone_config" "mysqlserver" {
2+
}

‎examples/tencentcloud-sqlserver/variable.tf‎

Whitespace-only changes.

‎examples/tencentcloud-sqlserver/version.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
terraform {
2+
required_version = ">= 0.12"
3+
}

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ require (
1010
github.com/fatih/color v1.9.0
1111
github.com/golangci/golangci-lint v1.27.0
1212
github.com/hashicorp/hcl/v2 v2.6.0
13-
github.com/hashicorp/terraform-plugin-sdk v1.13.1
13+
github.com/hashicorp/terraform-plugin-sdk v1.14.0
1414
github.com/katbyte/terrafmt v0.2.0
1515
github.com/mattn/go-colorable v0.1.6 // indirect
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/pkg/errors v0.9.1
18-
github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible
18+
github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible
1919
github.com/yangwenmai/ratelimit v0.0.0-20180104140304-44221c2292e1
2020
github.com/zclconf/go-cty v1.4.2 // indirect
2121
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect

‎go.sum‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uP
220220
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
221221
github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE=
222222
github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
223+
github.com/hashicorp/go-plugin v1.2.0 h1:CUfYokW0EJNDcGecVrHZK//Cp1GFlHwoqtcUIEiU6BY=
224+
github.com/hashicorp/go-plugin v1.2.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
223225
github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
224226
github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
225227
github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
@@ -248,8 +250,8 @@ github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjH
248250
github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
249251
github.com/hashicorp/terraform-plugin-sdk v1.7.0 h1:B//oq0ZORG+EkVrIJy0uPGSonvmXqxSzXe8+GhknoW0=
250252
github.com/hashicorp/terraform-plugin-sdk v1.7.0/go.mod h1:OjgQmey5VxnPej/buEhe+YqKm0KNvV3QqU4hkqHqPCY=
251-
github.com/hashicorp/terraform-plugin-sdk v1.13.1 h1:kWq+V+4BMFKtzIuO8wb/k4SRGB/VVF8g468VSFmAnKM=
252-
github.com/hashicorp/terraform-plugin-sdk v1.13.1/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0=
253+
github.com/hashicorp/terraform-plugin-sdk v1.14.0 h1:sUKcw7OHqDXhBarlHjv+/yMCr8eEb1lO8CGQ3pEEFiE=
254+
github.com/hashicorp/terraform-plugin-sdk v1.14.0/go.mod h1:t62Xy+m7Zjq5tA2vrs8Wuo/TQ0sc9Mx9MjXL3+7MHBQ=
253255
github.com/hashicorp/terraform-plugin-test v1.2.0 h1:AWFdqyfnOj04sxTdaAF57QqvW7XXrT8PseUHkbKsE8I=
254256
github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs=
255257
github.com/hashicorp/terraform-plugin-test v1.3.0 h1:hU5LoxrOn9qvOo+LTKN6mSav2J+dAMprbdxJPEQvp4U=
@@ -264,6 +266,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
264266
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
265267
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
266268
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
269+
github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
270+
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
267271
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a h1:GmsqmapfzSJkm28dhRoHz2tLRbJmqhU86IPgBtN3mmk=
268272
github.com/jingyugao/rowserrcheck v0.0.0-20191204022205-72ab7603b68a/go.mod h1:xRskid8CManxVta/ALEhJha/pweKBaVG6fWgc0yH25s=
269273
github.com/jirfag/go-printf-func-name v0.0.0-20191110105641-45db9963cdd3 h1:jNYPNLe3d8smommaoQlK7LOA5ESyUJJ+Wf79ZtA7Vp4=
@@ -454,8 +458,8 @@ github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s
454458
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
455459
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ=
456460
github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
457-
github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible h1:9hr93p945INwxa67N68EUJuIkUE2iGnMq/YZ6x3JHik=
458-
github.com/tencentcloud/tencentcloud-sdk-go v3.0.187+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
461+
github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible h1:aKWXYPLQ9NARP0tBESEtTfRLes88LaI+4qm3TSRDCjk=
462+
github.com/tencentcloud/tencentcloud-sdk-go v3.0.196+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
459463
github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8=
460464
github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
461465
github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q=
@@ -529,6 +533,7 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
529533
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
530534
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
531535
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
536+
golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
532537
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
533538
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
534539
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -644,6 +649,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
644649
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
645650
google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
646651
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
652+
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
647653
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
648654
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
649655
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -654,6 +660,7 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2El
654660
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
655661
google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a h1:lRlI5zu6AFy3iU/F8YWyNrAmn/tPCnhiTxfwhWb76eU=
656662
google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
663+
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
657664
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
658665
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
659666
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=

‎tencentcloud/connectivity/client.go‎

Lines changed: 53 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ import (
2424
gaap "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/gaap/v20180529"
2525
mongodb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/mongodb/v20180408"
2626
monitor "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/monitor/v20180724"
27+
postgre "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/postgres/v20170312"
2728
redis "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/redis/v20180412"
2829
scf "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/scf/v20180416"
30+
sqlserver "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sqlserver/v20180328"
2931
sts "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sts/v20180813"
3032
tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
3133
tcaplusdb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb/v20190823"
@@ -41,29 +43,31 @@ type TencentCloudClient struct {
4143
Protocol string
4244
Domain string
4345

44-
cosConn *s3.S3
45-
mysqlConn *cdb.Client
46-
redisConn *redis.Client
47-
asConn *as.Client
48-
vpcConn *vpc.Client
49-
cbsConn *cbs.Client
50-
cvmConn *cvm.Client
51-
clbConn *clb.Client
52-
dayuConn *dayu.Client
53-
dcConn *dc.Client
54-
tagConn *tag.Client
55-
mongodbConn *mongodb.Client
56-
tkeConn *tke.Client
57-
camConn *cam.Client
58-
stsConn *sts.Client
59-
gaapConn *gaap.Client
60-
sslConn *ssl.Client
61-
cfsConn *cfs.Client
62-
scfConn *scf.Client
63-
tcaplusConn *tcaplusdb.Client
64-
cdnConn *cdn.Client
65-
monitorConn *monitor.Client
66-
esConn *es.Client
46+
cosConn *s3.S3
47+
mysqlConn *cdb.Client
48+
redisConn *redis.Client
49+
asConn *as.Client
50+
vpcConn *vpc.Client
51+
cbsConn *cbs.Client
52+
cvmConn *cvm.Client
53+
clbConn *clb.Client
54+
dayuConn *dayu.Client
55+
dcConn *dc.Client
56+
tagConn *tag.Client
57+
mongodbConn *mongodb.Client
58+
tkeConn *tke.Client
59+
camConn *cam.Client
60+
stsConn *sts.Client
61+
gaapConn *gaap.Client
62+
sslConn *ssl.Client
63+
cfsConn *cfs.Client
64+
scfConn *scf.Client
65+
tcaplusConn *tcaplusdb.Client
66+
cdnConn *cdn.Client
67+
monitorConn *monitor.Client
68+
esConn *es.Client
69+
sqlserverConn *sqlserver.Client
70+
postgreConn *postgre.Client
6771
}
6872

6973
// NewClientProfile returns a new ClientProfile
@@ -398,3 +402,29 @@ func (me *TencentCloudClient) UseEsClient() *es.Client {
398402

399403
return me.esConn
400404
}
405+
406+
// UsePostgreClient returns postgresql client for service
407+
func (me *TencentCloudClient) UsePostgresqlClient() *postgre.Client {
408+
if me.postgreConn != nil {
409+
return me.postgreConn
410+
}
411+
412+
cpf := me.NewClientProfile(300)
413+
me.postgreConn, _ = postgre.NewClient(me.Credential, me.Region, cpf)
414+
me.postgreConn.WithHttpTransport(&LogRoundTripper{})
415+
416+
return me.postgreConn
417+
}
418+
419+
// UseSqlserverClient returns sqlserver client for service
420+
func (me *TencentCloudClient) UseSqlserverClient() *sqlserver.Client {
421+
if me.sqlserverConn != nil {
422+
return me.sqlserverConn
423+
}
424+
425+
cpf := me.NewClientProfile(300)
426+
me.sqlserverConn, _ = sqlserver.NewClient(me.Credential, me.Region, cpf)
427+
me.sqlserverConn.WithHttpTransport(&LogRoundTripper{})
428+
429+
return me.sqlserverConn
430+
}

0 commit comments

Comments
 (0)