Merge pull request #15 from clouddrove/0.14

upgrade to 0.14

Author: Nikita Dugar

.github/workflows/readme.yml

@@ -12,30 +12,30 @@ jobs:
       - name: 'Checkout'
         uses: actions/checkout@master
 
-      - 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@v6.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/[email protected]
         continue-on-error: true
 
-      - name: pre-commit fix erros
+      - name: 'pre-commit fix erros'
         uses: pre-commit/[email protected]
         continue-on-error: true
 
       - name: 'push readme'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         continue-on-error: true
         with:
           actions_subcommand: 'push'

.github/workflows/terraform.yml

@@ -5,50 +5,66 @@ 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/[email protected]'
+        with:
+          actions_subcommand: 'fmt'
+
+  validate:
+    name: 'terraform validate'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/[email protected]
+
+      - 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/[email protected]'
-        with:
-          actions_subcommand: 'fmt'
-
       - name: 'Terraform init'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
 
       - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example
 
-      - name: 'Terraform plan'
-        uses: 'clouddrove/[email protected]'
+  plan:
+    name: 'terraform plan'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/[email protected]
+
+      - name: 'Terraform init'
+        uses: 'clouddrove/[email protected]'
         with:
-          actions_subcommand: 'plan'
+          actions_subcommand: 'init'
           tf_actions_working_dir: ./_example
 
-      - name: 'Slack Notification'
-        uses: clouddrove/action-slack@v2
+      - 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 plan'
+        uses: 'clouddrove/[email protected]'
         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()
+          actions_subcommand: 'plan'
+          tf_actions_working_dir: ./_example

.github/workflows/terratest.yml

@@ -6,29 +6,27 @@ on:
     types: [labeled]
 
 jobs:
-  terraform:
-    name: 'Terraform'
+  Terratest:
+    name: 'Terratest'
     runs-on: ubuntu-latest
     steps:
 
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
-      - name: Configure AWS Credentials
+      - 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: 'Terratest'
-        if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/[email protected]'
+        uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'terratest'
+          if: ${{ github.event.label.name == 'terratest' }}
           tf_actions_working_dir: '_test'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 'Slack Notification'
         uses: clouddrove/action-slack@v2
@@ -39,4 +37,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()

.gitignore

@@ -4,4 +4,4 @@
 .terraform
 .idea
 *.iml
-go.sum
+*.terraform.lock.hcl

.pre-commit-config.yaml

@@ -1,13 +1,20 @@
 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
 
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0 # 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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Cloud Drove
+Copyright (c) 2021 Cloud Drove
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.yaml

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-security-group
 # Badges to display
 badges:
   - name: "Terraform"
-    image: "https://img.shields.io/badge/terraform-v0.13-green"
+    image: "https://img.shields.io/badge/terraform-v0.14-green"
     url: "https://www.terraform.io"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-MIT-blue.svg"
@@ -40,12 +40,11 @@ usage: |-
   # use this
     module "security_group" {
       source        = "clouddrove/security-group/aws"
-      version       = "0.13.0"
+      version       = "0.14.0"
       name          = "security-group"
-      application   = "clouddrove"
       environment   = "test"
       protocol      = "tcp"
-      label_order   = ["environment", "application", "name"]
+      label_order   = ["name", "environment"]
       vpc_id        = "vpc-xxxxxxxxx"
       allowed_ip    = ["172.16.0.0/16", "10.0.0.0/16"]
       allowed_ipv6  = ["2405:201:5e00:3684:cd17:9397:5734:a167/128"]

_example/example.tf

@@ -4,25 +4,25 @@ provider "aws" {
 
 module "vpc" {
   source      = "clouddrove/vpc/aws"
-  version     = "0.13.0"
+  version     = "0.14.0"
   name        = "vpc"
-  application = "clouddrove"
   environment = "test"
-  label_order = ["environment", "application", "name"]
+  label_order = ["name", "environment"]
   cidr_block  = "10.0.0.0/16"
 }
 
 module "security_group" {
   source = "./../"
 
-  name          = "security-group"
-  application   = "clouddrove"
-  environment   = "test"
-  label_order   = ["environment", "application", "name"]
-  vpc_id        = module.vpc.vpc_id
-  protocol      = "tcp"
-  description   = "Instance default security group (only egress access is allowed)."
-  allowed_ip    = ["172.16.0.0/16", "10.0.0.0/16"]
-  allowed_ipv6  = ["2405:201:5e00:3684:cd17:9397:5734:a167/128"]
-  allowed_ports = [22, 27017]
+  name        = "security-group"
+  environment = "test"
+  label_order = ["name", "environment"]
+
+  enable_security_group = true
+  vpc_id                = module.vpc.vpc_id
+  protocol              = "tcp"
+  description           = "Instance default security group (only egress access is allowed)."
+  allowed_ip            = ["172.16.0.0/16", "10.0.0.0/16"]
+  allowed_ipv6          = ["2405:201:5e00:3684:cd17:9397:5734:a167/128"]
+  allowed_ports         = [22, 27017]
 }