From 85314cd5a7d1cc4d899b39bb78dc07e943ed170a Mon Sep 17 00:00:00 2001
From: shanye <shanye.xzq@alibaba-inc.com>
Date: Mon, 25 Nov 2024 14:12:14 +0800
Subject: [PATCH] Module: remove deprecated attributes; examples: improve the
 examples

---
 .gitignore                     |  1 +
 examples/complete/main.tf      | 48 +++++-----------------------------
 examples/complete/outputs.tf   | 14 ++++++++++
 examples/complete/variables.tf | 19 +++++++++-----
 examples/complete/versions.tf  |  8 ++++++
 main.tf                        |  4 +--
 outputs.tf                     |  6 ++---
 variables.tf                   |  6 -----
 versions.tf                    |  8 ++++++
 9 files changed, 55 insertions(+), 59 deletions(-)
 create mode 100644 examples/complete/outputs.tf
 create mode 100644 examples/complete/versions.tf
 create mode 100644 versions.tf

diff --git a/.gitignore b/.gitignore
index 7a3e2fd..5ead60d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Local .terraform directories
 **/.terraform/*
+**/.terraform.lock.hcl
 
 # .tfstate files
 *.tfstate
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
index cf2fa88..9ddf5ac 100644
--- a/examples/complete/main.tf
+++ b/examples/complete/main.tf
@@ -7,47 +7,11 @@ resource "random_integer" "default" {
   min = 10000
 }
 
+
 resource "alicloud_ssl_certificates_service_certificate" "default" {
   certificate_name = "tf_certificate_${random_integer.default.result}"
-  cert             = <<EOF
------BEGIN CERTIFICATE-----
-MIIDRjCCAq+gAwIBAgIJAJn3ox4K13PoMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
-BAYTAkNOMQswCQYDVQQIEwJCSjELMAkGA1UEBxMCQkoxDDAKBgNVBAoTA0FMSTEP
-MA0GA1UECxMGQUxJWVVOMQ0wCwYDVQQDEwR0ZXN0MR8wHQYJKoZIhvcNAQkBFhB0
-ZXN0QGhvdG1haWwuY29tMB4XDTE0MTEyNDA2MDQyNVoXDTI0MTEyMTA2MDQyNVow
-djELMAkGA1UEBhMCQ04xCzAJBgNVBAgTAkJKMQswCQYDVQQHEwJCSjEMMAoGA1UE
-ChMDQUxJMQ8wDQYDVQQLEwZBTElZVU4xDTALBgNVBAMTBHRlc3QxHzAdBgkqhkiG
-9w0BCQEWEHRlc3RAaG90bWFpbC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM7SS3e9+Nj0HKAsRuIDNSsS3UK6b+62YQb2uuhKrp1HMrOx61WSDR2qkAnB
-coG00Uz38EE+9DLYNUVQBK7aSgLP5M1Ak4wr4GqGyCgjejzzh3DshUzLCCy2rook
-KOyRTlPX+Q5l7rE1fcSNzgepcae5i2sE1XXXzLRIDIvQxcspAgMBAAGjgdswgdgw
-HQYDVR0OBBYEFBdy+OuMsvbkV7R14f0OyoLoh2z4MIGoBgNVHSMEgaAwgZ2AFBdy
-+OuMsvbkV7R14f0OyoLoh2z4oXqkeDB2MQswCQYDVQQGEwJDTjELMAkGA1UECBMC
-QkoxCzAJBgNVBAcTAkJKMQwwCgYDVQQKEwNBTEkxDzANBgNVBAsTBkFMSVlVTjEN
-MAsGA1UEAxMEdGVzdDEfMB0GCSqGSIb3DQEJARYQdGVzdEBob3RtYWlsLmNvbYIJ
-AJn3ox4K13PoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAY7KOsnyT
-cQzfhiiG7ASjiPakw5wXoycHt5GCvLG5htp2TKVzgv9QTliA3gtfv6oV4zRZx7X1
-Ofi6hVgErtHaXJheuPVeW6eAW8mHBoEfvDAfU3y9waYrtUevSl07643bzKL6v+Qd
-DUBTxOAvSYfXTtI90EAxEG/bJJyOm5LqoiA=
------END CERTIFICATE-----
-EOF
-  key              = <<EOF
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDO0kt3vfjY9BygLEbiAzUrEt1Cum/utmEG9rroSq6dRzKzsetV
-kg0dqpAJwXKBtNFM9/BBPvQy2DVFUASu2koCz+TNQJOMK+BqhsgoI3o884dw7IVM
-ywgstq6KJCjskU5T1/kOZe6xNX3Ejc4HqXGnuYtrBNV118y0SAyL0MXLKQIDAQAB
-AoGAfe3NxbsGKhN42o4bGsKZPQDfeCHMxayGp5bTd10BtQIE/ST4BcJH+ihAS7Bd
-6FwQlKzivNd4GP1MckemklCXfsVckdL94e8ZbJl23GdWul3v8V+KndJHqv5zVJmP
-hwWoKimwIBTb2s0ctVryr2f18N4hhyFw1yGp0VxclGHkjgECQQD9CvllsnOwHpP4
-MdrDHbdb29QrobKyKW8pPcDd+sth+kP6Y8MnCVuAKXCKj5FeIsgVtfluPOsZjPzz
-71QQWS1dAkEA0T0KXO8gaBQwJhIoo/w6hy5JGZnrNSpOPp5xvJuMAafs2eyvmhJm
-Ev9SN/Pf2VYa1z6FEnBaLOVD6hf6YQIsPQJAX/CZPoW6dzwgvimo1/GcY6eleiWE
-qygqjWhsh71e/3bz7yuEAnj5yE3t7Zshcp+dXR3xxGo0eSuLfLFxHgGxwQJAAxf8
-9DzQ5NkPkTCJi0sqbl8/03IUKTgT6hcbpWdDXa7m8J3wRr3o5nUB+TPQ5nzAbthM
-zWX931YQeACcwhxvHQJBAN5mTzzJD4w4Ma6YTaNHyXakdYfyAWrOkPIWZxfhMfXe
-DrlNdiysTI4Dd1dLeErVpjsckAaOW/JDG5PCSwkaMxk=
------END RSA PRIVATE KEY-----
-EOF
+  cert             = var.ssl_cert
+  key              = var.ssl_key
 }
 
 data "alicloud_alb_zones" "default" {}
