Merge pull request #15 from clouddrove/0.15

update github-action, module tags and update in 0.15

Author: Om Sharma

.github/workflows/readme.yml

@@ -12,29 +12,30 @@ jobs:
       - name: 'Checkout'
         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@v6.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@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

.github/workflows/terraform.yml

@@ -13,16 +13,18 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'fmt'
+      - name: 'Terraform Format'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'fmt'
 
-  Basic:
-    name: 'Init,Validate,PLan of Basic example'
-    needs: fmt
+  basic:
+    name: 'basic'
     runs-on: ubuntu-latest
     steps:
-
       - name: 'Checkout'
         uses: actions/checkout@v2.3.4
 
@@ -33,20 +35,77 @@ jobs:
           aws-secret-access-key: ${{ secrets.TEST_AWS_ACCESS_SECRET_KEY }}
           aws-region: us-east-2
 
-      - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform init for basic'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/basic
 
-      - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform validate for basic'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/basic
 
-      - name: 'Terraform plan'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform plan for basic'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/basic
+
+  complete:
+    name: 'complete'
+    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 complete'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'init'
+          tf_actions_working_dir: ./_example/complete
+
+      - name: 'Terraform validate complete'
+        uses: 'clouddrove/github-actions@v8.0'
+        with:
+          actions_subcommand: 'validate'
+          tf_actions_working_dir: ./_example/complete
+
+
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - fmt
+      - basic
+      - complete
+    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:
+          status: ${{ job.status }}
+          fields: repo,author
+          author_name: 'CloudDrove'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
+        if: always()

.github/workflows/terratest.yml

@@ -5,9 +5,10 @@ repos:
     hooks:
       - id: terraform-fmt
       - id: shellcheck
+      - id: tflint
 
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0 # Use the ref you want to point at
+    rev: v4.0.1 # Use the ref you want to point at
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

.pre-commit-config.yaml

@@ -7,7 +7,7 @@
     Terraform AWS Api Gateway
 </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 create api gateway with it's basic elements.
      </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)
@@ -327,7 +327,7 @@ Here are examples of how you can use this module in your inventory structure:
 
 
 ## 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
@@ -336,7 +336,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-api-gateway/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-api-gateway)!

README.md

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-api-gateway
 # 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"
@@ -40,7 +40,7 @@ usage: |-
   ```hcl
     module "api-gateway" {
       source        = "clouddrove/api-gateway/aws"
-      version       = "0.14.0"
+      version       = "0.15.0"
       name          = "api-gateway"
       environment   = "test"
       label_order   = ["name", "environment"]

README.yaml

@@ -5,7 +5,6 @@ provider "aws" {
 module "api-gateway" {
   source      = "../../"
   name        = "api-gateway"
-  repository  = "https://registry.terraform.io/modules/clouddrove/api-gateway/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
   enabled     = true

_example/basic/example.tf

@@ -6,7 +6,6 @@ module "api-gateway" {
   source = "../../"
 
   name        = "api-gateway"
-  repository  = "https://registry.terraform.io/modules/clouddrove/api-gateway/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
   enabled     = true

_example/complete/example.tf

@@ -6,7 +6,8 @@
 #              for resources. You can use terraform-labels to implement a strict naming
 #              convention.
 module "labels" {
-  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.14.0"
+  source  = "clouddrove/labels/aws"
+  version = "0.15.0"
 
   enabled     = var.enabled
   name        = var.name

main.tf

@@ -8,7 +8,7 @@ variable "name" {
 
 variable "repository" {
   type        = string
-  default     = ""
+  default     = "https://github.com/clouddrove/terraform-aws-api-gateway"
   description = "Terraform current module repo"
 
   validation {