Skip to content

Commit 93dbba7

Browse files
author
hhermanwang
committed
Merge remote-tracking branch 'upstream/master' into pub-sub
2 parents a6f9a7e + 8b9dff9 commit 93dbba7

23 files changed

+2411
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
1-
## 1.45.0 (Unreleased)
1+
## 1.45.3 (Unreleased)
2+
## 1.45.2 (October 19, 2020)
3+
4+
BUG FIXES:
5+
* Resource: `tencentcloud_mysql_instance` fix creating prepaid instance error.
6+
7+
## 1.45.1 (October 16, 2020)
8+
9+
ENHANCEMENTS:
10+
11+
* Resource: `tencentcloud_clb_target_group_instance_attachment` update doc.
12+
* Resource: `tencentcloud_clb_target_group_attachment` update doc.
13+
14+
## 1.45.0 (October 15, 2020)
215

316
FEATURES:
417

18+
* **New Resource**: `tencentcloud_clb_target_group_attachment`
19+
* **New Resource**: `tencentcloud_clb_target_group`
20+
* **New Resource**: `tencentcloud_clb_target_group_instance_attachment`
521
* **New Resource**: `tencentcloud_sqlserver_publish_subscribe`
6-
* **New Resource**: `tencentcloud_vod_adaptive_dynamic_streaming_template`.
7-
* **New Resource**: `tencentcloud_vod_procedure_template`.
8-
* **New Resource**: `tencentcloud_vod_snapshot_by_time_offset_template`.
9-
* **New Resource**: `tencentcloud_vod_image_sprite_template`.
10-
* **New Resource**: `tencentcloud_vod_super_player_config`.
22+
* **New Resource**: `tencentcloud_vod_adaptive_dynamic_streaming_template`
23+
* **New Resource**: `tencentcloud_vod_procedure_template`
24+
* **New Resource**: `tencentcloud_vod_snapshot_by_time_offset_template`
25+
* **New Resource**: `tencentcloud_vod_image_sprite_template`
26+
* **New Resource**: `tencentcloud_vod_super_player_config`
27+
* **New Data Source**: `tencentcloud_clb_target_groups`
1128
* **New Data Source**: `tencentcloud_sqlserver_publish_subscribes`
12-
* **New Data Source**: `tencentcloud_vod_adaptive_dynamic_streaming_templates`.
13-
* **New Data Source**: `tencentcloud_vod_image_sprite_templates`.
14-
* **New Data Source**: `tencentcloud_vod_procedure_templates`.
15-
* **New Data Source**: `tencentcloud_vod_snapshot_by_time_offset_templates`.
16-
* **New Data Source**: `tencentcloud_vod_super_player_configs`.
29+
* **New Data Source**: `tencentcloud_vod_adaptive_dynamic_streaming_templates`
30+
* **New Data Source**: `tencentcloud_vod_image_sprite_templates`
31+
* **New Data Source**: `tencentcloud_vod_procedure_templates`
32+
* **New Data Source**: `tencentcloud_vod_snapshot_by_time_offset_templates`
33+
* **New Data Source**: `tencentcloud_vod_super_player_configs`
1734

1835
ENHANCEMENTS:
1936

37+
* Resource: `tencentcloud_clb_listener_rule` add new argument `target_type` to support backend target type with rule.
2038
* Resource: `tencentcloud_mysql_instance` modify argument `engine_version` to support mysql 8.0.
21-
* Resource: `tencentcloud_clb_listener_rule` add new argument `forward_type` to support backend protocol([#522](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/522))
39+
* Resource: `tencentcloud_clb_listener_rule` add new argument `forward_type` to support backend protocol([#522](https://github.com/tencentcloudstack/terraform-provider-tencentcloud/issues/522)).
2240
* Resource: `tencentcloud_instance` add new argument `keep_image_login` to support keeping image login.
2341
* Resource: `tencentcloud_kubernetes_cluster` add new argument `extra_args` to support Kubelet.
2442
* Resource: `tencentcloud_kubernetes_scale_worker` add new argument `extra_args` to support Kubelet.

‎examples/tencentcloud-clb/main.tf‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,50 @@ resource "tencentcloud_clb_redirection" "redirection_http" {
131131
target_rule_id = tencentcloud_clb_listener_rule.rule_http_dst.id
132132
}
133133

134+
resource "tencentcloud_clb_instance" "clb_basic" {
135+
network_type = "OPEN"
136+
clb_name = "tf-clb-rule-basic"
137+
}
138+
139+
resource "tencentcloud_clb_listener" "listener_basic" {
140+
clb_id = tencentcloud_clb_instance.clb_basic.id
141+
port = 1
142+
protocol = "HTTP"
143+
listener_name = "listener_basic"
144+
}
145+
146+
resource "tencentcloud_clb_listener_rule" "rule_basic" {
147+
clb_id = tencentcloud_clb_instance.clb_basic.id
148+
listener_id = tencentcloud_clb_listener.listener_basic.id
149+
domain = "abc.com"
150+
url = "/"
151+
session_expire_time = 30
152+
scheduler = "WRR"
153+
target_type = "TARGETGROUP"
154+
}
155+
156+
resource "tencentcloud_clb_target_group" "test"{
157+
target_group_name = "test-target-keep-1"
158+
}
159+
160+
resource "tencentcloud_clb_target_group_instance_attachment" "test"{
161+
target_group_id = tencentcloud_clb_target_group.test.id
162+
bind_ip = "172.16.48.18"
163+
port = 222
164+
weight = 3
165+
}
166+
167+
resource "tencentcloud_clb_target_group_attachment" "group" {
168+
clb_id = tencentcloud_clb_instance.clb_basic.id
169+
listener_id = tencentcloud_clb_listener.listener_basic.id
170+
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
171+
targrt_group_id = tencentcloud_clb_target_group.test.id
172+
}
173+
174+
data "tencentcloud_clb_target_groups" "target_group_info_id" {
175+
target_group_id = tencentcloud_clb_target_group.test.id
176+
}
177+
134178
data "tencentcloud_clb_instances" "instances" {
135179
clb_id = tencentcloud_clb_instance.example.id
136180
}

‎go.sum‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,13 +665,16 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
665665
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
666666
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
667667
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
668+
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
668669
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
669670
gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
670671
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
672+
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
671673
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
672674
gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
673675
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
674676
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
677+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
675678
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
676679
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
677680
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 commit comments

Comments
 (0)