Add multiple zones

Author: Rich-yi

CHANGELOG.md

@@ -1,5 +1,3 @@
 ## 1.0.0 (Unreleased)
 
 - **NEW:** `rds-postgres` [GH-1]( https://github.com/terraform-alicloud-modules/terraform-alicloud-rds-postgres/pull/1)
-
-- Add multiple zones [GH-2]( https://github.com/terraform-alicloud-modules/terraform-alicloud-rds-postgres/pull/2)

README-CN.md

@@ -54,7 +54,7 @@ module "postgres" {
   ###########
   #databases
   ###########
-  privilege = "ReadOnly"
+  privilege = "DBOwner"
   databases = [
     {
       name          = "dbuser1"
@@ -164,6 +164,13 @@ module "postgres" {
 
 * 本 Module 使用的 AccessKey 和 SecretKey 可以直接从 `profile` 和 `shared_credentials_file` 中获取。如果未设置，可通过下载安装 [aliyun-cli](https://github.com/aliyun/aliyun-cli#installation) 后进行配置。
 
+
+提交问题
+------
+如果在使用该 Terraform Module 的过程中有任何问题，可以直接创建一个 [Provider Issue](https://github.com/terraform-providers/terraform-provider-alicloud/issues/new)，我们将根据问题描述提供解决方案。
+
+**注意:** 不建议在该 Module 仓库中直接提交 Issue。
+
 作者
 -------
 Created and maintained by He Guimin(@xiaozhu36, heguimin36@163.com) and Yi Jincheng(yi785301535@163.com) 

README.md

@@ -57,7 +57,7 @@ module "postgres" {
   ###########
   #databases
   ###########
-  privilege = "ReadOnly"
+  privilege = "DBOwner"
   databases = [
     {
       name          = "dbuser1"
@@ -168,6 +168,13 @@ module "postgres" {
 * This module using AccessKey and SecretKey are from 'profile' and 'shared_credentials_file'.
 If you have not set them yet, please install [aliyun-cli](https://github.com/aliyun/aliyun-cli#installation) and configure it.
 
+
+Submit Issues
+-------------
+If you have any problems when using this module, please opening a [provider issue](https://github.com/terraform-providers/terraform-provider-alicloud/issues/new) and let us know.
+
+**Note:** There does not recommend to open an issue on this repo.
+
 Authors
 -------
 Created and maintained by He Guimin(@xiaozhu36, heguimin36@163.com) and Yi Jincheng(yi785301535@163.com) 

example/complete/main.tf

@@ -42,7 +42,7 @@ module "postgres" {
   #################
   # Rds Instance
   #################
-  create_instance=true
+  create_instance      = true
   engine_version       = local.engine_version
   instance_type        = data.alicloud_db_instance_classes.default.instance_classes.0.instance_class
   vswitch_id           = alicloud_vswitch.this.id

example/complete/outputs.tf

@@ -2,47 +2,47 @@
 # Alarm Rule
 #############
 output "this_alarm_rule_effective_interval" {
-  description = "The interval of effecting alarm rule. "
+  description = "The interval of effecting alarm rule."
   value       = module.postgres.this_alarm_rule_effective_interval
 }
 
 output "this_alarm_rule_id" {
-  description = "The ID of the alarm rule. "
+  description = "The ID of the alarm rule."
   value       = module.postgres.this_alarm_rule_id
 }
 
 output "this_alarm_rule_name" {
-  description = "The alarm name. "
+  description = "The alarm name."
   value       = module.postgres.this_alarm_rule_name
 }
 
 output "this_alarm_rule_project" {
-  description = "Monitor project name. "
+  description = "Monitor project name."
   value       = module.postgres.this_alarm_rule_project
 }
 
 output "this_alarm_rule_metric" {
-  description = "Name of the monitoring metrics. "
+  description = "Name of the monitoring metrics."
   value       = module.postgres.this_alarm_rule_metric
 }
 
 output "this_alarm_rule_dimensions" {
-  description = "Map of the resources associated with the alarm rule. "
+  description = "Map of the resources associated with the alarm rule."
   value       = module.postgres.this_alarm_rule_dimensions
 }
 
 output "this_alarm_rule_period" {
-  description = "Index query cycle. "
+  description = "Index query cycle."
   value       = module.postgres.this_alarm_rule_period
 }
 
 output "this_alarm_rule_statistics" {
-  description = "Statistical method. "
+  description = "Statistical method."
   value       = module.postgres.this_alarm_rule_statistics
 }
 
 output "this_alarm_rule_operator" {
-  description = "Alarm comparison operator. "
+  description = "Alarm comparison operator."
   value       = module.postgres.this_alarm_rule_operator
 }
 
@@ -52,47 +52,47 @@ output "this_alarm_rule_threshold" {
 }
 
 output "this_alarm_rule_triggered_count" {
-  description = "Number of trigger alarm. "
+  description = "Number of trigger alarm."
   value       = module.postgres.this_alarm_rule_triggered_count
 }
 
 output "this_alarm_rule_contact_groups" {
-  description = "List contact groups of the alarm rule. "
+  description = "List contact groups of the alarm rule."
   value       = module.postgres.this_alarm_rule_contact_groups
 }
 
 output "this_alarm_rule_silence_time" {
-  description = " Notification silence period in the alarm state. "
+  description = " Notification silence period in the alarm state."
   value       = module.postgres.this_alarm_rule_silence_time
 }
 
 output "this_alarm_rule_notify_type" {
-  description = "Notification type. "
+  description = "Notification type."
   value       = module.postgres.this_alarm_rule_notify_type
 }
 
 output "this_alarm_rule_enabled" {
-  description = "Whether to enable alarm rule. "
+  description = "Whether to enable alarm rule."
   value       = module.postgres.this_alarm_rule_enabled
 }
 
 output "this_alarm_rule_webhook" {
-  description = "The webhook that is called when the alarm is triggered. "
+  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. "
+  description = "The current alarm cpu usage rule status."
   value       = module.postgres.this_alarm_rule_cpu_usage_status
 }
 
 output "this_alarm_rule_disk_usage_status" {
-  description = "The current alarm disk usage rule status. "
+  description = "The current alarm disk usage rule status."
   value       = module.postgres.this_alarm_rule_disk_usage_status
 }
 
 output "this_alarm_rule_connection_usage_status" {
-  description = "The current alarm memory usage rule status. "
+  description = "The current alarm memory usage rule status."
   value       = module.postgres.this_alarm_rule_connection_usage_status
 }
 
@@ -146,17 +146,17 @@ output "this_db_instance_security_ips" {
 }
 
 output "this_db_instance_zone_id" {
-  description = "The zone id in which the Rds instance."
+  description = "The zone id in which the postgres instance."
   value       = module.postgres.this_db_instance_zone_id
 }
 
 output "this_db_instance_vswitch_id" {
-  description = "The vswitch id in which the Rds instance."
+  description = "The vswitch id in which the postgres instance."
   value       = module.postgres.this_db_instance_vswitch_id
 }
 
 output "this_db_instance_security_group_ids" {
-  description = "The security group ids in which the Rds instance."
+  description = "The security group ids in which the postgres instance."
   value       = module.postgres.this_db_instance_security_group_ids
 }
 
@@ -170,17 +170,17 @@ output "this_db_instance_tags" {
 ##################################
 
 output "this_db_instance_connection_string" {
-  description = "Postgre SQL instance public connection string"
+  description = "Postgre SQL instance public connection string."
   value       = module.postgres.this_db_instance_connection_string
 }
 
 output "this_db_instance_port" {
-  description = "Postgre SQL instance public connection string"
+  description = "Postgre SQL instance connection port."
   value       = module.postgres.this_db_instance_port
 }
 
 output "this_db_instance_connection_ip_address" {
-  description = "Postgre SQL instance public connection string's ip address"
+  description = "Postgre SQL instance public connection string's ip address."
   value       = module.postgres.this_db_instance_connection_ip_address
 }
 

example/using-existing-rds-instance/outputs.tf

@@ -2,47 +2,47 @@
 # Alarm Rule
 #############
 output "this_alarm_rule_effective_interval" {
-  description = "The interval of effecting alarm rule. "
+  description = "The interval of effecting alarm rule."
   value       = module.postgres.this_alarm_rule_effective_interval
 }
 
 output "this_alarm_rule_id" {
-  description = "The ID of the alarm rule. "
+  description = "The ID of the alarm rule."
   value       = module.postgres.this_alarm_rule_id
 }
 
 output "this_alarm_rule_name" {
-  description = "The alarm name. "
+  description = "The alarm name."
   value       = module.postgres.this_alarm_rule_name
 }
 
 output "this_alarm_rule_project" {
-  description = "Monitor project name. "
+  description = "Monitor project name."
   value       = module.postgres.this_alarm_rule_project
 }
 
 output "this_alarm_rule_metric" {
-  description = "Name of the monitoring metrics. "
+  description = "Name of the monitoring metrics."
   value       = module.postgres.this_alarm_rule_metric
 }
 
 output "this_alarm_rule_dimensions" {
-  description = "Map of the resources associated with the alarm rule. "
+  description = "Map of the resources associated with the alarm rule."
   value       = module.postgres.this_alarm_rule_dimensions
 }
 
 output "this_alarm_rule_period" {
-  description = "Index query cycle. "
+  description = "Index query cycle."
   value       = module.postgres.this_alarm_rule_period
 }
 
 output "this_alarm_rule_statistics" {
-  description = "Statistical method. "
+  description = "Statistical method."
   value       = module.postgres.this_alarm_rule_statistics
 }
 
 output "this_alarm_rule_operator" {
-  description = "Alarm comparison operator. "
+  description = "Alarm comparison operator."
   value       = module.postgres.this_alarm_rule_operator
 }
 
@@ -52,47 +52,47 @@ output "this_alarm_rule_threshold" {
 }
 
 output "this_alarm_rule_triggered_count" {
-  description = "Number of trigger alarm. "
+  description = "Number of trigger alarm."
   value       = module.postgres.this_alarm_rule_triggered_count
 }
 
 output "this_alarm_rule_contact_groups" {
-  description = "List contact groups of the alarm rule. "
+  description = "List contact groups of the alarm rule."
   value       = module.postgres.this_alarm_rule_contact_groups
 }
 
 output "this_alarm_rule_silence_time" {
-  description = " Notification silence period in the alarm state. "
+  description = " Notification silence period in the alarm state."
   value       = module.postgres.this_alarm_rule_silence_time
 }
 
 output "this_alarm_rule_notify_type" {
-  description = "Notification type. "
+  description = "Notification type."
   value       = module.postgres.this_alarm_rule_notify_type
 }
 
 output "this_alarm_rule_enabled" {
-  description = "Whether to enable alarm rule. "
+  description = "Whether to enable alarm rule."
   value       = module.postgres.this_alarm_rule_enabled
 }
 
 output "this_alarm_rule_webhook" {
-  description = "The webhook that is called when the alarm is triggered. "
+  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. "
+  description = "The current alarm cpu usage rule status."
   value       = module.postgres.this_alarm_rule_cpu_usage_status
 }
 
 output "this_alarm_rule_disk_usage_status" {
-  description = "The current alarm disk usage rule status. "
+  description = "The current alarm disk usage rule status."
   value       = module.postgres.this_alarm_rule_disk_usage_status
 }
 
 output "this_alarm_rule_connection_usage_status" {
-  description = "The current alarm memory usage rule status. "
+  description = "The current alarm memory usage rule status."
   value       = module.postgres.this_alarm_rule_connection_usage_status
 }
 
@@ -146,17 +146,17 @@ output "this_db_instance_security_ips" {
 }
 
 output "this_db_instance_zone_id" {
-  description = "The zone id in which the Rds instance."
+  description = "The zone id in which the postgres instance."
   value       = module.postgres.this_db_instance_zone_id
 }
 
 output "this_db_instance_vswitch_id" {
-  description = "The vswitch id in which the Rds instance."
+  description = "The vswitch id in which the postgres instance."
   value       = module.postgres.this_db_instance_vswitch_id
 }
 
 output "this_db_instance_security_group_ids" {
-  description = "The security group ids in which the Rds instance."
+  description = "The security group ids in which the postgres instance."
   value       = module.postgres.this_db_instance_security_group_ids
 }
 
@@ -170,17 +170,17 @@ output "this_db_instance_tags" {
 ##################################
 
 output "this_db_instance_connection_string" {
-  description = "Postgre SQL instance public connection string"
+  description = "Postgre SQL instance public connection string."
   value       = module.postgres.this_db_instance_connection_string
 }
 
 output "this_db_instance_port" {
-  description = "Postgre SQL instance public connection string"
+  description = "Postgre SQL instance connection port."
   value       = module.postgres.this_db_instance_port
 }
 
 output "this_db_instance_connection_ip_address" {
-  description = "Postgre SQL instance public connection string's ip address"
+  description = "Postgre SQL instance public connection string's ip address."
   value       = module.postgres.this_db_instance_connection_ip_address
 }
 

modules/database/variables.tf

@@ -68,7 +68,7 @@ variable "account_type" {
 variable "account_privilege" {
   description = "The privilege of one account access database."
   type        = string
-  default     = "ReadOnly"
+  default     = "DBOwner"
 }
 
 variable "db_instance_id" {