refactor: standardize AWS resource tagging strategy

Author: tiagoboeing

cloudfront-cdn/certificate.tf

@@ -3,8 +3,7 @@ resource "aws_acm_certificate" "certificate" {
   validation_method = "DNS"
 
   tags = {
-    Stage   = local.stage,
-    Service = local.service
+    Name = "${local.resource_prefix_name}-certificate"
   }
 }
 

cloudfront-cdn/cloudfront.tf

@@ -59,8 +59,7 @@ resource "aws_cloudfront_distribution" "cloudfront" {
 
 
   tags = {
-    Stage   = local.stage,
-    Service = local.service
+    Name = "${local.resource_prefix_name}-cloudfront"
   }
 
   depends_on = [

cloudfront-cdn/main.tf

@@ -16,6 +16,29 @@ data "aws_route53_zone" "domain_zone" {
   private_zone = local.route53_private_zone
 }
 
+# Resource group
+resource "aws_resourcegroups_group" "service" {
+  name = local.resource_prefix_name
+
+  resource_query {
+    query = <<JSON
+    {
+      "ResourceTypeFilters": ["AWS::AllSupported"],
+      "TagFilters": [
+        {
+          "Key": "Service",
+          "Values": ["${local.resource_prefix_name}"]
+        }
+      ]
+    }
+    JSON
+  }
+
+  tags = {
+    Name = "${local.resource_prefix_name}-rg"
+  }
+}
+
 
 
 

cloudfront-cdn/provider.tf

@@ -9,4 +9,12 @@ terraform {
 
 provider "aws" {
   skip_credentials_validation = true
+
+  default_tags {
+    tags = {
+      Service     = local.resource_prefix_name # Will be: ${service_name}-${stage}
+      ServiceName = local.service
+      Stage       = local.stage
+    }
+  }
 }

cloudfront-cdn/s3.tf

@@ -2,8 +2,7 @@ resource "aws_s3_bucket" "bucket" {
   bucket = "${local.resource_prefix_name}-bucket-${data.aws_caller_identity.current.account_id}"
 
   tags = {
-    Stage   = local.stage,
-    Service = local.service
+    Name = "${local.resource_prefix_name}-bucket"
   }
 }