From 9d2a9409cef9c94ba9b9ece4b188b997c80a7240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Buja=C4=8Dek?= <karol@bujacek.sk>
Date: Thu, 30 Jul 2020 15:10:49 +0200
Subject: [PATCH 1/2] Simplify GitHub workflow

---
 .github/workflows/main.yml | 80 +++-----------------------------------
 1 file changed, 5 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fbfa584..f39680a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,88 +6,18 @@ on:
   pull_request:
     branches: [ master ]
 
-env:
-  TERRAFORM_DOCS_VERSION: "v0.9.1"
-  TFLINT_VERSION: "v0.16.2"
-
 jobs:
   terraform-validation:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-python@v1
-        name: "SETUP: Python"
-
-      - uses: actions/setup-go@v2
-        name: "SETUP: Go"
-
-      - uses: pat-s/always-upload-cache@v2.0.0
-        id: cache-terraform-docs
-        name: "CACHE: terraform-docs Go module"
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/go/bin/terraform-docs
-          key: ${{ runner.os }}-terraform_docs-${{ env.TERRAFORM_DOCS_VERSION }}
-          restore-keys: |
-            ${{ runner.os}}-terraform_docs-
-
-      - shell: bash
-        name: "INSTALL: terraform-docs"
-        if: steps.cache-terraform-docs.output.cache-hit != 'true'
-        env:
-          GO111MODULE: "on"
-        run: |
-          go get github.com/segmentio/terraform-docs@${{ env.TERRAFORM_DOCS_VERSION }}
-
-      - shell: bash
-        name: "SETUP: Go path"
-        run: echo '::add-path::~/go/bin/'
-
       - uses: actions/checkout@v1
-        name: Checkout source code
-
-      - uses: pat-s/always-upload-cache@v2.0.0
-        id: cache-pre-commit-dependencies
-        name: "CACHE: pip and pre-commit dependencies"
-        with:
-          path: |
-            ~/.cache/pre-commit
-            ~/.cache/pip
-          key: ${{ runner.os }}-pip-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-pre-commit-
-
-      - uses: pat-s/always-upload-cache@v2.0.0
-        id: cache-tflint
-        name: "CACHE: TFLint"
+      - uses: actions/setup-python@v1
+      - uses: lablabs/setup-terraform-docs@v1
+      - uses: lablabs/setup-tflin@v1
+      - uses: BSFishy/pip-action@v1
         with:
-          path: |
-            ~/tflint/bin/
-          key: ${{ runner.os }}-tflint-${{ env.TFLINT_VERSION }}
-          restore-keys: |
-            ${{ runner.os }}-tflint-
-
-      - shell: bash
-        name: "INSTALL: detect-secrets"
-        run: |
-          pip install detect-secrets
-
-      - shell: bash
-        name: "INSTALL: TFLint"
-        if: steps.cache-tflint.outputs.cache-hit != 'true'
-        run: |
-          wget https://github.com/terraform-linters/tflint/releases/download/${{ env.TFLINT_VERSION }}/tflint_linux_amd64.zip
-          unzip tflint_linux_amd64.zip
-          mkdir -p ~/tflint/bin/
-          install tflint ~/tflint/bin/
-
-      - shell: bash
-        name: "SETUP: TFLint path"
-        run: |
-          echo '::add-path::~/tflint/bin/'
-
+          packages: detect-secrets
       - uses: pre-commit/action@v2.0.0
-        name: "RUN: pre-commit"
         env:
           AWS_DEFAULT_REGION: "eu-central-1"

From 81955b0d576ef577ae2d34e28968df69cb90f119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karol=20Buja=C4=8Dek?= <karol@bujacek.sk>
Date: Thu, 30 Jul 2020 15:20:37 +0200
Subject: [PATCH 2/2] Fixed typo

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f39680a..6293d47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-python@v1
       - uses: lablabs/setup-terraform-docs@v1
-      - uses: lablabs/setup-tflin@v1
+      - uses: lablabs/setup-tflint@v1
       - uses: BSFishy/pip-action@v1
         with:
           packages: detect-secrets