ci: update tags

terraform/environments/shared-resources/main.tf

@@ -29,7 +29,7 @@ resource "aws_resourcegroups_group" "resource_group" {
   }
 
   tags = {
-    awsApplication = "${var.project-name}-group"
+    awsApplication = "${var.project-name}"
   }
 }
 

terraform/init-state/main.tf

@@ -13,6 +13,14 @@ provider "aws" {
 
 data "aws_caller_identity" "current" {}
 
+variable "common_tags" {
+  description = "Common tags to be applied to all resources"
+  type        = map(string)
+  default = {
+    awsApplication = "personal-website"
+  }
+}
+
 variable "project-name" {
   description = "Project name"
   default     = "personal-website"
@@ -23,9 +31,29 @@ locals {
   dynamodb_table_name = "${var.project-name}-terraform-locks"
 }
 
+resource "aws_resourcegroups_group" "resource_group" {
+  name = var.project-name
+
+  resource_query {
+    query = jsonencode({
+      ResourceTypeFilters = ["AWS::AllSupported"]
+      TagFilters = [
+        {
+          Key    = "awsApplication"
+          Values = [var.common_tags["awsApplication"]]
+        }
+      ]
+    })
+  }
+
+  tags = {
+    awsApplication = "${var.project-name}-group"
+  }
+}
 
 resource "aws_s3_bucket" "terraform_state" {
   bucket = local.bucket_name
+  tags   = var.common_tags
 
   lifecycle {
     prevent_destroy = true
@@ -43,6 +71,7 @@ resource "aws_dynamodb_table" "terraform_locks" {
   name         = local.dynamodb_table_name
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "LockID"
+  tags         = var.common_tags
 
   attribute {
     name = "LockID"