Merge pull request #30 from babbel/resource-specific-tags

Add support for resource-specific tags
babbel · Sep 24, 2024 · 73d42e7 · 73d42e7
2 parents 94d827c + 0761f85
commit 73d42e7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/bucket.tf b/bucket.tf
@@ -1,7 +1,7 @@
 resource "aws_s3_bucket" "this" {
   bucket = var.bucket_name
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.s3_bucket_tags)
 }
 
 data "aws_iam_policy_document" "bucket_policy" {

diff --git a/cloudfront.tf b/cloudfront.tf
@@ -77,7 +77,7 @@ resource "aws_cloudfront_distribution" "this" {
     }
   }
 
-  tags = var.default_tags
+  tags = merge(var.default_tags, var.cloudfront_distribution_tags)
 }
 
 locals {

diff --git a/variables.tf b/variables.tf
@@ -46,6 +46,15 @@ Name of the S3 bucket to create.
 EOS
 }
 
+variable "cloudfront_distribution_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the CloudFront distribution created by this module. Tags in this map will override tags in `var.default_tags`.
+EOS
+}
+
 variable "custom_error_response" {
   type = list(
     object({
@@ -89,6 +98,15 @@ Supported HTTP versions set on the CloudFront distribution.
 EOS
 }
 
+variable "s3_bucket_tags" {
+  type    = map(string)
+  default = {}
+
+  description = <<EOS
+Map of tags assigned to the S3 bucket created by this module. Tags in this map will override tags in `var.default_tags`.
+EOS
+}
+
 variable "trusted_key_groups" {
   type = list(
     object({
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ resource "aws_cloudfront_distribution" "this" { @@
         }
       }
-      tags = var.default_tags
+      tags = merge(var.default_tags, var.cloudfront_distribution_tags)
     }
     locals {
@@ Expand Down @@