@@ -60,14 +24,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.3.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.4.id
+  zone_id      = data.alicloud_alb_zones.default.zones[4].id
   vswitch_name = var.vswitch_name_2
 }
 
@@ -98,7 +62,7 @@ module "example" {
     { 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 }
+    { log_project = alicloud_log_project.default.project_name, log_store = alicloud_log_store.default.logstore_name }
   ]
   acl_name             = "tf_acl_name"
   server_group_name    = "acl_server_group_name"
diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
new file mode 100644
index 0000000..a5ad175
--- /dev/null
+++ b/examples/complete/outputs.tf
@@ -0,0 +1,14 @@
+output "this_alb_instance_id" {
+  description = "The instance ID of ALB."
+  value       = module.example.this_alb_instance_id
+}
+
+output "this_alb_server_group_id" {
+  description = "The ID of ALB server group."
+  value       = module.example.this_alb_server_group_id
+}
+
+output "this_alb_listener" {
+  description = "The ID of ALB http listener."
+  value       = module.example.this_alb_listener
+}
diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf
index c3eaf7c..ea4fdf9 100644
--- a/examples/complete/variables.tf
+++ b/examples/complete/variables.tf
@@ -22,12 +22,6 @@ variable "vswitch_name_2" {
   description = "The name of the other v_switch."
 }
 
