Adapt tags to receive map of tags

main.tf

@@ -62,13 +62,7 @@ resource "aws_s3_bucket" "s3_default" {
     }
   }
 
-  tags = {
-    environment = var.environment
-    application = var.application
-    vs          = var.vs
-    project     = var.project
-    team        = var.team
-  }
+  tags = var.tags
 
 }
 
@@ -135,13 +129,7 @@ resource "aws_s3_bucket" "s3_website" {
     }
   }
 
-  tags = {
-    environment = var.environment
-    application = var.application
-    vs          = var.vs
-    project     = var.project
-    team        = var.team
-  }
+  tags = var.tags
 
 }
 
@@ -207,13 +195,7 @@ resource "aws_s3_bucket" "s3_logging" {
     target_prefix = var.target_prefix
   }
 
-  tags = {
-    environment = var.environment
-    application = var.application
-    vs          = var.vs
-    project     = var.project
-    team        = var.team
-  }
+  tags = var.tags
 
 }
 
@@ -283,13 +265,7 @@ resource "aws_s3_bucket" "s3_encryption" {
     }
   }
 
-  tags = {
-    environment = var.environment
-    application = var.application
-    vs          = var.vs
-    project     = var.project
-    team        = var.team
-  }
+  tags = var.tags
 
 }
 

variables.tf

@@ -6,31 +6,6 @@ variable "name" {
   description = "Name  (e.g. `app` or `cluster`)."
 }
 
-variable "environment" {
-  type        = string
-  description = "Environment name to be appended on resources"
-}
-
-variable "application" {
-  type        = string
-  description = "Application name to identify resources"
-}
-
-variable "project" {
-  type        = string
-  description = "Project name to identify resources"
-}
-
-variable "team" {
-  type        = string
-  description = "Team assigned to project"
-}
-
-variable "vs" {
-  type        = string
-  description = "Value Stream"
-}
-
 variable "label_order" {
   type        = list
   default     = []