module: support attibute category,serverless_config and deprecate off…

…line submodules; examples: improve the examples

examples/complete/main.tf

@@ -7,15 +7,19 @@ data "alicloud_db_instance_classes" "default" {
 }
 
 module "vpc" {
-  source             = "alibaba/vpc/alicloud"
+  source  = "alibaba/vpc/alicloud"
+  version = "~>1.11.0"
+
   create             = true
   vpc_cidr           = "172.16.0.0/16"
   vswitch_cidrs      = ["172.16.0.0/21"]
-  availability_zones = [data.alicloud_db_zones.default.zones.0.id]
+  availability_zones = [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"
+
   vpc_id = module.vpc.this_vpc_id
 }
 
@@ -29,7 +33,7 @@ module "rds" {
   engine_version = "5.6"
 
   instance_name              = var.instance_name
-  instance_type              = data.alicloud_db_instance_classes.default.instance_classes.0.instance_class
+  instance_type              = data.alicloud_db_instance_classes.default.instance_classes[1].instance_class
   instance_storage_type      = "local_ssd"
   instance_storage           = var.instance_storage
   instance_charge_type       = var.instance_charge_type
@@ -70,4 +74,4 @@ module "rds" {
   type         = "Normal"
   privilege    = "ReadOnly"
 
-}
+}

examples/complete/outputs.tf

@@ -36,11 +36,6 @@ output "this_db_instance_name" {
   value       = module.rds.this_db_instance_name
 }
 
-output "this_db_instance_period" {
-  description = "Rds instance charge period when Prepaid."
-  value       = module.rds.this_db_instance_period
-}
-
 output "this_db_instance_security_ips" {
   description = "Rds instance security ip list."
   value       = module.rds.this_db_instance_security_ips

examples/complete/tfvars/01-update.tfvars

@@ -2,7 +2,6 @@
 # Rds Instance
 #################
 instance_name        = "update-tf-testacc-name"
-instance_storage     = 25
 period               = 2
 security_ips         = ["10.23.12.24"]
 sql_collector_status = "Disabled"

examples/mysql/main.tf

@@ -1,32 +1,23 @@
-variable "region" {
-  default = "cn-hangzhou"
-}
-variable "profile" {
-  default = "default"
-}
 provider "alicloud" {
-  region  = var.region
-  profile = var.profile
+  region = var.region
 }
 data "alicloud_vpcs" "default" {
   is_default = true
 }
 module "security_group" {
-  source  = "alibaba/security-group/alicloud"
-  region  = var.region
-  profile = var.profile
-  vpc_id  = data.alicloud_vpcs.default.ids.0
+  source = "alibaba/security-group/alicloud"
+
+  vpc_id  = data.alicloud_vpcs.default.ids[0]
   version = "~> 2.0"
 }
 module "mysql" {
-  source  = "../../modules/mysql-8.0-high-availability"
-  region  = var.region
-  profile = var.profile
+  source = "../../modules/mysql-8.0-high-availability"
+
   #################
   # Rds Instance
   #################
   connection_prefix  = "developmentabc"
-  vswitch_id         = data.alicloud_vpcs.default.vpcs.0.vswitch_ids.0
+  vswitch_id         = data.alicloud_vpcs.default.vpcs[0].vswitch_ids[0]
   instance_name      = "myDBInstance"
   instance_type      = "rds.mysql.t1.small"
   security_group_ids = [module.security_group.this_security_group_id]
@@ -63,11 +54,12 @@ module "mysql" {
   # Rds Database account
   #################
   account_name = "account_name1"
-  password     = "1234abc"
+  password     = "Example1234"
   tags = {
     Env      = "Private"
     Location = "Secret"
   }
+
 }
 
 

modules/mysql-5.7-enterprise/outputs.tf → examples/mysql/outputs.tf

@@ -29,10 +29,6 @@ output "this_db_instance_name" {
   description = "Rds instance name."
   value       = module.mysql.this_db_instance_name
 }
-output "this_db_instance_period" {
-  description = "Rds instance charge period when Prepaid."
-  value       = module.mysql.this_db_instance_period
-}
 output "this_db_instance_security_ips" {
   description = "Rds instance security ip list."
   value       = module.mysql.this_db_instance_security_ips

examples/mysql/variables.tf

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

examples/postgre_sql/main.tf

@@ -1,35 +1,56 @@
-variable "region" {
-  default = "cn-beijing"
-}
-variable "profile" {
-  default = "default"
-}
 provider "alicloud" {
-  region  = var.region
-  profile = var.profile
+  region = var.region
 }
 data "alicloud_vpcs" "default" {
   is_default = true
 }
 
 module "security_group" {
   source  = "alibaba/security-group/alicloud"
-  region  = var.region
-  profile = var.profile
-  vpc_id  = data.alicloud_vpcs.default.ids.0
   version = "~> 2.0"
+
+  vpc_id = data.alicloud_vpcs.default.ids[0]
+
+}
+
+data "alicloud_db_zones" "example" {
+  engine                   = "PostgreSQL"
+  engine_version           = "14.0"
+  instance_charge_type     = "Serverless"
+  category                 = "serverless_basic"
+  db_instance_storage_type = "cloud_essd"
+}
+
+data "alicloud_db_instance_classes" "example" {
+  zone_id                  = data.alicloud_db_zones.example.ids[1]
+  engine                   = "PostgreSQL"
+  engine_version           = "14.0"
+  category                 = "serverless_basic"
+  db_instance_storage_type = "cloud_essd"
+  instance_charge_type     = "Serverless"
+  commodity_code           = "rds_serverless_public_cn"
 }
+
 module "postgre_sql" {
-  source            = "../../modules/postgre_sql-9.4-high-availability"
+  source            = "../.."
   connection_prefix = "developmentabc"
-  region            = var.region
-  profile           = var.profile
+
   #################
   # Rds Instance
   #################
-  vswitch_id         = data.alicloud_vpcs.default.vpcs.0.vswitch_ids.0
-  instance_type      = "rds.pg.s1.small"
-  instance_name      = "myDBInstance"
+  vswitch_id            = data.alicloud_vpcs.default.vpcs[0].vswitch_ids[0]
+  engine                = "PostgreSQL"
+  engine_version        = "14.0"
+  instance_storage      = data.alicloud_db_instance_classes.example.instance_classes[0].storage_range.min
+  instance_type         = data.alicloud_db_instance_classes.example.instance_classes[0].instance_class
+  instance_charge_type  = "Serverless"
+  instance_storage_type = "cloud_essd"
+  instance_name         = "myDBInstance"
+  category              = "serverless_basic"
+  serverless_config = [{
+    max_capacity = 8
+    min_capacity = 2
+  }]
   security_group_ids = [module.security_group.this_security_group_id]
   security_ips = [
     "11.193.54.0/24",
@@ -47,5 +68,8 @@ module "postgre_sql" {
     Env      = "Private"
     Location = "Secret"
   }
+  allocate_public_connection = false
+  create_database            = false
+  create_account             = false
 }
 

examples/postgre_sql/outputs.tf

@@ -29,10 +29,6 @@ output "this_db_instance_name" {
   description = "Rds instance name."
   value       = module.postgre_sql.this_db_instance_name
 }
-output "this_db_instance_period" {
-  description = "Rds instance charge period when Prepaid."
-  value       = module.postgre_sql.this_db_instance_period
-}
 output "this_db_instance_security_ips" {
   description = "Rds instance security ip list."
   value       = module.postgre_sql.this_db_instance_security_ips

examples/postgre_sql/variables.tf

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