Merge pull request #19 from clouddrove/0.15

update in 0.15

Author: Nikita Dugar

.github/workflows/terraform.yml

@@ -5,61 +5,105 @@ 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'
+      - name: 'Terraform Format'
+        uses: 'clouddrove/[email protected]'
+        with:
+          actions_subcommand: 'fmt'
+
+  basic_example:
+    name: 'basic_example'
+    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 Basic'
-        uses: 'clouddrove/[email protected]'
+      - name: 'Terraform init'
+        uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/basic_example
 
-      - name: 'Terraform validate Basic'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform validate'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/basic_example
 
-      - name: 'Terraform plan Basic'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform plan for basic_example'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/basic_example
 
-      - name: 'Terraform init Secure'
-        uses: 'clouddrove/[email protected]'
+  secure_example:
+    name: 'secure_example'
+    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 init'
+        uses: 'clouddrove/[email protected]'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/secure_example
 
-      - name: 'Terraform validate Secure'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform validate'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/secure_example
 
-      - name: 'Terraform plan Secure'
-        uses: 'clouddrove/github-actions@v6.0'
+      - name: 'Terraform plan for secure_example'
+        uses: 'clouddrove/github-actions@v7.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/secure_example
 
+  pre-commit:
+    name: 'Pre-Commit'
+    needs:
+      - fmt
+      - basic_example
+      - secure_example
+    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:
@@ -69,4 +113,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

@@ -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,4 +6,4 @@
 *.iml
 go.sum
 *.terraform.lock.hcl
-crash.log
+crash.log

.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 EC2
 </h1>
 
-<p align="center" style="font-size: 1.2rem;"> 
+<p align="center" style="font-size: 1.2rem;">
     Terraform module to create an EC2 resource on AWS with ElasticC IP Addresses and Elastic Block Store.
      </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)
@@ -212,7 +212,7 @@ Here is 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
@@ -221,7 +221,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-ec2/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-ec2)!

README.yaml

@@ -16,7 +16,7 @@ github_repo: clouddrove/terraform-aws-ec2
 # 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"
@@ -39,8 +39,7 @@ usage: |-
   ```hcl
       module "ec2" {
         source                      = "clouddrove/ec2/aws"
-        version                     = "0.14.0"
-        repository                  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
+        version                     = "0.15.0"
         environment                 = "test"
         label_order                 = ["name", "environment"]
         instance_count              = 2
@@ -69,8 +68,7 @@ usage: |-
   ```hcl
       module "ec2" {
         source                      = "clouddrove/ec2/aws"
-        version                     = "0.14.0"
-        repository                  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
+        version                     = "0.15.0"
         environment                 = "test"
         label_order                 = ["name", "environment"]
         instance_count              = 2

_example/basic_example/example.tf

@@ -4,10 +4,9 @@ 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"]
 
@@ -16,10 +15,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"]
 
@@ -33,9 +31,8 @@ module "public_subnets" {
 
 module "http-https" {
   source      = "clouddrove/security-group/aws"
-  version     = "0.14.0"
+  version     = "0.15.0"
   name        = "http-https"
-  repository  = "https://registry.terraform.io/modules/security-group/ec2/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -46,9 +43,8 @@ module "http-https" {
 
 module "ssh" {
   source      = "clouddrove/security-group/aws"
-  version     = "0.14.0"
+  version     = "0.15.0"
   name        = "ssh"
-  repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -59,10 +55,9 @@ module "ssh" {
 
 module "iam-role" {
   source  = "clouddrove/iam-role/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name               = "iam-role"
-  repository         = "https://registry.terraform.io/modules/clouddrove/iam-role/aws/0.14.0"
   environment        = "test"
   label_order        = ["name", "environment"]
   assume_role_policy = data.aws_iam_policy_document.default.json
@@ -73,7 +68,7 @@ module "iam-role" {
 
 module "kms_key" {
   source                  = "clouddrove/kms/aws"
-  version                 = "0.14.0"
+  version                 = "0.15.0"
   name                    = "kms"
   environment             = "test"
   label_order             = ["environment", "name"]
@@ -125,12 +120,10 @@ data "aws_iam_policy_document" "iam-policy" {
   }
 }
 
-
 module "ec2" {
   source = "./../../"
 
   name        = "ec2-instance"
-  repository  = "https://registry.terraform.io/modules/clouddrove/ec2/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
 
@@ -142,20 +135,23 @@ module "ec2" {
   vpc_security_group_ids_list = [module.ssh.security_group_ids, module.http-https.security_group_ids]
   subnet_ids                  = tolist(module.public_subnets.public_subnet_id)
 
-  assign_eip_address          = true
-  associate_public_ip_address = true
-
-  instance_profile_enabled = true
-  iam_instance_profile     = module.iam-role.name
+  assign_eip_address                   = true
+  associate_public_ip_address          = true
+  instance_profile_enabled             = true
+  iam_instance_profile                 = module.iam-role.name
+  disk_size                            = 8
+  ebs_optimized                        = false
+  ebs_volume_enabled                   = true
+  ebs_volume_type                      = "gp2"
+  ebs_volume_size                      = 30
+  instance_tags                        = { "snapshot" = true }
+  dns_zone_id                          = "Z1XJD7SSBKXLC1"
+  hostname                             = "ec2"
+  kms_key_id                           = module.kms_key.key_arn
+  metadata_http_tokens_required        = true
+  metadata_http_endpoint_enabled       = true
+  metadata_http_put_response_hop_limit = "2"
+  delete_on_termination                = false
+  user_data                            = file("user-data.sh")
 
-  disk_size          = 8
-  ebs_optimized      = false
-  ebs_volume_enabled = true
-  ebs_volume_type    = "gp2"
-  ebs_volume_size    = 30
-
-  instance_tags = { "snapshot" = true }
-  dns_zone_id   = "Z1XJD7SSBKXLC1"
-  hostname      = "ec2"
-  kms_key_id    = module.kms_key.key_arn
-}
+}

_example/basic_example/outputs.tf

@@ -1,4 +1,4 @@
 output "instance_id" {
   value       = module.ec2.*.instance_id
   description = "The instance ID."
-}
+}