module/alicloud_alb_listener: deprecate attribute acl_config; support…

… resource alicloud_alb_listener_acl_attachment
alibabacloud-automation · Aug 2, 2024 · d04f0be · d04f0be
1 parent a4f7fe0
commit d04f0be
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -1,3 +1,7 @@
+provider "alicloud" {
+  region = "cn-shanghai"
+}
+
 resource "random_integer" "default" {
   max = 99999
   min = 10000
@@ -56,14 +60,14 @@ resource "alicloud_vpc" "default" {
 resource "alicloud_vswitch" "vswitch_1" {
   vpc_id       = alicloud_vpc.default.id
   cidr_block   = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 2)
-  zone_id      = data.alicloud_alb_zones.default.zones.0.id
+  zone_id      = data.alicloud_alb_zones.default.zones.3.id
   vswitch_name = var.vswitch_name_1
 }
 
 resource "alicloud_vswitch" "vswitch_2" {
   vpc_id       = alicloud_vpc.default.id
   cidr_block   = cidrsubnet(alicloud_vpc.default.cidr_block, 8, 4)
-  zone_id      = data.alicloud_alb_zones.default.zones.1.id
+  zone_id      = data.alicloud_alb_zones.default.zones.4.id
   vswitch_name = var.vswitch_name_2
 }
 
@@ -90,8 +94,8 @@ module "example" {
   load_balancer_name     = "tf_alb_name"
   load_balancer_edition  = "Basic"
   zone_mappings = [
-    { vswitch_id = alicloud_vswitch.vswitch_1.id, zone_id = data.alicloud_alb_zones.default.zones.0.id },
-    { vswitch_id = alicloud_vswitch.vswitch_2.id, zone_id = data.alicloud_alb_zones.default.zones.1.id }
+    { vswitch_id = alicloud_vswitch.vswitch_1.id, zone_id = alicloud_vswitch.vswitch_1.zone_id },
+    { vswitch_id = alicloud_vswitch.vswitch_2.id, zone_id = alicloud_vswitch.vswitch_2.zone_id }
   ]
   access_log_config = [
     { log_project = alicloud_log_project.default.name, log_store = alicloud_log_store.default.name }
@@ -101,4 +105,4 @@ module "example" {
   certificate_id       = join("", [alicloud_ssl_certificates_service_certificate.default.id, "-cn-hangzhou"])
   listener_port        = 443
   listener_description = "CreatedByTerraform"
-}
+}
diff --git a/main.tf b/main.tf
@@ -82,10 +82,11 @@ resource "alicloud_alb_listener" "alb_listener" {
   certificates {
     certificate_id = var.certificate_id
   }
-  acl_config {
-    acl_type = "White"
-    acl_relations {
-      acl_id = alicloud_alb_acl.alb_acl.0.id
-    }
-  }
-}
+}
+
+resource "alicloud_alb_listener_acl_attachment" "default" {
+  count       = var.create ? 1 : 0
+  acl_id      = alicloud_alb_acl.alb_acl[0].id
+  listener_id = alicloud_alb_listener.alb_listener[0].id
+  acl_type    = "White"
+}