Skip to content

Commit 2b349c4

Browse files
committed
module/alicloud_alb_listener: deprecate attribute acl_config; support resource alicloud_alb_listener_acl_attachment
1 parent bcd469b commit 2b349c4

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

examples/complete/main.tf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
provider "alicloud" {
2+
region = "cn-shanghai"
3+
}
4+
15
data "alicloud_alb_zones" "default" {}
26

37
resource "alicloud_vpc" "default" {
@@ -8,14 +12,14 @@ resource "alicloud_vpc" "default" {
812
resource "alicloud_vswitch" "vswitch_1" {
913
vpc_id = alicloud_vpc.default.id
1014
cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 2)
11-
zone_id = data.alicloud_alb_zones.default.zones.0.id
15+
zone_id = data.alicloud_alb_zones.default.zones.3.id
1216
vswitch_name = var.vswitch_name_1
1317
}
1418

1519
resource "alicloud_vswitch" "vswitch_2" {
1620
vpc_id = alicloud_vpc.default.id
1721
cidr_block = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
18-
zone_id = data.alicloud_alb_zones.default.zones.1.id
22+
zone_id = data.alicloud_alb_zones.default.zones.4.id
1923
vswitch_name = var.vswitch_name_2
2024
}
2125

@@ -48,8 +52,8 @@ module "example" {
4852
load_balancer_name = "tf_alb_name"
4953
load_balancer_edition = "Basic"
5054
zone_mappings = [
51-
{ vswitch_id = alicloud_vswitch.vswitch_1.id, zone_id = data.alicloud_alb_zones.default.zones.0.id },
52-
{ vswitch_id = alicloud_vswitch.vswitch_2.id, zone_id = data.alicloud_alb_zones.default.zones.1.id }
55+
{ vswitch_id = alicloud_vswitch.vswitch_1.id, zone_id = alicloud_vswitch.vswitch_1.zone_id },
56+
{ vswitch_id = alicloud_vswitch.vswitch_2.id, zone_id = alicloud_vswitch.vswitch_2.zone_id }
5357
]
5458
access_log_config = [
5559
{ log_project = alicloud_log_project.default.project_name, log_store = alicloud_log_store.default.logstore_name }

main.tf

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,24 @@ resource "alicloud_alb_acl" "alb_acl" {
6767

6868
resource "alicloud_alb_listener" "alb_listener" {
6969
count = var.create ? 1 : 0
70-
load_balancer_id = alicloud_alb_load_balancer.alb.0.id
70+
load_balancer_id = alicloud_alb_load_balancer.alb[0].id
7171
listener_protocol = "HTTP"
7272
listener_port = var.listener_port
7373
listener_description = var.listener_description
7474
default_actions {
7575
type = "ForwardGroup"
7676
forward_group_config {
7777
server_group_tuples {
78-
server_group_id = alicloud_alb_server_group.alb_server_group.0.id
78+
server_group_id = alicloud_alb_server_group.alb_server_group[0].id
7979
}
8080
}
8181
}
82-
acl_config {
83-
acl_type = "White"
84-
acl_relations {
85-
acl_id = alicloud_alb_acl.alb_acl.0.id
86-
}
87-
}
88-
}
82+
83+
}
84+
85+
resource "alicloud_alb_listener_acl_attachment" "default" {
86+
count = var.create ? 1 : 0
87+
acl_id = alicloud_alb_acl.alb_acl[0].id
88+
listener_id = alicloud_alb_listener.alb_listener[0].id
89+
acl_type = "White"
90+
}

0 commit comments

Comments
 (0)