Merge pull request #13 from clouddrove/0.15

upgrade in 0.15

Author: Nikita Dugar

.github/workflows/terraform.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@master
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'fmt'
 
@@ -34,19 +34,19 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform init multi-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/multi-node
 
       - name: 'Terraform validate multi-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/multi-node
 
       - name: 'Terraform plan multi-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/multi-node
@@ -67,23 +67,42 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform init single-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/single-node
 
       - name: 'Terraform validate single-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/single-node
 
       - name: 'Terraform plan single-node'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/single-node
 
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - fmt
+      - multi-node
+      - single-node
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2.3.4
+
+      - name: 'Install Tflint'
+        run: |
+          curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
+
+      - name: 'Pre-Commit 🔎'
+        uses: pre-commit/action@v2.0.3
+        continue-on-error: true
+
       - name: 'Slack Notification'
         uses: clouddrove/action-slack@v2
         with:
@@ -93,4 +112,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()

.github/workflows/terratest.yml

@@ -23,7 +23,7 @@ jobs:
 
       - name: 'Terratest single'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/single-node'
@@ -32,7 +32,7 @@ jobs:
 
       - name: 'Terratest multi'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/multi-node'
@@ -48,4 +48,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()

.gitignore

@@ -6,3 +6,5 @@
 *.iml
 .terraform.tfstate.lock.info
 go.sum
+*.terrafrom.lock.hcl
+*.crash

.pre-commit-config.yaml

@@ -1,13 +1,21 @@
 repos:
-  - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.45.0
+
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.12 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
     hooks:
-    - id: terraform_fmt
+      - id: terraform-fmt
+      - id: shellcheck
+      - id: tflint
 
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1 # Use the ref you want to point at
     hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+      - id: check-byte-order-marker
+      - id: check-executables-have-shebangs
       - id: check-merge-conflict
+      - id: debug-statements
       - id: check-yaml
       - id: check-added-large-files
-      - id: trailing-whitespace

Makefile

@@ -1,3 +1,3 @@
 export GENIE_PATH ?= $(shell 'pwd')/../../../genie
 
-include $(GENIE_PATH)/Makefile
+include $(GENIE_PATH)/Makefile

README.md

@@ -7,7 +7,7 @@
     Terraform AWS Elasticsearch
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     Terraform module to create an Elasticsearch resource on AWS.
      </p>
 
@@ -38,7 +38,7 @@
 <hr>
 
 
