Sync from management repo

Author: tomarv2

.github/workflows/pre-commit.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Build matrix
         id: matrix
         run: |
-          DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/versions.tf', '') for x in glob.glob('./**/versions.tf', recursive=True)]))")
+          DIRS=$(python -c "import json; import glob; print(json.dumps([x.replace('/providers.tf', '') for x in glob.glob('./**/providers.tf', recursive=True)]))")
           echo "::set-output name=directories::$DIRS"
     outputs:
       directories: ${{ steps.matrix.outputs.directories }}

.gitignore

@@ -29,6 +29,7 @@ override.tf.json
 # example: *tfplan*
 
 .idea/
+.vscode/
 .terraform.lock.hcl
 
 # go
@@ -81,15 +82,10 @@ _testmain.go
 
 # Python
 # Editors
-.vscode/
-.idea/
 
 # Vagrant
 .vagrant/
 
-# Mac/OSX
-.DS_Store
-
 # Windows
 Thumbs.db
 
@@ -99,9 +95,6 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-# C extensions
-*.so
-
 # Distribution / packaging
 .Python
 build/
@@ -206,9 +199,14 @@ venv.bak/
 .dmypy.json
 dmypy.json
 
-# ignore test related file(s)
-**/test**
-**.
-
-# ignore terraform external modules
+# Terraform external modules
 **/.external_modules
+
+# Test files and directories
+**/[Tt]est/*
+**/[Tt]ests/*
+**/*[Tt]est*/*
+**/*[Tt]ests*/*
+
+# remote_backend.tf file
+**/remote_backend.tf

.pre-commit-config.yaml

@@ -1,5 +1,5 @@
 repos:
-  - repo: git://github.com/antonbabenko/pre-commit-terraform
+  - repo: https://github.com/antonbabenko/pre-commit-terraform
     rev: v1.60.0
     hooks:
       - id: terraform_fmt

README.md

@@ -13,7 +13,7 @@
         <img src="https://img.shields.io/twitter/follow/varuntomar2019?style=social&logo=twitter"></a>
 </p>
 
-# Terraform module for [AWS Elasticache](https://registry.terraform.io/modules/tomarv2/elasticache/aws/latest)
+## Terraform module for [AWS Elasticache](https://registry.terraform.io/modules/tomarv2/elasticache/aws/latest)
 
 ####
 
@@ -22,17 +22,17 @@
 > :arrow_right:  Terraform module for [Google Memorystore](https://registry.terraform.io/modules/tomarv2/memorystore/google/latest)
 
 
-## Versions
+### Versions
 
 - Module tested for Terraform 1.0.1.
-- AWS provider version [3.63](https://registry.terraform.io/providers/hashicorp/aws/latest)
+- AWS provider version [3.74](https://registry.terraform.io/providers/hashicorp/aws/latest)
 - `main` branch: Provider versions not pinned to keep up with Terraform releases
 - `tags` releases: Tags are pinned with versions (use <a href="https://github.com/tomarv2/terraform-aws-elasticache/tags" alt="GitHub tag">
         <img src="https://img.shields.io/github/v/tag/tomarv2/terraform-aws-elasticache" /></a> in your releases)
 
-## Usage
+### Usage
 
-### Option 1:
+#### Option 1:
 
 ```
 terrafrom init
@@ -42,9 +42,9 @@ terraform destroy -var='teamid=tryme' -var='prjid=project1'
 ```
 **Note:** With this option please take care of remote state storage
 
-### Option 2:
+#### Option 2:
 
-#### Recommended method (stores remote state in S3 using `prjid` and `teamid` to create directory structure):
+##### Recommended method (stores remote state in S3 using `prjid` and `teamid` to create directory structure):
 
 - Create python 3.8+ virtual environment
 ```
@@ -90,17 +90,13 @@ tf -c=aws apply -var='teamid=foo' -var='prjid=bar'
 tf -c=aws destroy -var='teamid=foo' -var='prjid=bar'
 ```
 
-**NOTE:**
-
-- Read more on [tfremote](https://github.com/tomarv2/tfremote)
----
-
+**Note:** Read more on [tfremote](https://github.com/tomarv2/tfremote)
 ```
 terraform {
   required_version = ">= 1.0.1"
   required_providers {
     aws = {
-      version = "~> 3.63"
+      version = "~> 3.74"
     }
   }
 }

examples/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 1.0.1"
   required_providers {
     aws = {
-      version = "~> 3.63"
+      version = "~> 3.74"
     }
   }
 }

locals.tf

@@ -3,13 +3,6 @@ module "global" {
 }
 
 locals {
-  shared_tags = tomap(
-    {
-      "Name"    = "${var.teamid}-${var.prjid}",
-      "team"    = var.teamid,
-      "project" = var.prjid
-    }
-  )
   account_id = data.aws_caller_identity.current.account_id
   region     = data.aws_region.current.name
 }

outputs.tf

@@ -4,7 +4,7 @@ output "elasticache_id" {
 }
 
 output "elasticache_cluster_address" {
-  value       = aws_elasticache_cluster.default.*.cluster_address
+  value       = aws_elasticache_cluster.default.*.cache_nodes.0.address
   description = "Elasticache Cluster address"
 }
 

versions.tf renamed to providers.tf

@@ -2,7 +2,7 @@ terraform {
   required_version = ">= 1.0.1"
   required_providers {
     aws = {
-      version = "~> 3.63"
+      version = "~> 3.74"
     }
   }
 }

tags.tf

@@ -0,0 +1,9 @@
+locals {
+  shared_tags = tomap(
+    {
+      "Name"    = "${var.teamid}-${var.prjid}",
+      "Team"    = var.teamid,
+      "Project" = var.prjid
+    }
+  )
+}