Merge pull request #8 from clouddrove/CD-209

Upgrade terraform version to 0.13.0 and Update pipelines

Author: Nikita Dugar

.github/workflows/readme.yml

@@ -0,0 +1,54 @@
+name: 'Create README.md file'
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  readme-create:
+    name: 'readme-create'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+
+      - name: Set up Python 3.7.
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: 'create readme'
+        uses: 'clouddrove/[email protected]'
+        with:
+          actions_subcommand: 'readme'
+          github_token: '${{ secrets.GITHUB}}'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
+
+
+      - name: pre-commit check errors
+        uses: pre-commit/[email protected]
+        continue-on-error: true
+
+      - name: pre-commit fix erros
+        uses: pre-commit/[email protected]
+        continue-on-error: true
+
+      - name: 'push readme'
+        uses: 'clouddrove/[email protected]'
+        continue-on-error: true
+        with:
+          actions_subcommand: 'push'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
+
+      - 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/terraform.yml

@@ -0,0 +1,54 @@
+name: 'Terraform GitHub Actions'
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  terraform:
+    name: 'Terraform'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+
+      - 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/[email protected]'
+        with:
+          actions_subcommand: 'init'
+          tf_actions_working_dir: ./_example/basic
+
+      - name: 'Terraform validate'
+        uses: 'clouddrove/[email protected]'
+        with:
+          actions_subcommand: 'validate'
+          tf_actions_working_dir: ./_example/basic
+
+      - name: 'Terraform plan'
+        uses: 'clouddrove/[email protected]'
+        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()

.github/workflows/terratest.yml

@@ -0,0 +1,42 @@
+name: 'Terratest GitHub Actions'
+on:
+  pull_request:
+    branches:
+      - master
+    types: [labeled]
+
+jobs:
+  terraform:
+    name: 'Terraform'
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: 'Checkout'
+        uses: actions/checkout@master
+
+      - 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]'
+        with:
+          actions_subcommand: 'terratest'
+          tf_actions_working_dir: '_test/basic'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - 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()

.gitignore

@@ -3,4 +3,5 @@
 *.tfstate.backup
 .terraform
 .idea
-*.iml
+*.iml
+go.sum

.pre-commit-config.yaml

@@ -1,13 +1,13 @@
 repos:
   - repo: git://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.12.0
+    rev: v1.43.0
     hooks:
     - id: terraform_fmt
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v3.2.0
     hooks:
       - id: check-merge-conflict
-      - id: trailing-whitespace
       - id: check-yaml
       - id: check-added-large-files
+      - id: trailing-whitespace

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Cloud Drove
+Copyright (c) 2020 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

@@ -5,7 +5,7 @@
 #
 
 # Name of this project
-name : Terraform AWS Api Gateway
+name: Terraform AWS Api Gateway
 
 # License of this project
 license: "MIT"
@@ -16,13 +16,14 @@ github_repo: clouddrove/terraform-aws-api-gateway
 # Badges to display
 badges:
   - name: "Terraform"
-    image: "https://img.shields.io/badge/Terraform-v0.12-green"
+    image: "https://img.shields.io/badge/Terraform-v0.13-green"
     url: "https://www.terraform.io"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-MIT-blue.svg"
     url: "LICENSE.md"
 
 #  description of this project
+# yamllint disable rule:line-length
 description: |-
   Terraform module to create Route53 resource on AWS for create api gateway with it's basic elements.
 
@@ -32,12 +33,14 @@ include:
   - "terraform.md"
 
 # How to use this project
