From 8509e4c7a95eb410c47e778703db39d5653355c7 Mon Sep 17 00:00:00 2001 From: Sebastian Melchior Date: Wed, 28 Feb 2018 09:32:43 +0100 Subject: [PATCH] add name_tag_name, add type for tags var --- s3_cloudtrail.tf | 2 +- variables.tf | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/s3_cloudtrail.tf b/s3_cloudtrail.tf index 46cecac..ecc9915 100644 --- a/s3_cloudtrail.tf +++ b/s3_cloudtrail.tf @@ -12,7 +12,7 @@ resource "aws_s3_bucket" "cloudtrail_bucket" { } } - tags = "${merge(var.tags, map("Name", format("%s", local.bucket_name)))}" + tags = "${merge(var.tags, map(var.name_tag_name, format("%s", local.bucket_name)))}" } resource "aws_s3_bucket_policy" "cloudtrail_bucket_policy" { diff --git a/variables.tf b/variables.tf index df8a4e8..f6f9b16 100644 --- a/variables.tf +++ b/variables.tf @@ -58,4 +58,10 @@ variable "trail_bucket_default_encryption_key" { variable "tags" { description = "A map of tags to add to all resources" default = {} + type = "map" +} + +variable "name_tag_name" { + description = "Name of the 'name' tag that is added to, for example, the S3 resources" + default = "Name" }