From 05360c28b31a2a9857ca665d30980b76723268e5 Mon Sep 17 00:00:00 2001 From: Anton Babenko Date: Sun, 9 Jun 2019 21:39:42 +0200 Subject: [PATCH] Fixed formatting --- README.md | 6 ++++++ examples/enhanced-monitoring/main.tf | 8 ++++++-- modules/db_instance/main.tf | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e8651fdd..f7ef7236 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,12 @@ Root module calls these modules which can also be used separately to create inde * [db_parameter_group](https://github.com/terraform-aws-modules/terraform-aws-rds/tree/master/modules/db_parameter_group) - creates RDS DB parameter group * [db_option_group](https://github.com/terraform-aws-modules/terraform-aws-rds/tree/master/modules/db_option_group) - creates RDS DB option group +## Terraform versions + +Terraform 0.12. Pin module version to `~> v2.0`. Submit pull-requests to `master` branch. + +Terraform 0.11. Pin module version to `~> v1.0`. Submit pull-requests to `terraform011` branch. + ## Usage ```hcl diff --git a/examples/enhanced-monitoring/main.tf b/examples/enhanced-monitoring/main.tf index 701decb6..fe3701d1 100644 --- a/examples/enhanced-monitoring/main.tf +++ b/examples/enhanced-monitoring/main.tf @@ -61,7 +61,6 @@ module "db" { storage_encrypted = false # kms_key_id = "arm:aws:kms:::key/" - name = "demodb" username = "user" password = "YourPwdShouldBeLongAndSecure!" @@ -69,19 +68,24 @@ module "db" { vpc_security_group_ids = ["${data.aws_security_group.default.id}"] maintenance_window = "Mon:00:00-Mon:03:00" backup_window = "03:00-06:00" - backup_retention_period = 0 // disable backups to create DB faster + backup_retention_period = 0 // disable backups to create DB faster + tags = { Owner = "user" Environment = "dev" } + # DB subnet group subnet_ids = ["${data.aws_subnet_ids.all.ids}"] + # DB parameter group family = "mysql5.7" + # DB option group major_engine_version = "5.7" monitoring_interval = "30" monitoring_role_arn = "${aws_iam_role.rds_enhanced_monitoring.arn}" + # Database Deletion Protection deletion_protection = true } diff --git a/modules/db_instance/main.tf b/modules/db_instance/main.tf index 12332607..adba6fd1 100644 --- a/modules/db_instance/main.tf +++ b/modules/db_instance/main.tf @@ -1,5 +1,5 @@ locals { - is_mssql = "${element(split("-",var.engine), 0) == "sqlserver"}" + is_mssql = "${element(split("-", var.engine), 0) == "sqlserver"}" } resource "aws_iam_role" "enhanced_monitoring" { @@ -18,7 +18,7 @@ resource "aws_iam_role_policy_attachment" "enhanced_monitoring" { } resource "aws_db_instance" "this" { - count = "${var.create && !local.is_mssql ? 1 : 0}" + count = "${var.create && ! local.is_mssql ? 1 : 0}" identifier = "${var.identifier}"