Merge pull request #6 from clouddrove/0.15

update github-action, module tags and module update in 0.15

Author: Om Sharma

.github/workflows/readme.yml

@@ -10,32 +10,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
-      - name: Set up Python 3.7.
+      - name: 'Set up Python 3.7'
         uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 
       - name: 'create readme'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
 
 
-      - name: pre-commit check errors
+      - name: 'pre-commit check errors'
         uses: pre-commit/action@v2.0.0
         continue-on-error: true
 
-      - name: pre-commit fix erros
+      - name: 'pre-commit fix errors'
         uses: pre-commit/action@v2.0.0
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v8.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'
@@ -51,4 +51,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()

.github/workflows/terraform.yml

@@ -5,61 +5,133 @@ on:
       - master
 
 jobs:
-  terraform:
-    name: 'Terraform'
+  fmt:
+    name: 'terraform fmt'
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
-      - name: Configure AWS Credentials
+      - name: 'Terraform Format'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'fmt'
+      - name: 'Terraform Format'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'fmt'
+
+  private-hostedzone:
+    name: 'private-hostedzone'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2.3.4
+
+      - name: 'Configure AWS Credentials'
         uses: clouddrove/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
           aws-region: us-east-2
 
-      - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v4.0'
-        with:
-          actions_subcommand: 'fmt'
-
-      - name: 'Terraform init private-hostedzone'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Terraform init for private-hostedzone'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/private-hostedzone
 
-      - name: 'Terraform validate private-hostedzone'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Terraform validate for private-hostedzone'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/private-hostedzone
 
-      - name: 'Terraform init vpc-association'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Terraform plan for private-hostedzone'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
-          actions_subcommand: 'init'
-          tf_actions_working_dir: ./_example/vpc-association
+          actions_subcommand: 'plan'
+          tf_actions_working_dir: ./_example/private-hostedzone
+
+  public-hostedzone:
+    name: 'public-hostedzone'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2.3.4
 
-      - name: 'Terraform validate vpc-association'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Configure AWS Credentials'
+        uses: clouddrove/configure-aws-credentials@v1
         with:
-          actions_subcommand: 'validate'
-          tf_actions_working_dir: ./_example/vpc-association
+          aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
+          aws-region: us-east-2
 
-      - name: 'Terraform init public-hostedzone'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Terraform init for public-hostedzone'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/public-hostedzone
 
-      - name: 'Terraform validate public-hostedzone'
-        uses: 'clouddrove/github-actions@v4.0'
+      - name: 'Terraform validate for public-hostedzone'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/public-hostedzone
 
+
+  vpc-association:
+    name: 'vpc-association'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2.3.4
+
+      - name: 'Configure AWS Credentials'
+        uses: clouddrove/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.TEST_AWS_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
+          aws-region: us-east-2
+
+      - name: 'Terraform init for vpc-association'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'init'
+          tf_actions_working_dir: ./_example/vpc-association
+
+      - name: 'Terraform validate for vpc-association'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'validate'
+          tf_actions_working_dir: ./_example/vpc-association
+
+      - name: 'Terraform plan for vpc-association'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'plan'
+          tf_actions_working_dir: ./_example/vpc-association
+
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - fmt
+      - private-hostedzone
+      - public-hostedzone
+      - vpc-association
+    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:

.pre-commit-config.yaml

@@ -1,13 +1,21 @@
 repos:
-  - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.43.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.2.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

README.md

@@ -7,7 +7,7 @@
     Terraform AWS Route53
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     Terraform module to create Route53 resource on AWS for zone and record set.
      </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)
@@ -210,7 +210,7 @@ Here are some examples of how you can use this module in your inventory structur
 
 
 ## 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
@@ -219,7 +219,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-route53/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-route53)!

README.yaml

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-route53
 # Badges to display
 badges:
   - name: "Terraform"
-    image: "https://img.shields.io/badge/terraform-v0.13-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"
@@ -40,11 +40,11 @@ usage: |-
   ```hcl
     module "route53" {
       source        = "clouddrove/route53/aws"
-      version       = "0.13.0"
+      version       = "0.15.0"
       name           = "route53"
       application    = "clouddrove"
       environment    = "test"
-      label_order    = ["environment", "name", "application"]
+      label_order    = ["environment", "name"]
       public_enabled = true
       record_enabled = true
       domain_name    = "clouddrove.com"
@@ -73,11 +73,11 @@ usage: |-
   ```hcl
     module "route53" {
       source        = "clouddrove/route53/aws"
-      version       = "0.13.0"
+      version       = "0.15.0"
       name            = "route53"
       application     = "clouddrove"
       environment     = "test"
-      label_order     = ["environment", "name", "application"]
+      label_order     = ["environment", "name"]
       private_enabled = true
       record_enabled  = true
       domain_name     = "clouddrove.com"
@@ -104,11 +104,11 @@ usage: |-
   ```hcl
     module "route53" {
       source        = "clouddrove/route53/aws"
-      version       = "0.13.0"
+      version       = "0.15.0"
       name                 = "route53"
       application          = "clouddrove"
       environment          = "test"
-      label_order          = ["environment", "name", "application"]
+      label_order          = ["environment", "name"]
       private_enabled      = true
       enabled              = true
       domain_name          = "clouddrove.com"

_example/private-hostedzone/example.tf

@@ -6,9 +6,8 @@ module "route53" {
   source = "../../"
 
   name            = "route53"
-  application     = "clouddrove"
   environment     = "test"
-  label_order     = ["environment", "name", "application"]
+  label_order     = ["environment", "name"]
   private_enabled = true
   record_enabled  = true
 

_example/public-hostedzone/example.tf

@@ -6,9 +6,8 @@ module "route53" {
   source = "../../"
 
   name           = "route53"
-  application    = "clouddrove"
   environment    = "test"
-  label_order    = ["environment", "name", "application"]
+  label_order    = ["environment", "name"]
   public_enabled = true
   record_enabled = true
 

_example/vpc-association/example.tf

@@ -6,9 +6,8 @@ module "route53" {
   source = "../../"
 
   name            = "route53"
-  application     = "clouddrove"
   environment     = "test"
-  label_order     = ["environment", "name", "application"]
+  label_order     = ["environment", "name"]
   private_enabled = true
   enabled         = true