Skip to content

Commit e0efb06

Browse files
author
ttomzhou
committed
change listener and rule id to listener_id and rule_id
1 parent d46072c commit e0efb06

10 files changed

+114
-56
lines changed

‎examples/tencentcloud-clb/main.tf‎

Lines changed: 76 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1+
provider "tencentcloud" {
2+
region = "ap-guangzhou"
3+
}
4+
15
resource "tencentcloud_security_group" "foo" {
26
name = "example"
37
}
48

59
resource "tencentcloud_vpc" "foo" {
6-
name = "example"
10+
name = "ci-test-eni-vpc"
711
cidr_block = "10.0.0.0/16"
812
}
913

1014
resource "tencentcloud_subnet" "foo" {
11-
name = "example"
1215
availability_zone = var.availability_zone
16+
name = "ci-test-eni-subnet"
1317
vpc_id = tencentcloud_vpc.foo.id
14-
cidr_block = "10.0.0.0/24"
18+
cidr_block = "10.0.0.0/16"
1519
is_multicast = false
1620
}
1721

@@ -72,7 +76,7 @@ resource "tencentcloud_clb_listener" "listener_https" {
7276
port = 443
7377
protocol = "HTTPS"
7478
certificate_ssl_mode = "UNIDIRECTIONAL"
75-
certificate_id = "VfqO4zkB"
79+
certificate_id = "f8k7ke6a"
7680
}
7781

