Merge pull request #11 from clouddrove/0.14

Sohan Yadav · web-flow · commit 43c6b870fc42 · 2021-01-20T17:19:58.000+05:30
Upgrade module with Terraform 0.14
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
@@ -10,22 +10,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
       - 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
         uses: pre-commit/action@v2.0.0
         continue-on-error: true
@@ -35,7 +34,7 @@ jobs:
         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'
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
@@ -5,50 +5,48 @@ 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@v6.0'
+        with:
+          actions_subcommand: 'fmt'
+
+  Basic:
+    name: 'Init,Validate,PLan of Basic example'
+    needs: fmt
+    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'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'init'
           tf_actions_working_dir: ./_example/basic
 
       - name: 'Terraform validate'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/basic
 
       - name: 'Terraform plan'
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'plan'
           tf_actions_working_dir: ./_example/basic
-
-      - 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()
diff --git a/.github/workflows/terratest.yml b/.github/workflows/terratest.yml
@@ -6,13 +6,13 @@ on:
     types: [labeled]
 
 jobs:
-  terraform:
-    name: 'Terraform'
+  Terratest:
+    name: 'Terratest for basic'
     runs-on: ubuntu-latest
     steps:
 
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v2.3.4
 
       - name: Configure AWS Credentials
         uses: clouddrove/configure-aws-credentials@v1
@@ -23,7 +23,7 @@ jobs:
 
       - name: 'Terratest'
         if: ${{ github.event.label.name == 'terratest' }}
-        uses: 'clouddrove/github-actions@v4.0'
+        uses: 'clouddrove/github-actions@v6.0'
         with:
           actions_subcommand: 'terratest'
           tf_actions_working_dir: '_test/basic'
@@ -39,4 +39,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
-        if: always()
+        if: always()
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@
 .terraform
 .idea
 *.iml
-go.sum
+go.sum
+*.terraform.lock.hcl
diff --git a/.pre-commit-config.yaml b/.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
diff --git a/LICENSE b/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
diff --git a/Makefile b/Makefile
@@ -1,3 +1,3 @@
 export GENIE_PATH ?= $(shell 'pwd')/../../../genie
 
-include $(GENIE_PATH)/Makefile
+include $(GENIE_PATH)/Makefile
diff --git a/README.yaml b/README.yaml
@@ -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.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: |-
   ```hcl
     module "api-gateway" {
       source        = "clouddrove/api-gateway/aws"
-      version       = "0.13.0"
-      name        = "api-gateway"
-      application = "clouddrove"
-      environment = "test"
-      label_order = ["environment", "name", "application"]
-      enabled     = true
+      version       = "0.14.0"
+      name          = "api-gateway"
+      environment   = "test"
+      label_order   = ["name", "environment"]
+      enabled       = true
 
     # Api Gateway Resource
       path_parts = ["mytestresource", "mytestresource1"]
@@ -99,11 +98,11 @@ usage: |-
   ```hcl
     module "api-gateway" {
       source        = "clouddrove/api-gateway/aws"
-      version       = "0.13.0"
+      version       = "0.14.0"
+
       name        = "api-gateway"
-      application = "clouddrove"
       environment = "test"
-      label_order = ["environment", "name", "application"]
+      label_order = ["name", "environment"]
       enabled     = true
 
     # Api Gateway Resource
diff --git a/_example/basic/example.tf b/_example/basic/example.tf
@@ -3,11 +3,12 @@ provider "aws" {
 }
 
 module "api-gateway" {
-  source      = "../../"
-  name        = "api-gateway"
-  application = "clouddrove"
+  source = "../../"
+  name   = "api-gateway"
+
+  repository  = "https://registry.terraform.io/modules/clouddrove/api-gateway/aws/0.14.0"
   environment = "test"
-  label_order = ["environment", "name", "application"]
+  label_order = ["name", "environment"]
   enabled     = true
 
   # Api Gateway Resource
@@ -56,4 +57,4 @@ EOF
   # Api Gateway Stage
   stage_enabled = true
   stage_names   = ["qa"]
-}
+}
diff --git a/_example/basic/outputs.tf b/_example/basic/outputs.tf
@@ -3,4 +3,4 @@
 output "arn" {
   value       = module.api-gateway.*.execution_arn
   description = "The Execution ARN of the REST API."
-}
+}
diff --git a/_example/complete/example.tf b/_example/complete/example.tf
@@ -6,9 +6,8 @@ module "api-gateway" {
   source = "../../"
 
   name        = "api-gateway"
-  application = "clouddrove"
   environment = "test"
-  label_order = ["environment", "name", "application"]
+  label_order = ["name", "environment"]
   enabled     = true
 
   # Api Gateway Resource
@@ -84,4 +83,4 @@ EOF
   # Api Gateway Api Key
   key_count = 2
   key_names = ["test", "test1"]
-}
+}
diff --git a/_example/complete/outputs.tf b/_example/complete/outputs.tf
@@ -3,4 +3,4 @@
 output "arn" {
   value       = module.api-gateway.*.execution_arn
   description = "The Execution ARN of the REST API."
-}
+}
diff --git a/_test/basic/api_gateway_test.go b/_test/basic/api_gateway_test.go
@@ -30,4 +30,4 @@ func Test(t *testing.T) {
 
 	// Verify we're getting back the outputs we expect
 	assert.Contains(t, Arn, "arn:aws:execute-api")
-}
+}
diff --git a/_test/basic/go.mod b/_test/basic/go.mod
diff --git a/_test/complete/api_gateway_test.go b/_test/complete/api_gateway_test.go
@@ -30,4 +30,4 @@ func Test(t *testing.T) {
 
 	// Verify we're getting back the outputs we expect
 	assert.Contains(t, Arn, "arn:aws:execute-api")
-}
+}
diff --git a/main.tf b/main.tf
@@ -6,12 +6,13 @@
 #              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.13.0"
+  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.14.0"
 
   name        = var.name
-  application = var.application
+  repository  = var.repository
   environment = var.environment
   managedby   = var.managedby
+  attributes  = var.attributes
   label_order = var.label_order
 }
 
diff --git a/outputs.tf b/outputs.tf
@@ -1,5 +1,5 @@
 # Module      : Api Gateway
-# Description : Terraform module to create Api Gateway resource on AWS.
+# Description : Terraform Api Gateway module outputs.
 output "id" {
   value       = join("", aws_api_gateway_rest_api.default.*.id)
   description = "The ID of the REST API."
@@ -13,4 +13,4 @@ output "execution_arn" {
 output "tags" {
   value       = module.labels.tags
   description = "A mapping of tags to assign to the resource."
-}
+}
diff --git a/variables.tf b/variables.tf
diff --git a/versions.tf b/versions.tf

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`export GENIE_PATH ?= $(shell 'pwd')/../../../genie`
`2`	`2`
`3`		`-include $(GENIE_PATH)/Makefile`
	`3`	`+include $(GENIE_PATH)/Makefile`