-usage : |-
+# yamllint disable rule:line-length
+usage: |-
   Here are examples of how you can use this module in your inventory structure:
   ### Basic Example
   ```hcl
     module "api-gateway" {
-      source                          = "git::https://github.com/clouddrove/terraform-aws-api-gateway.git?ref=tags/0.12.2"
+      source        = "clouddrove/api-gateway/aws"
+      version       = "0.13.0"
       name        = "api-gateway"
       application = "clouddrove"
       environment = "test"
@@ -95,7 +98,8 @@ usage : |-
   ### Complete Example
   ```hcl
     module "api-gateway" {
-      source                          = "git::https://github.com/clouddrove/terraform-aws-api-gateway.git?ref=tags/0.12.2"
+      source        = "clouddrove/api-gateway/aws"
+      version       = "0.13.0"
       name        = "api-gateway"
       application = "clouddrove"
       environment = "test"
@@ -176,4 +180,4 @@ usage : |-
       key_count = 2
       key_names = ["test", "test1"]
     }
-  ```
+  ```

_example/basic/example.tf

@@ -11,34 +11,34 @@ module "api-gateway" {
   enabled     = true
 
   # Api Gateway Resource
-  path_parts = ["mytestresource", "mytestresource1"]
+  path_parts = ["mytestresource"]
 
   # Api Gateway Method
   method_enabled = true
-  http_methods   = ["GET", "GET"]
+  http_methods   = ["GET"]
 
   # Api Gateway Integration
-  integration_types        = ["MOCK", "AWS_PROXY"]
-  integration_http_methods = ["POST", "POST"]
-  uri                      = ["", "arn:aws:apigateway:eu-west-1:lambda:path/2015-03-31/functions/arn:aws:lambda:eu-west-1:xxxxxxxxxxxx:function:test/invocations"]
+  integration_types        = ["MOCK"]
+  integration_http_methods = ["POST"]
+  uri                      = [""]
   integration_request_parameters = [{
     "integration.request.header.X-Authorization" = "'static'"
-  }, {}]
+  }]
   request_templates = [{
     "application/xml" = <<EOF
 {
    "body" : $input.json('$')
 }
 EOF
-  }, {}]
+  }]
 
   # Api Gateway Method Response
-  status_codes        = [200, 200]
-  response_models     = [{ "application/json" = "Empty" }, {}]
-  response_parameters = [{ "method.response.header.X-Some-Header" = true }, {}]
+  status_codes        = [200]
+  response_models     = [{ "application/json" = "Empty" }]
+  response_parameters = [{ "method.response.header.X-Some-Header" = true }]
 
   # Api Gateway Integration Response
-  integration_response_parameters = [{ "method.response.header.X-Some-Header" = "integration.response.header.X-Some-Other-Header" }, {}]
+  integration_response_parameters = [{ "method.response.header.X-Some-Header" = "integration.response.header.X-Some-Other-Header" }]
   response_templates = [{
     "application/xml" = <<EOF
 #set($inputRoot = $input.path('$'))
@@ -47,13 +47,13 @@ EOF
     $inputRoot.body
 </message>
 EOF
-  }, {}]
+  }]
 
   # Api Gateway Deployment
   deployment_enabled = true
   stage_name         = "deploy"
 
   # Api Gateway Stage
   stage_enabled = true
-  stage_names   = ["qa", "dev"]
+  stage_names   = ["qa"]
 }

_test/basic/go.mod

@@ -0,0 +1,8 @@
+module github.com/clouddrove-terraform-aws-api-gateway/basic
+
+go 1.13
+
+require (
+	github.com/gruntwork-io/terratest v0.30.7
+	github.com/stretchr/testify v1.6.1
+)

main.tf

@@ -6,7 +6,7 @@
 #              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.12.0"
+  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.13.0"
 
   name        = var.name
   application = var.application
@@ -16,7 +16,7 @@ module "labels" {
 }
 
 # Module      : Api Gateway
-# Description : Terraform module to create Api Gateway resource on AWS for creating api.
+# Description : Terraform module to create Api Gateway resource on AWS for creatng api.
 resource "aws_api_gateway_rest_api" "default" {
   count = var.enabled ? 1 : 0
 

versions.tf

@@ -1,4 +1,9 @@
 # Terraform version
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.12.0, < 0.14.0"
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
 }