7882
resource "tencentcloud_clb_listener_rule" "rule_https" {
@@ -132,8 +136,8 @@ resource "tencentcloud_clb_redirection" "redirection_http" {
132136
clb_id = tencentcloud_clb_instance.example.id
133137
source_listener_id = tencentcloud_clb_listener.listener_http_src.listener_id
134138
target_listener_id = tencentcloud_clb_listener.listener_http_dst.listener_id
135-
source_rule_id = tencentcloud_clb_listener_rule.rule_http_src.listener_id
136-
target_rule_id = tencentcloud_clb_listener_rule.rule_http_dst.listener_id
139+
source_rule_id = tencentcloud_clb_listener_rule.rule_http_src.rule_id
140+
target_rule_id = tencentcloud_clb_listener_rule.rule_http_dst.rule_id
137141
}
138142

139143
resource "tencentcloud_clb_instance" "clb_basic" {
@@ -162,18 +166,74 @@ resource "tencentcloud_clb_target_group" "test"{
162166
target_group_name = "test-target-keep-1"
163167
}
164168

165-
resource "tencentcloud_clb_target_group_instance_attachment" "test"{
166-
target_group_id = tencentcloud_clb_target_group.test.id
167-
bind_ip = "172.16.48.18"
168-
port = 222
169-
weight = 3
169+
data "tencentcloud_images" "my_favorite_image" {
170+
image_type = ["PUBLIC_IMAGE"]
171+
os_name = "centos"
170172
}
171173

172-
resource "tencentcloud_clb_target_group_attachment" "group" {
173-
clb_id = tencentcloud_clb_instance.clb_basic.id
174-
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
175-
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
176-
targrt_group_id = tencentcloud_clb_target_group.test.id
174+
data "tencentcloud_instance_types" "my_favorite_instance_types" {
175+
filter {
176+
name = "instance-family"
177+
values = ["S3"]
178+
}
179+
180+
cpu_core_count = 1
181+
memory_size = 1
182+
}
183+
184+
data "tencentcloud_availability_zones" "default" {
185+
}
186+
187+
resource "tencentcloud_vpc" "app" {
188+
cidr_block = "10.0.0.0/16"
189+
name = "awesome_app_vpc"
190+
}
191+
192+
resource "tencentcloud_subnet" "app" {
193+
vpc_id = tencentcloud_vpc.app.id
194+
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
195+
name = "awesome_app_subnet"
196+
cidr_block = "10.0.1.0/24"
197+
}
198+
199+
resource "tencentcloud_instance" "my_awesome_app" {
200+
instance_name = "awesome_app"
201+
availability_zone = data.tencentcloud_availability_zones.default.zones.0.name
202+
image_id = data.tencentcloud_images.my_favorite_image.images.0.image_id
203+
instance_type = data.tencentcloud_instance_types.my_favorite_instance_types.instance_types.0.instance_type
204+
system_disk_type = "CLOUD_PREMIUM"
205+
system_disk_size = 50
206+
hostname = "user"
207+
project_id = 0
208+
vpc_id = tencentcloud_vpc.app.id
209+
subnet_id = tencentcloud_subnet.app.id
210+
internet_max_bandwidth_out = 20
211+
212+
data_disks {
213+
data_disk_type = "CLOUD_PREMIUM"
214+
data_disk_size = 50
215+
encrypt = false
216+
}
217+
218+
tags = {
219+
tagKey = "tagValue"
220+
}
221+
}
222+
223+
data "tencentcloud_instances" "foo" {
224+
instance_id = tencentcloud_instance.my_awesome_app.id
225+
}
226+
227+
resource "tencentcloud_clb_target_group" "test_instance_attachment"{
228+
target_group_name = "test"
229+
vpc_id = tencentcloud_vpc.app.id
230+
}
231+
232+
resource "tencentcloud_clb_target_group_instance_attachment" "test"{
233+
target_group_id = tencentcloud_clb_target_group.test_instance_attachment.id
234+
bind_ip = data.tencentcloud_instances.foo.instance_list[0].private_ip
235+
port = 88
236+
weight = 3
177237
}
178238

179239
data "tencentcloud_clb_target_groups" "target_group_info_id" {

‎tencentcloud/data_source_tc_clb_attachments_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ resource "tencentcloud_clb_listener" "foo" {
5151
5252
resource "tencentcloud_clb_attachment" "foo" {
5353
clb_id = tencentcloud_clb_instance.foo.id
54-
listener_id = tencentcloud_clb_listener.foo.id
54+
listener_id = tencentcloud_clb_listener.foo.listener_id
5555
5656
targets {
5757
instance_id = tencentcloud_instance.default.id

‎tencentcloud/data_source_tc_clb_listeners.go‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ func dataSourceTencentCloudClbListenersRead(d *schema.ResourceData, meta interfa
245245
for _, listener := range listeners {
246246
mapping := map[string]interface{}{
247247
"clb_id": clbId,
248-
"listener_id": *listener.ListenerId,
249-
"listener_name": *listener.ListenerName,
250-
"protocol": *listener.Protocol,
251-
"port": *listener.Port,
248+
"listener_id": listener.ListenerId,
249+
"listener_name": listener.ListenerName,
250+
"protocol": listener.Protocol,
251+
"port": listener.Port,
252252
}
253253
if listener.SessionExpireTime != nil {
254-
mapping["session_expire_time"] = *listener.SessionExpireTime
254+
mapping["session_expire_time"] = listener.SessionExpireTime
255255
}
256256
if listener.SniSwitch != nil {
257257
sniSwitch := false
@@ -260,19 +260,17 @@ func dataSourceTencentCloudClbListenersRead(d *schema.ResourceData, meta interfa
260260
}
261261
mapping["sni_switch"] = sniSwitch
262262
}
263-
if listener.Scheduler != nil {
264-
mapping["scheduler"] = *listener.Scheduler
265-
}
263+
mapping["scheduler"] = listener.Scheduler
266264
if listener.HealthCheck != nil {
267265
health_check_switch := false
268266
if *listener.HealthCheck.HealthSwitch == int64(1) {
269267
health_check_switch = true
270268
}
271269
mapping["health_check_switch"] = health_check_switch
272-
mapping["health_check_time_out"] = *listener.HealthCheck.TimeOut
273-
mapping["health_check_interval_time"] = *listener.HealthCheck.IntervalTime
274-
mapping["health_check_health_num"] = *listener.HealthCheck.HealthNum
275-
mapping["health_check_unhealth_num"] = *listener.HealthCheck.UnHealthNum
270+
mapping["health_check_time_out"] = listener.HealthCheck.TimeOut
271+
mapping["health_check_interval_time"] = listener.HealthCheck.IntervalTime
272+
mapping["health_check_health_num"] = listener.HealthCheck.HealthNum
273+
mapping["health_check_unhealth_num"] = listener.HealthCheck.UnHealthNum
276274
mapping["health_check_http_code"] = listener.HealthCheck.HttpCode
277275
mapping["health_check_http_path"] = listener.HealthCheck.HttpCheckPath
278276
mapping["health_check_http_domain"] = listener.HealthCheck.HttpCheckDomain
@@ -285,10 +283,10 @@ func dataSourceTencentCloudClbListenersRead(d *schema.ResourceData, meta interfa
285283
mapping["health_check_port"] = listener.HealthCheck.CheckPort
286284
}
287285
if listener.Certificate != nil {
288-
mapping["certificate_ssl_mode"] = *listener.Certificate.SSLMode
289-
mapping["certificate_id"] = *listener.Certificate.CertId
286+
mapping["certificate_ssl_mode"] = listener.Certificate.SSLMode
287+
mapping["certificate_id"] = listener.Certificate.CertId
290288
if listener.Certificate.CertCaId != nil {
291-
mapping["certificate_ca_id"] = *listener.Certificate.CertCaId
289+
mapping["certificate_ca_id"] = listener.Certificate.CertCaId
292290
}
293291
}
294292
listenerList = append(listenerList, mapping)

‎tencentcloud/data_source_tc_clb_redirections_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
4545
4646
resource "tencentcloud_clb_listener_rule" "rule_basic" {
4747
clb_id = tencentcloud_clb_instance.clb.id
48-
listener_id = tencentcloud_clb_listener.listener_basic.id
48+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
4949
domain = "abc.com"
5050
url = "/"
5151
session_expire_time = 30
@@ -61,7 +61,7 @@ resource "tencentcloud_clb_listener" "listener_target" {
6161
6262
resource "tencentcloud_clb_listener_rule" "rule_target" {
6363
clb_id = tencentcloud_clb_instance.clb.id
64-
listener_id = tencentcloud_clb_listener.listener_target.id
64+
listener_id = tencentcloud_clb_listener.listener_target.listener_id
6565
domain = "abcd.com"
6666
url = "/"
6767
session_expire_time = 30
@@ -70,10 +70,10 @@ resource "tencentcloud_clb_listener_rule" "rule_target" {
7070
7171
resource "tencentcloud_clb_redirection" "redirection_basic" {
7272
clb_id = tencentcloud_clb_instance.clb.id
73-
source_listener_id = tencentcloud_clb_listener.listener_basic.id
74-
target_listener_id = tencentcloud_clb_listener.listener_target.id
75-
source_rule_id = tencentcloud_clb_listener_rule.rule_basic.id
76-
target_rule_id = tencentcloud_clb_listener_rule.rule_target.id
73+
source_listener_id = tencentcloud_clb_listener.listener_basic.listener_id
74+
target_listener_id = tencentcloud_clb_listener.listener_target.listener_id
75+
source_rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
76+
target_rule_id = tencentcloud_clb_listener_rule.rule_target.rule_id
7777
}
7878
7979
data "tencentcloud_clb_redirections" "redirections" {

‎tencentcloud/data_source_tc_clb_target_groups.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
1818
1919
resource "tencentcloud_clb_listener_rule" "rule_basic" {
2020
clb_id = tencentcloud_clb_instance.clb_basic.id
21-
listener_id = tencentcloud_clb_listener.listener_basic.id
21+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
2222
domain = "abc.com"
2323
url = "/"
2424
session_expire_time = 30
@@ -32,8 +32,8 @@ resource "tencentcloud_clb_target_group" "test"{
3232
3333
resource "tencentcloud_clb_target_group_attachment" "group" {
3434
clb_id = tencentcloud_clb_instance.clb_basic.id
35-
listener_id = tencentcloud_clb_listener.listener_basic.id
36-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
35+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
36+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
3737
targrt_group_id = tencentcloud_clb_target_group.test.id
3838
}
3939

‎tencentcloud/data_source_tc_clb_target_groups_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
6767
6868
resource "tencentcloud_clb_listener_rule" "rule_basic" {
6969
clb_id = tencentcloud_clb_instance.clb_basic.id
70-
listener_id = tencentcloud_clb_listener.listener_basic.id
70+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
7171
domain = "abc.com"
7272
url = "/"
7373
session_expire_time = 30
@@ -81,8 +81,8 @@ resource "tencentcloud_clb_target_group" "test"{
8181
8282
resource "tencentcloud_clb_target_group_attachment" "group" {
8383
clb_id = tencentcloud_clb_instance.clb_basic.id
84-
listener_id = tencentcloud_clb_listener.listener_basic.id
85-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
84+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
85+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
8686
targrt_group_id = tencentcloud_clb_target_group.test.id
8787
}
8888
`

‎tencentcloud/resource_tc_clb_target_group_attachment.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
1818
1919
resource "tencentcloud_clb_listener_rule" "rule_basic" {
2020
clb_id = tencentcloud_clb_instance.clb_basic.id
21-
listener_id = tencentcloud_clb_listener.listener_basic.id
21+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
2222
domain = "abc.com"
2323
url = "/"
2424
session_expire_time = 30
@@ -32,8 +32,8 @@ resource "tencentcloud_clb_target_group" "test"{
3232
3333
resource "tencentcloud_clb_target_group_attachment" "group" {
3434
clb_id = tencentcloud_clb_instance.clb_basic.id
35-
listener_id = tencentcloud_clb_listener.listener_basic.id
36-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
35+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
36+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
3737
targrt_group_id = tencentcloud_clb_target_group.test.id
3838
}
3939
```

‎tencentcloud/resource_tc_clb_target_group_attachment_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
132132
133133
resource "tencentcloud_clb_listener_rule" "rule_basic" {
134134
clb_id = tencentcloud_clb_instance.clb_basic.id
135-
listener_id = tencentcloud_clb_listener.listener_basic.id
135+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
136136
domain = "abc.com"
137137
url = "/"
138138
session_expire_time = 30
@@ -146,7 +146,7 @@ resource "tencentcloud_clb_target_group" "test"{
146146
147147
resource "tencentcloud_clb_target_group_attachment" "group" {
148148
clb_id = tencentcloud_clb_instance.clb_basic.id
149-
listener_id = tencentcloud_clb_listener.listener_basic.id
150-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
149+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
150+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
151151
targrt_group_id = tencentcloud_clb_target_group.test.id
152152
}`

‎website/docs/d/clb_target_groups.html.markdown‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
2828
2929
resource "tencentcloud_clb_listener_rule" "rule_basic" {
3030
clb_id = tencentcloud_clb_instance.clb_basic.id
31-
listener_id = tencentcloud_clb_listener.listener_basic.id
31+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
3232
domain = "abc.com"
3333
url = "/"
3434
session_expire_time = 30
@@ -42,8 +42,8 @@ resource "tencentcloud_clb_target_group" "test" {
4242
4343
resource "tencentcloud_clb_target_group_attachment" "group" {
4444
clb_id = tencentcloud_clb_instance.clb_basic.id
45-
listener_id = tencentcloud_clb_listener.listener_basic.id
46-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
45+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
46+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
4747
targrt_group_id = tencentcloud_clb_target_group.test.id
4848
}
4949

‎website/docs/r/clb_target_group_attachment.html.markdown‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resource "tencentcloud_clb_listener" "listener_basic" {
2828
2929
resource "tencentcloud_clb_listener_rule" "rule_basic" {
3030
clb_id = tencentcloud_clb_instance.clb_basic.id
31-
listener_id = tencentcloud_clb_listener.listener_basic.id
31+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
3232
domain = "abc.com"
3333
url = "/"
3434
session_expire_time = 30
@@ -42,8 +42,8 @@ resource "tencentcloud_clb_target_group" "test" {
4242
4343
resource "tencentcloud_clb_target_group_attachment" "group" {
4444
clb_id = tencentcloud_clb_instance.clb_basic.id
45-
listener_id = tencentcloud_clb_listener.listener_basic.id
46-
rule_id = tencentcloud_clb_listener_rule.rule_basic.id
45+
listener_id = tencentcloud_clb_listener.listener_basic.listener_id
46+
rule_id = tencentcloud_clb_listener_rule.rule_basic.rule_id
4747
targrt_group_id = tencentcloud_clb_target_group.test.id
4848
}
4949
```

0 commit comments

Comments
 (0)