Adding tags support for root username password (#28)

* adding tags support for root username password * adding tag support for rds instance
coveo · Nov 11, 2019 · 61c75fd · 61c75fd
1 parent 65e46f1
commit 61c75fd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/rds_database_cluster/rds_database_cluster.tf b/rds_database_cluster/rds_database_cluster.tf
@@ -14,6 +14,7 @@ resource "aws_ssm_parameter" "db_root_master_username" {
   name  = "${lookup(var.optional_parameters, "parameter_store_path", "${var.custom_identifier}")}/${lookup(var.optional_parameters, "parameter_store_username_key", "Username")}"
   type  = "String"
   value = "${lookup(var.optional_parameters, "master_username", "root")}"
+  tags  = "${var.optional_ssm_parameter_tags}"
 }
 
 resource "aws_ssm_parameter" "db_root_master_password" {
@@ -22,6 +23,7 @@ resource "aws_ssm_parameter" "db_root_master_password" {
   value = "${var.master_password}"
 
   key_id = "${lookup(var.optional_parameters, "master_password_kms_key_id", "")}"
+  tags   = "${var.optional_ssm_parameter_tags}"
 }
 
 resource "aws_rds_cluster" "rds_db_cluster" {

diff --git a/rds_database_cluster/variables.tf b/rds_database_cluster/variables.tf
@@ -42,6 +42,12 @@ variable "db_tags" {
   default     = {}
 }
 
+variable "optional_ssm_parameter_tags" {
+  type        = "map"
+  description = "Additional tags to add to the SSM parameter resources"
+  default     = {}
+}
+
 variable "availability_zones" {
   type        = "list"
   description = "A list of EC2 Availability Zones that instances in the DB cluster can be created in"

diff --git a/rds_database_instance/rds_database_instance.tf b/rds_database_instance/rds_database_instance.tf
@@ -14,6 +14,7 @@ resource "aws_ssm_parameter" "db_root_username" {
   name  = "${lookup(var.optional_parameters, "parameter_store_path", "${var.custom_identifier}")}/${lookup(var.optional_parameters, "parameter_store_username_key", "Username")}"
   type  = "String"
   value = "${lookup(var.optional_parameters, "username", "root_db")}"
+  tags  = "${var.optional_ssm_parameter_tags}"
 }
 
 resource "aws_ssm_parameter" "db_root_password" {
@@ -22,6 +23,7 @@ resource "aws_ssm_parameter" "db_root_password" {
   value = "${var.password}"
 
   key_id = "${lookup(var.optional_parameters, "password_kms_key_id", "")}"
+  tags   = "${var.optional_ssm_parameter_tags}"
 }
 
 resource "aws_db_instance" "rds_db_instance" {

diff --git a/rds_database_instance/variables.tf b/rds_database_instance/variables.tf
@@ -37,6 +37,12 @@ variable "db_tags" {
   default     = {}
 }
 
+variable "optional_ssm_parameter_tags" {
+  type        = "map"
+  description = "Additional tags to add to the SSM parameter resources"
+  default     = {}
+}
+
 variable "availability_zones" {
   type        = "list"
   description = "A list of EC2 Availability Zones that instances in the DB cluster can be created in"