added extra_tags variable for custom tags

Author: bobbysinghh

.github/workflows/readme.yml

@@ -18,7 +18,7 @@ jobs:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
@@ -35,7 +35,7 @@ jobs:
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

.github/workflows/terraform.yml

@@ -20,30 +20,30 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'fmt'
 
       - name: 'Terraform init for memcached'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform validate for memcached'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform plan for memcached'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/memcached
 
       - name: 'Terraform init for redis'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/redis
@@ -55,25 +55,25 @@ jobs:
           tf_actions_working_dir: ./_example/redis
 
       - name: 'Terraform plan for redis'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/redis
 
       - name: 'Terraform init for redis-cluster'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/redis-cluster
 
       - name: 'Terraform validate for redis-cluster'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/redis-cluster
 
       - name: 'Terraform plan for redis-cluster'
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/redis-cluster

.github/workflows/terratest.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: 'Terratest for redis'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/redis'
@@ -33,7 +33,7 @@ jobs:
 
       - name: 'Terratest for redis-cluster'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v9.0'
+        uses: 'clouddrove/github-actions@v9.0.1'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/redis-cluster'

main.tf

@@ -17,6 +17,7 @@ module "labels" {
   environment = var.environment
   managedby   = var.managedby
   label_order = var.label_order
+  extra_tags  = var.extra_tags
 }
 
 # Module      : Elasticache Subnet Group
@@ -27,7 +28,7 @@ resource "aws_elasticache_subnet_group" "default" {
   subnet_ids  = var.subnet_ids
   description = var.description
 
-  tags = merge(var.tags, module.labels.tags)
+  tags = module.labels.tags
 }
 
 # Module      : Elasticache Replication Group
@@ -59,7 +60,7 @@ resource "aws_elasticache_replication_group" "default" {
   transit_encryption_enabled    = var.transit_encryption_enabled
   auth_token                    = var.auth_token
   kms_key_id                    = var.kms_key_id
-  tags                          = merge(var.tags, module.labels.tags)
+  tags                          = module.labels.tags
 
 }
 
@@ -91,7 +92,7 @@ resource "aws_elasticache_replication_group" "cluster" {
   transit_encryption_enabled    = var.transit_encryption_enabled
   auth_token                    = var.auth_token
   kms_key_id                    = var.kms_key_id
-  tags                          = merge(var.tags, module.labels.tags)
+  tags                          = module.labels.tags
   cluster_mode {
     replicas_per_node_group = var.replicas_per_node_group #Replicas per Shard
     num_node_groups         = var.num_node_groups         #Number of Shards
@@ -121,5 +122,5 @@ resource "aws_elasticache_cluster" "default" {
   apply_immediately            = var.apply_immediately
   preferred_availability_zones = slice(var.availability_zones, 0, var.num_cache_nodes)
   maintenance_window           = var.maintenance_window
-  tags                         = merge(var.tags, module.labels.tags)
+  tags                         = module.labels.tags
 }

outputs.tf

@@ -12,7 +12,7 @@ output "port" {
 }
 
 output "tags" {
-  value       = merge(var.tags, module.labels.tags)
+  value       = module.labels.tags
   description = "A mapping of tags to assign to the resource."
 }
 

variables.tf

@@ -36,8 +36,8 @@ variable "attributes" {
   description = "Additional attributes (e.g. `1`)."
 }
 
-variable "tags" {
-  type        = map(any)
+variable "extra_tags" {
+  type        = map(string)
   default     = {}
   description = "Additional tags (e.g. map(`BusinessUnit`,`XYZ`)."
 }