fix(rds): fix sub module no instance id specified and account name sp…

…ecified error.
alibabacloud-automation · Dec 3, 2019 · f74fb3a · f74fb3a
1 parent abdda26
commit f74fb3a
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,9 @@
+## 1.2.0 (December 3, 2019)
+
+IMPROVEMENTS:
+
+- imporve(rds): update the module to the format of the new version.  ([GH-6](https://github.com/terraform-alicloud-modules/terraform-alicloud-rds/pull/6))
+
+BUG FIXES:
+
+- fix(rds): fix sub module no instance id specified and account name specified error.  ([GH-7](https://github.com/terraform-alicloud-modules/terraform-alicloud-rds/pull/7))
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ module "rds" {
 
   #variables for db account
   
-  name                         = "dbuser"
+  account_name                 = "dbuser"
   password                     = "testUser123"
   type                         = "Normal"
 

diff --git a/examples/mysql/README.md b/examples/mysql/README.md
@@ -29,10 +29,10 @@ Note that this example may create resources which cost money. Run `terraform des
 | this_db_instance_connection_string     |     intance public net connection string created        |
 | this_db_instance_port     |     instance connection port created         |
 | this_db_instance_security_ips     |    instance security ips configured         |
-| this_db_instance_databese_id    |      database ID created in this instance        |
-| this_db_instance_databese_name    |     database name created in this instance         |
-| this_db_instance_databese_account     |    database account associated in this instance          |
-| this_db_instance_databese_accountprivilege     |    database account privilege associated in this instance         |
+| this_db_instance_database_id    |      database ID created in this instance        |
+| this_db_instance_database_name    |     database name created in this instance         |
+| this_db_instance_database_account     |    database account associated in this instance          |
+| this_db_instance_database_accountprivilege     |    database account privilege associated in this instance         |
 
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/mysql/main.tf b/examples/mysql/main.tf
@@ -51,6 +51,6 @@ module "db_database_account" {
   #variables for account_privilege
   ##############################################################
   privilege = "ReadWrite"
-  db_names  = module.db_database.this_db_instance_databese_name
+  db_names  = module.db_database.this_db_instance_database_name
 }
 
diff --git a/main.tf b/main.tf
@@ -48,14 +48,15 @@ module "db_database_account" {
   ###############################################################
   #variables for db account
   ##############################################################
-  name     = var.name
-  password = var.password
-  type     = var.type
+  name        = var.account_name
+  password    = var.password
+  type        = var.type
+  instance_id = module.db_instance.this_db_instance_id
 
   ##############################################################
   #variables for account_privilege
   ##############################################################
   privilege = var.privilege
-  db_names  = module.db_database.this_db_instance_databese_name
+  db_names  = module.db_database.this_db_instance_database_name
 }
 
diff --git a/modules/db_database/README.md b/modules/db_database/README.md
@@ -13,5 +13,5 @@
 
 | Name | Description |
 |------|-------------|
-| this_db_instance_databese_id    |      database ID created in this instance        |
-| this_db_instance_databese_name    |     database name created in this instance         |
+| this_db_instance_database_id    |      database ID created in this instance        |
+| this_db_instance_database_name    |     database name created in this instance         |
diff --git a/modules/db_database/outputs.tf b/modules/db_database/outputs.tf
@@ -1,13 +1,13 @@
 locals {
-  this_db_instance_databese_id   = alicloud_db_database.this_db_database.*.id
-  this_db_instance_databese_name = alicloud_db_database.this_db_database.*.name
+  this_db_instance_database_id   = alicloud_db_database.this_db_database.*.id
+  this_db_instance_database_name = alicloud_db_database.this_db_database.*.name
 }
 
-output "this_db_instance_databese_id" {
-  value = local.this_db_instance_databese_id
+output "this_db_instance_database_id" {
+  value = local.this_db_instance_database_id
 }
 
-output "this_db_instance_databese_name" {
-  value = local.this_db_instance_databese_name
+output "this_db_instance_database_name" {
+  value = local.this_db_instance_database_name
 }
 
diff --git a/modules/db_database_account/README.md b/modules/db_database_account/README.md
@@ -14,5 +14,5 @@
 
 | Name | Description |
 |------|-------------|
-| this_db_instance_databese_account     |    database account associated in this instance          |
-| this_db_instance_databese_accountprivilege     |    database account privilege associated in this instance         |
+| this_db_instance_database_account     |    database account associated in this instance          |
+| this_db_instance_database_accountprivilege     |    database account privilege associated in this instance         |
diff --git a/modules/db_database_account/outputs.tf b/modules/db_database_account/outputs.tf
@@ -1,13 +1,13 @@
 locals {
-  this_db_instance_databese_account          = alicloud_db_account_privilege.this_db_database_privilege.*.account_name
-  this_db_instance_databese_accountprivilege = alicloud_db_account_privilege.this_db_database_privilege.*.privilege
+  this_db_instance_database_account          = alicloud_db_account_privilege.this_db_database_privilege.*.account_name
+  this_db_instance_database_accountprivilege = alicloud_db_account_privilege.this_db_database_privilege.*.privilege
 }
 
-output "this_db_instance_databese_account" {
-  value = local.this_db_instance_databese_account
+output "this_db_instance_database_account" {
+  value = local.this_db_instance_database_account
 }
 
-output "this_db_instance_databese_accountprivilege" {
-  value = local.this_db_instance_databese_accountprivilege
+output "this_db_instance_database_accountprivilege" {
+  value = local.this_db_instance_database_accountprivilege
 }
 
diff --git a/outputs.tf b/outputs.tf
@@ -30,19 +30,19 @@ output "this_db_instance_security_ips" {
   value = module.db_instance.this_db_instance_security_ips
 }
 
-output "this_db_databese_id" {
-  value = module.db_database.this_db_instance_databese_id
+output "this_db_database_id" {
+  value = module.db_database.this_db_instance_database_id
 }
 
-output "this_db_databese_name" {
-  value = module.db_database.this_db_instance_databese_name
+output "this_db_database_name" {
+  value = module.db_database.this_db_instance_database_name
 }
 
-output "this_db_databese_account" {
-  value = module.db_database_account.this_db_instance_databese_account
+output "this_db_database_account" {
+  value = module.db_database_account.this_db_instance_database_account
 }
 
-output "this_db_databese_accountprivilege" {
-  value = module.db_database_account.this_db_instance_databese_accountprivilege
+output "this_db_database_accountprivilege" {
+  value = module.db_database_account.this_db_instance_database_accountprivilege
 }
 
diff --git a/variables.tf b/variables.tf
@@ -121,8 +121,9 @@ variable "character_set" {
 #variables for alicloud_db_account
 ##############################################################
 
-variable "name" {
-  description = "Operation account requiring a uniqueness check. It may consist of lower case letters, numbers, and underlines, and must start with a letter and have no more than 16 characters."
+variable "account_name" {
+  description = "A specified account name."
+  default     = ""
 }
 
 variable "password" {
@@ -138,11 +139,6 @@ variable "type" {
 #variables for alicloud_db_account_privilege
 ##############################################################
 
-variable "account_name" {
-  description = "A specified account name."
-  default     = ""
-}
-
 variable "privilege" {
   description = "The privilege of one account access database."
   default     = "ReadOnly"