From 4bdbf17c19074b00248806bd198ac779184f4725 Mon Sep 17 00:00:00 2001
From: Kazuma Watanabe <watassbass@gmail.com>
Date: Mon, 19 Jul 2021 23:32:21 +0900
Subject: [PATCH] Switch from wata727/tflint to
 ghcr.io/terraform-linters/tflint-bundle (#1777)

---
 Dockerfile            | 3 ++-
 Dockerfile-slim       | 3 ++-
 TEMPLATES/.tflint.hcl | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3acab699..8bdb45a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ FROM mstruebing/editorconfig-checker:2.3.5 as editorconfig-checker
 FROM yoheimuta/protolint:v0.32.0 as protolint
 FROM golangci/golangci-lint:v1.41.1 as golangci-lint
 FROM koalaman/shellcheck:v0.7.2 as shellcheck
-FROM wata727/tflint:0.29.1 as tflint
+FROM ghcr.io/terraform-linters/tflint-bundle:v0.30.0 as tflint
 FROM alpine/terragrunt:1.0.1 as terragrunt
 FROM mvdan/shfmt:v3.3.0 as shfmt
 FROM accurics/terrascan:1.8.0 as terrascan
@@ -184,6 +184,7 @@ COPY --from=golangci-lint /usr/bin/golangci-lint /usr/bin/
 # Install TFLint #
 ##################
 COPY --from=tflint /usr/local/bin/tflint /usr/bin/
+COPY --from=tflint /root/.tflint.d /root/.tflint.d
 
 #####################
 # Install Terrascan #
diff --git a/Dockerfile-slim b/Dockerfile-slim
index 123c0efd..525a10d1 100644
--- a/Dockerfile-slim
+++ b/Dockerfile-slim
@@ -19,7 +19,7 @@ FROM mstruebing/editorconfig-checker:2.3.5 as editorconfig-checker
 FROM yoheimuta/protolint:v0.32.0 as protolint
 FROM golangci/golangci-lint:v1.41.1 as golangci-lint
 FROM koalaman/shellcheck:v0.7.2 as shellcheck
-FROM wata727/tflint:0.29.1 as tflint
+FROM ghcr.io/terraform-linters/tflint-bundle:v0.30.0 as tflint
 FROM alpine/terragrunt:1.0.1 as terragrunt
 FROM mvdan/shfmt:v3.3.0 as shfmt
 FROM accurics/terrascan:1.8.0 as terrascan
@@ -126,6 +126,7 @@ COPY --from=golangci-lint /usr/bin/golangci-lint /usr/bin/
 # Install TFLint #
 ##################
 COPY --from=tflint /usr/local/bin/tflint /usr/bin/
+COPY --from=tflint /root/.tflint.d /root/.tflint.d
 
 #####################
 # Install Terrascan #
diff --git a/TEMPLATES/.tflint.hcl b/TEMPLATES/.tflint.hcl
index 7913c326..1c8f7d3a 100644
--- a/TEMPLATES/.tflint.hcl
+++ b/TEMPLATES/.tflint.hcl
@@ -4,3 +4,6 @@ config {
   force = false
 }
 
+plugin "aws" {
+  enabled = true
+}