Merge pull request #10 from clouddrove/0.15

update github-action,module tags and update in 0.15

Author: Om Sharma

.github/workflows/readme.yml

@@ -10,15 +10,15 @@ 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@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'readme'
           github_token: '${{ secrets.GITHUB}}'
@@ -30,12 +30,12 @@ jobs:
         uses: pre-commit/[email protected]
         continue-on-error: true
 
-      - name: 'pre-commit fix erros'
+      - name: 'pre-commit fix errors'
         uses: pre-commit/[email protected]
         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,7 +13,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: 'Terraform Format'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'fmt'
 
@@ -32,13 +32,13 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
 
       - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example
@@ -51,7 +51,7 @@ jobs:
         uses: actions/[email protected]
 
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
@@ -64,7 +64,37 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terraform plan'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example
+
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - fmt
+      - plan
+      - validate
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/[email protected]
+
+      - name: 'Install Tflint'
+        run: |
+          curl https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
+
+      - name: 'Pre-Commit 🔎'
+        uses: pre-commit/[email protected]
+        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

@@ -22,7 +22,7 @@ jobs:
           aws-region: us-east-2
 
       - name: 'Terratest'
-        uses: 'clouddrove/github-actions@v6.0'
+        uses: 'clouddrove/github-actions@v8.0'
         with:
           actions_subcommand: 'terratest'
           if: ${{ github.event.label.name == 'terratest' }}

.pre-commit-config.yaml

@@ -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

README.md

@@ -7,7 +7,7 @@
     Terraform AWS SFTP
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     This terraform module is used to create sftp on AWS for S3.
      </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)
@@ -124,7 +124,7 @@ Here is an example 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
@@ -133,7 +133,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-sftp/issues), or feel free to drop us an email at [[email protected]](mailto:[email protected]).
 
 If you have found it worth your time, go ahead and give us a ★ on [our GitHub](https://github.com/clouddrove/terraform-aws-sftp)!

README.yaml

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

_example/example.tf

@@ -4,16 +4,15 @@ provider "aws" {
 
 module "s3_bucket" {
   source  = "clouddrove/s3/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "clouddrove-sftp-bucket"
   environment = "test"
   label_order = ["name", "environment"]
 
-  versioning     = true
-  acl            = "private"
-  bucket_enabled = true
-  force_destroy  = true
+  versioning    = true
+  acl           = "private"
+  force_destroy = true
 }
 
 module "sftp" {

main.tf

@@ -7,7 +7,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"
 
   name        = var.name
   repository  = var.repository

variables.tf

@@ -8,7 +8,7 @@ variable "name" {
 
 variable "repository" {
   type        = string
-  default     = "https://registry.terraform.io/modules/clouddrove/sftp/aws"
+  default     = "https://github.com/clouddrove/terraform-aws-sftp"
   description = "Terraform current module repo"
 }