Module: remove deprecated attributes; improve the submodules;

Author: shanye997

.gitignore

@@ -1,5 +1,6 @@
 # Local .terraform directories
 **/.terraform/*
+**/.terraform.lock.hcl
 
 # .tfstate files
 *.tfstate

example/complete/README.md renamed to examples/complete/README.md

@@ -1,6 +1,3 @@
-variable "region" {
-  default = "cn-beijing"
-}
 provider "alicloud" {
   region = var.region
 }
@@ -29,16 +26,18 @@ resource "alicloud_vswitch" "default" {
   vswitch_name = "terraform-example"
   cidr_block   = "10.4.0.0/24"
   vpc_id       = alicloud_vpc.default.id
-  zone_id      = data.alicloud_db_zones.default.zones.0.id
+  zone_id      = data.alicloud_db_zones.default.zones[0].id
 }
 module "security_group" {
-  source = "alibaba/security-group/alicloud"
+  source  = "alibaba/security-group/alicloud"
+  version = "~>2.4.0"
+
   region = var.region
   vpc_id = alicloud_vpc.default.id
 }
 
 data "alicloud_db_instance_classes" "default" {
-  zone_id                  = data.alicloud_db_zones.default.zones.0.id
+  zone_id                  = data.alicloud_db_zones.default.zones[0].id
   engine                   = local.engine
   engine_version           = local.engine_version
   category                 = local.category
@@ -47,17 +46,16 @@ data "alicloud_db_instance_classes" "default" {
 }
 module "postgres" {
   source = "../../"
-  region = var.region
 
   #################
   # Rds Instance
   #################
   create_instance      = true
   engine_version       = local.engine_version
-  instance_type        = data.alicloud_db_instance_classes.default.instance_classes.0.instance_class
+  instance_type        = data.alicloud_db_instance_classes.default.instance_classes[0].instance_class
   vswitch_id           = alicloud_vswitch.default.id
   instance_name        = "PostgreSQLInstance"
-  instance_storage     = data.alicloud_db_instance_classes.default.instance_classes.0.storage_range.min
+  instance_storage     = data.alicloud_db_instance_classes.default.instance_classes[0].storage_range.min
   instance_charge_type = "Postpaid"
   security_group_ids   = [module.security_group.this_security_group_id]
   security_ips         = ["11.193.54.0/24", "101.37.74.0/24", ]
@@ -104,4 +102,4 @@ module "postgres" {
   alarm_rule_threshold       = 35
   alarm_rule_triggered_count = 2
   alarm_rule_contact_groups  = ["postgre"]
-}
+}

example/complete/main.tf renamed to examples/complete/main.tf

@@ -76,11 +76,6 @@ output "this_alarm_rule_enabled" {
   value       = module.postgres.this_alarm_rule_enabled
 }
 
-output "this_alarm_rule_webhook" {
-  description = "The webhook that is called when the alarm is triggered."
-  value       = module.postgres.this_alarm_rule_webhook
-}
-
 output "this_alarm_rule_cpu_usage_status" {
   description = "The current alarm cpu usage rule status."
   value       = module.postgres.this_alarm_rule_cpu_usage_status
@@ -135,10 +130,6 @@ output "this_db_instance_name" {
   value       = module.postgres.this_db_instance_name
 }
 
-output "this_db_instance_period" {
-  description = "Postgre SQL instance charge period when Prepaid."
-  value       = module.postgres.this_db_instance_period
-}
 
 output "this_db_instance_security_ips" {
   description = "Postgre SQL instance security ip list."

example/complete/outputs.tf renamed to examples/complete/outputs.tf

@@ -0,0 +1,5 @@
+variable "region" {
+  description = "The region of the resources."
+  default     = "cn-beijing"
+  type        = string
+}

examples/complete/variables.tf

@@ -1,17 +1,38 @@
-variable "region" {
-  default = "cn-beijing"
-}
 provider "alicloud" {
   region = var.region
 }
+
+# 创建VPC
+resource "alicloud_vpc" "main" {
+  vpc_name   = "alicloud"
+  cidr_block = "172.16.0.0/16"
+}
+
+# 创建交换机
+resource "alicloud_vswitch" "main" {
+  vpc_id     = alicloud_vpc.main.id
+  cidr_block = "172.16.192.0/20"
+  zone_id    = "cn-hangzhou-b"
+}
+
+# 创建RDS PostgreSQL实例
+resource "alicloud_db_instance" "instance" {
+  engine               = "PostgreSQL"
+  engine_version       = "13.0"
+  instance_type        = "pg.n2.2c.2m"
+  instance_storage     = "30"
+  instance_charge_type = "Postpaid"
+  vswitch_id           = alicloud_vswitch.main.id
+}
+
 module "postgres" {
   source = "../../"
-  region = var.region
 
   #################
   # Rds Instance
   #################
-  existing_instance_id = "pgm-2zehbutrxxxxxx"
+  create_instance      = false
+  existing_instance_id = alicloud_db_instance.instance.id
 
   #################
   # Rds Backup policy
@@ -40,7 +61,7 @@ module "postgres" {
   #######################
   account_privilege = "DBOwner"
   account_name      = "account_name"
-  account_password  = "yourpassword123"
+  account_password  = "Example12345"
 
   #############
   # Alarm Rule
@@ -52,4 +73,4 @@ module "postgres" {
   alarm_rule_threshold       = 35
   alarm_rule_triggered_count = 2
   alarm_rule_contact_groups  = ["postgre"]
-}
+}

example/complete/versions.tf renamed to examples/complete/versions.tf

@@ -76,11 +76,6 @@ output "this_alarm_rule_enabled" {
   value       = module.postgres.this_alarm_rule_enabled
 }
 
-output "this_alarm_rule_webhook" {
-  description = "The webhook that is called when the alarm is triggered."
-  value       = module.postgres.this_alarm_rule_webhook
-}
-
 output "this_alarm_rule_cpu_usage_status" {
   description = "The current alarm cpu usage rule status."
   value       = module.postgres.this_alarm_rule_cpu_usage_status
@@ -135,11 +130,6 @@ output "this_db_instance_name" {
   value       = module.postgres.this_db_instance_name
 }
 
-output "this_db_instance_period" {
-  description = "Postgre SQL instance charge period when Prepaid."
-  value       = module.postgres.this_db_instance_period
-}
-
 output "this_db_instance_security_ips" {
   description = "Postgre SQL instance security ip list."
   value       = module.postgres.this_db_instance_security_ips

example/using-existing-rds-instance/README.md renamed to examples/using-existing-rds-instance/README.md

@@ -0,0 +1,5 @@
+variable "region" {
+  description = "The region of the resources."
+  default     = "cn-hangzhou"
+  type        = string
+}