-We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure. 
+We eat, drink, sleep and most importantly love **DevOps**. We are working towards strategies for standardizing architecture while ensuring security for the infrastructure. We are strong believer of the philosophy <b>Bigger problems are always solved by breaking them into smaller manageable problems</b>. Resonating with microservices architecture, it is considered best-practice to run database, cluster, storage in smaller <b>connected yet manageable pieces</b> within the infrastructure.
 
 This module is basically combination of [Terraform open source](https://www.terraform.io/) and includes automatation tests and examples. It also helps to create and improve your infrastructure with minimalistic code instead of maintaining the whole infrastructure code yourself.
 
@@ -49,7 +49,7 @@ We have [*fifty plus terraform modules*][terraform_modules]. A few of them are c
 
 ## Prerequisites
 
-This module has a few dependencies: 
+This module has a few dependencies:
 
 - [Terraform 0.13](https://learn.hashicorp.com/terraform/getting-started/install.html)
 - [Go](https://golang.org/doc/install)
@@ -206,7 +206,7 @@ Note: There are some type of instances which not support encryption and EBS opti
 
 
 ## Testing
-In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system. 
+In this module testing is performed with [terratest](https://github.com/gruntwork-io/terratest) and it creates a small piece of infrastructure, matches the output like ARN, ID and Tags name etc and destroy infrastructure in your AWS account. This testing is written in GO, so you need a [GO environment](https://golang.org/doc/install) in your system.
 
 You need to run the following command in the testing folder:
 ```hcl
@@ -215,7 +215,7 @@ You need to run the following command in the testing folder:
 
 
 
-## Feedback 
+## Feedback
 If you come accross a bug or have any feedback, please log it in our [issue tracker](https://github.com/clouddrove/terraform-aws-elasticsearch/issues), or feel free to drop us an email at [hello@clouddrove.com](mailto:hello@clouddrove.com).
 
 If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-elasticsearch)!

README.yaml

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-elasticsearch
 # Badges to display
 badges:
   - name: "Terraform"
-    image: "https://img.shields.io/badge/terraform-v0.14-green"
+    image: "https://img.shields.io/badge/terraform-v0.15-green"
     url: "https://www.terraform.io"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -38,9 +38,8 @@ usage: |-
   ```hcl
       module "elasticsearch" {
       source                                         = "clouddrove/elasticsearch/aws"
-      version                                        = "0.14.0"
+      version                                        = "0.15.0"
       name                                           = "es"
-      repository                                     = "https://registry.terraform.io/modules/clouddrove/elasticsearch/aws/0.14.0"
       environment                                    = "test"
       label_order                                    = ["name", "environment"]
       enable_iam_service_linked_role                 = true
@@ -70,9 +69,8 @@ usage: |-
   ```hcl
       module "elasticsearch" {
        source                        = "clouddrove/elasticsearch/aws"
-      version                        = "0.14.0"
+      version                        = "0.15.0"
       name                           = "es"
-      repository                     = "https://registry.terraform.io/modules/clouddrove/elasticsearch/aws/0.14.0"
       environment                    = "test"
       label_order                    = ["name", "environment"]
       domain_name                    = "clouddrove"

_example/multi-node/example.tf

@@ -4,21 +4,19 @@ provider "aws" {
 
 module "vpc" {
   source  = "clouddrove/vpc/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "vpc"
-  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
   cidr_block  = "172.16.0.0/16"
 }
 
 module "public_subnets" {
   source  = "clouddrove/subnet/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "public-subnet"
-  repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -32,10 +30,9 @@ module "public_subnets" {
 
 module "security_group" {
   source  = "clouddrove/security-group/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "ingress_security_groups"
-  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -47,16 +44,15 @@ module "security_group" {
 module "elasticsearch" {
   source                         = "../../"
   name                           = "es"
-  repository                     = "https://registry.terraform.io/modules/clouddrove/elasticsearch/aws/0.14.0"
-  environment                    = "test"
+  environment                    = "test1"
   label_order                    = ["name", "environment"]
   domain_name                    = "clouddrove"
   enable_iam_service_linked_role = true
   security_group_ids             = [module.security_group.security_group_ids]
   subnet_ids                     = tolist(module.public_subnets.public_subnet_id)
   zone_awareness_enabled         = true
   availability_zone_count        = 2
-  elasticsearch_version          = "7.1"
+  elasticsearch_version          = "7.8"
   instance_type                  = "t2.small.elasticsearch"
   instance_count                 = 2
   iam_actions                    = ["es:ESHttpGet", "es:ESHttpPut", "es:ESHttpPost"]

_example/multi-node/outputs.tf

@@ -6,4 +6,4 @@ output "arn" {
 output "tags" {
   value       = module.elasticsearch.tags
   description = "A mapping of tags to assign to the resource."
-}
+}

_example/single-node/example.tf

@@ -4,11 +4,10 @@ provider "aws" {
 
 module "vpc" {
   source  = "clouddrove/vpc/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
 
   name        = "vpc"
-  repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -17,10 +16,9 @@ module "vpc" {
 
 module "public_subnets" {
   source  = "clouddrove/subnet/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "public-subnet"
-  repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -34,10 +32,9 @@ module "public_subnets" {
 
 module "security_group" {
   source  = "clouddrove/security-group/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "ingress_security_groups"
-  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -49,13 +46,12 @@ module "security_group" {
 module "elasticsearch" {
   source                                         = "../../"
   name                                           = "es"
-  repository                                     = "https://registry.terraform.io/modules/clouddrove/elasticsearch/aws/0.14.0"
   environment                                    = "test"
   label_order                                    = ["name", "environment"]
   enable_iam_service_linked_role                 = true
   security_group_ids                             = [module.security_group.security_group_ids]
   subnet_ids                                     = tolist(module.public_subnets.public_subnet_id)
-  elasticsearch_version                          = "7.1"
+  elasticsearch_version                          = "7.8"
   instance_type                                  = "t2.small.elasticsearch"
   instance_count                                 = 1
   iam_actions                                    = ["es:ESHttpGet", "es:ESHttpPut", "es:ESHttpPost"]
@@ -66,6 +62,7 @@ module "elasticsearch" {
   log_publishing_index_cloudwatch_log_group_arn  = true
 
   enforce_https       = true
+  cognito_enabled     = false
   tls_security_policy = "Policy-Min-TLS-1-0-2019-07"
   public_enabled      = false
   dns_enabled         = false
@@ -76,4 +73,4 @@ module "elasticsearch" {
   advanced_options = {
     "rest.action.multi.allow_explicit_index" = "true"
   }
-}
+}