-variable "create" {
-  description = "Whether to create resources in module."
-  type        = bool
-  default     = false
-}
-
 variable "log_project_name" {
   default     = "tflogprojectname"
   type        = string
@@ -39,3 +33,16 @@ variable "log_store_name" {
   type        = string
   description = "The name of log store."
 }
+
+
+variable "ssl_cert" {
+  description = "The value of ssl cert."
+  type        = string
+  default     = "-----BEGIN CERTIFICATE-----\nMIID4jCCAsqgAwIBAgIQMQiIsoVBQA6ngOHV3dbINTANBgkqhkiG9w0BAQsFADBe\nMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFTXlTU0wxKzApBgNVBAsTIk15U1NMIFRl\nc3QgUlNBIC0gRm9yIHRlc3QgdXNlIG9ubHkxEjAQBgNVBAMTCU15U1NMLmNvbTAe\nFw0yNDExMjUwNTQ2MTNaFw0yOTExMjQwNTQ2MTNaMCYxCzAJBgNVBAYTAkNOMRcw\nFQYDVQQDEw50Zi1leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC\nAQoCggEBANzcOoXaKpNg6H4gXe70qVuQGIXPuVN/CrZpQeceft50MwiqjCpVydn6\n0M254CMPqPt8lFHDN+owEcroriKzGMjRxtgGVvcezKvilZzqp0vpNU9KL3DYQ6l6\nBd7KsI7RuiJEBz2ZXyQQuKw4ULikdMhIsyXzN1artuRMyp/01S3lRW9XuWa4lJ/X\nJPA/IAYgjUKT32lTWjpumwjfG6xoT+x4rO8S/e/gzToimIim+3eqzatpSFapVnVT\nWbGB6G+rs6n/m1ITH612Vz03eIM763wM5kEmD8jtr8z4R+QGHMh/xVDgoKpXDbID\nN+Ndszqw8uYH8vEJXEAzxaGJRdY4yC8CAwEAAaOB0zCB0DAOBgNVHQ8BAf8EBAMC\nBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFCiB\nJgXRNBo/wXMPu5PPFRw/A79/MGMGCCsGAQUFBwEBBFcwVTAhBggrBgEFBQcwAYYV\naHR0cDovL29jc3AubXlzc2wuY29tMDAGCCsGAQUFBzAChiRodHRwOi8vY2EubXlz\nc2wuY29tL215c3NsdGVzdHJzYS5jcnQwGQYDVR0RBBIwEIIOdGYtZXhhbXBsZS5j\nb20wDQYJKoZIhvcNAQELBQADggEBAGdBWZJ37LqK1Q4YqK2yaETbJ/c5WKmxX/+V\nStgRwkwuf9sc6Hzaw0kjZx5Xzq4XdCupnwhXq3FSkkYlCevzM1HZo8mthRYJqGKU\nv/6mYMi2E+dS+vLDWUAzSE4w/wd3hClUrretP8RcUpskVlE1bvitc90ZTJyJt6R2\nT7Uts6+bA3v0hv0FRgeiJIawRdOnuRtsDi2OU/8l8ktP07J0CJ6XkSmeM4RbgAdy\n8FT2vwIEEqabN37mKKnslYqlBnE/OANlxuDlFNiXaw1vKmJo0l0aRE5ga3fm9TRt\nElTnCyO4aDLWDahYWEsr6u7N+87qd7sFdI99H1dkxGruVSCbhC0=\n-----END CERTIFICATE-----\n"
+}
+
+variable "ssl_key" {
+  description = "The value of ssl key."
+  type        = string
+  default     = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA3Nw6hdoqk2DofiBd7vSpW5AYhc+5U38KtmlB5x5+3nQzCKqM\nKlXJ2frQzbngIw+o+3yUUcM36jARyuiuIrMYyNHG2AZW9x7Mq+KVnOqnS+k1T0ov\ncNhDqXoF3sqwjtG6IkQHPZlfJBC4rDhQuKR0yEizJfM3Vqu25EzKn/TVLeVFb1e5\nZriUn9ck8D8gBiCNQpPfaVNaOm6bCN8brGhP7His7xL97+DNOiKYiKb7d6rNq2lI\nVqlWdVNZsYHob6uzqf+bUhMfrXZXPTd4gzvrfAzmQSYPyO2vzPhH5AYcyH/FUOCg\nqlcNsgM3412zOrDy5gfy8QlcQDPFoYlF1jjILwIDAQABAoIBADJGFzQ80xA1MPb0\n2yz3mE11YX+kJyVwd7nJ/+xiLrLodG12lO1WFdp+k2Ug+HpCqE6GryRlcabnRkWP\n7YOMjQm5Zq/p0YXzBtfhffj4GRjYfwALfP0M3WoIkqmCLep0pxABuDw3W0bUX5Uk\nRIujM8obclwjHuelsr4JFN6QVq5ZY8OaTU/lMtjJICsbT5lMvl3kkN+DOliTXIv6\njW4l0fmkt6AkkpKrGvOSD+y/7Y1pobBF4rKJEkhK723UsmGkEYZCl1AWxKmATN17\nOohAl+HG4jS+/lIx8R1hEkkQFNUeeqdDmilywbqp1/gDh/692rukK0ySthjCmucr\nRTEy6fECgYEA5je3MAty8dg4lLQDjbTw/2KBZG9KoJ0fHHhuSE9cjVHAiu5Wr8L0\nImf0qvjm30Pk3pAuRllqI0MjmoUoHPebgAP8Xhuo4//Vl6Z3A9n81jgBVvg+To+C\nLRVNq3FvzYZkfiLI98iAiw60eQ3JXrRNkar/S3s4LXEp11eCb9wUdFMCgYEA9Zg9\nTIlSbMJECu2/5qrlFV0Nl/n/fsHm1J5A0h2rAd35+RPZVCBD/H5IFtXwdpSkExxW\nCTlHN5DSo4gfcg6fIOdSzWrj7B4dkUJjptAc3N7AObqf1YWbo/OoAiwwRnOTKkB7\n68o+YS9YLEB/bbY79DxkIz5AVkCp1oI1BpFKITUCgYEAwcImxaL9LRrkFBOl4gBl\nzSuk51jboG5dHuMlPmq85Jvnx4ZtIySbwNFplPRDq6lC2SbUK5VZxS/eqVBkwGyN\nTaMNJk91R9+sbyRFitJPACTGy+HG3uvdjgAeDKs+g+YWciropdL0jRTlQ/UchD6Q\nAoe+slKUp3pU0s7uEyNRe80CgYEAoaUdG4X6sUi/vi2zs9/hPclsTA4oosZ+5oxu\nf501U9pFUDJHRb6i4MpBKn6PcYzt3QI2goWnoSP579aFU+3ZwK9gaYGkGGHN9jCr\nJD0v8hPOk3CJCOGSijux5hQthgFF6HZe2dfYbODbeOzOsmhSV7Nz+VpcwCh5YI18\n1yDDmM0CgYAoxTpWKhw8eAQFmmWV1pgPuTT7rF5QAyqcwjQPeUWhKuA5kyBmpQ5l\nrlYTMoA7DAtYhjBy+OkZWfbST0t6ZNsVGZUj8ryrVI7Vj5i1TxSsI3kVFkyt7WXs\n9aWQrquvpdXetCKXodu+nJKSqL87Q6W4/HAaCboO+8iHZGKjAuFWxQ==\n-----END RSA PRIVATE KEY-----\n"
+}
diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
new file mode 100644
index 0000000..ebca698
--- /dev/null
+++ b/examples/complete/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    alicloud = {
+      source = "hashicorp/alicloud"
+    }
+  }
+}
diff --git a/main.tf b/main.tf
index 4e3bf57..6ce98af 100644
--- a/main.tf
+++ b/main.tf
@@ -67,7 +67,7 @@ resource "alicloud_alb_acl" "alb_acl" {
 
 resource "alicloud_alb_listener" "alb_listener" {
   count                = var.create ? 1 : 0
-  load_balancer_id     = alicloud_alb_load_balancer.alb.0.id
+  load_balancer_id     = alicloud_alb_load_balancer.alb[0].id
   listener_protocol    = "HTTPS"
   listener_port        = var.listener_port
   listener_description = var.listener_description
@@ -75,7 +75,7 @@ resource "alicloud_alb_listener" "alb_listener" {
     type = "ForwardGroup"
     forward_group_config {
       server_group_tuples {
-        server_group_id = alicloud_alb_server_group.alb_server_group.0.id
+        server_group_id = alicloud_alb_server_group.alb_server_group[0].id
       }
     }
   }
diff --git a/outputs.tf b/outputs.tf
index 5438427..d40a913 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,14 +1,14 @@
 output "this_alb_instance_id" {
   description = "The instance ID of ALB."
-  value       = concat(alicloud_alb_load_balancer.alb.*.id, [""])[0]
+  value       = concat(alicloud_alb_load_balancer.alb[*].id, [""])[0]
 }
 
 output "this_alb_server_group_id" {
   description = "The ID of ALB server group."
-  value       = concat(alicloud_alb_server_group.alb_server_group.*.id, [""])[0]
+  value       = concat(alicloud_alb_server_group.alb_server_group[*].id, [""])[0]
 }
 
 output "this_alb_listener" {
   description = "The ID of ALB http listener."
-  value       = concat(alicloud_alb_listener.alb_listener.*.id, [""])[0]
+  value       = concat(alicloud_alb_listener.alb_listener[*].id, [""])[0]
 }
diff --git a/variables.tf b/variables.tf
index 617dd79..803415f 100644
--- a/variables.tf
+++ b/variables.tf
@@ -35,12 +35,6 @@ variable "load_balancer_edition" {
   description = "The edition of ALB."
 }
 
-variable "deletion_protection_enabled" {
-  default     = false
-  type        = bool
-  description = "The deletion protection enabled."
-}
-
 variable "access_log_config" {
   type = list(object({
     log_project = string
diff --git a/versions.tf b/versions.tf
new file mode 100644
index 0000000..ebca698
--- /dev/null
+++ b/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+  required_version = ">= 0.13"
+  required_providers {
+    alicloud = {
+      source = "hashicorp/alicloud"
+    }
+  }
+}