Merge pull request #27 from clouddrove/feature/elasticcache

update example.tf and added coustom tags with tag variable

Author: Sohan Yadav

.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'

.gitignore

@@ -1,7 +1,40 @@
+# Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+#
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+
+
+  
 # ignored files
 *.tfstate
 *.tfstate.backup
 .terraform
 .idea
 *.iml
-*.terraform.lock.hcl
+*.terraform.lock.hcl

README.yaml

@@ -91,6 +91,7 @@ usage : |-
       engine                       = "memcached"
       engine_version               = "1.5.10"
       family                       = "memcached1.5"
+      parameter_group_name         = "default.memcached1.5"
       az_mode                      = "cross-az"
       port                         = 11211
       node_type                    = "cache.t2.micro"

_example/memcached/example.tf

@@ -50,15 +50,19 @@ module "memcached" {
   environment = "test"
   label_order = ["name", "environment"]
 
-  cluster_enabled    = true
-  engine             = "memcached"
-  engine_version     = "1.5.10"
-  family             = "memcached1.5"
-  az_mode            = "cross-az"
-  port               = 11211
-  node_type          = "cache.t2.micro"
-  num_cache_nodes    = 2
-  subnet_ids         = module.subnets.public_subnet_id
-  security_group_ids = [module.memcached-sg.security_group_ids]
-  availability_zones = ["eu-west-1a", "eu-west-1b"]
+  cluster_enabled      = true
+  engine               = "memcached"
+  engine_version       = "1.5.10"
+  family               = "memcached1.5"
+  parameter_group_name = "default.memcached1.5"
+  az_mode              = "cross-az"
+  port                 = 11211
+  node_type            = "cache.t2.micro"
+  num_cache_nodes      = 2
+  subnet_ids           = module.subnets.public_subnet_id
+  security_group_ids   = [module.memcached-sg.security_group_ids]
+  availability_zones   = ["eu-west-1a", "eu-west-1b"]
+  extra_tags = {
+    Application = "CloudDrove"
+  }
 }

_example/memcached/outputs.tf

@@ -2,3 +2,9 @@ output "tags" {
   value       = module.memcached.tags
   description = "A mapping of tags to assign to the resource."
 }
+
+output "memcached_endpoint" {
+  value       = module.memcached.memcached_endpoint
+  description = "Memcached endpoint address."
+}
+

_example/redis-cluster/example.tf

@@ -61,4 +61,7 @@ module "redis-cluster" {
   replicas_per_node_group     = 2
   num_node_groups             = 1
   automatic_failover_enabled  = true
+  extra_tags = {
+    Application = "CloudDrove"
+  }
 }

_example/redis-cluster/outputs.tf

@@ -1,9 +1,14 @@
 output "id" {
-  value       = module.redis-cluster.*.id
+  value       = module.redis-cluster.id
   description = "Redis cluster id."
 }
 
 output "tags" {
   value       = module.redis-cluster.tags
   description = "A mapping of tags to assign to the resource."
 }
+
+output "redis_endpoint" {
+  value       = module.redis-cluster.redis_endpoint
+  description = "Redis endpoint address."
+}

_example/redis/example.tf

@@ -58,4 +58,7 @@ module "redis" {
   availability_zones         = ["eu-west-1a", "eu-west-1b"]
   auto_minor_version_upgrade = true
   number_cache_clusters      = 2
+  extra_tags = {
+    Application = "CloudDrove"
+  }
 }

_example/redis/outputs.tf

@@ -7,3 +7,8 @@ output "tags" {
   value       = module.redis.tags
   description = "A mapping of tags to assign to the resource."
 }
+
+output "redis_endpoint" {
+  value       = module.redis.redis_endpoint
+  description = "Redis endpoint address."
+}

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
@@ -26,6 +27,8 @@ resource "aws_elasticache_subnet_group" "default" {
   name        = module.labels.id
   subnet_ids  = var.subnet_ids
   description = var.description
+
+  tags = module.labels.tags
 }
 
 # Module      : Elasticache Replication Group
@@ -58,6 +61,7 @@ resource "aws_elasticache_replication_group" "default" {
   auth_token                    = var.auth_token
   kms_key_id                    = var.kms_key_id
   tags                          = module.labels.tags
+
 }
 
 # Module      : Elasticache Replication Group

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`)."
 }