Update lint and validation

toshi0607 · Aug 28, 2022 · 2a8dae3 · 2a8dae3
1 parent 51eaf67
commit 2a8dae3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -49,3 +49,7 @@ Diffrent repository: [toshi0607/GKE-Microservices-Terraform-project-template](ht
 ### Chapter 8 Lint and validation
 
 * [Lint and validation](./lint-and-validation/)
+  * [terraform fmt](./lint-and-validation/terraform-fmt)
+  * [terraform validate](./lint-and-validation/terraform-validate)
+  * [TFLint](./lint-and-validation/tflint)
+  * [Conftest](./lint-and-validation/conftest)
diff --git a/lint-and-validation/conftest/main.tf b/lint-and-validation/conftest/main.tf
@@ -1,5 +1,5 @@
 provider "google" {
-  version = ">= 3.33.0"
+  version = ">= 4.32.0"
 }
 
 resource "google_project_service" "gcp_api_service" {

diff --git a/lint-and-validation/conftest/policy/tf_test.rego b/lint-and-validation/conftest/policy/tf_test.rego
@@ -18,7 +18,7 @@ no_violations {
 
 test_provider_with_version_is_denied {
   input := {
-    "provider": { { "version": ">= 3.33.0", "region": "somewhere" } }
+    "provider": { { "version": ">= 4.32.0", "region": "somewhere" } }
   }
   violations with input as input
 }

diff --git a/lint-and-validation/terraform-fmt/main.tf b/lint-and-validation/terraform-fmt/main.tf
@@ -1,11 +1,11 @@
 resource "google_compute_instance" "tf_fmt_example" {
   name         = "tf-fmt-test"
   machine_type = "f1-micro"
-  zone = "asia-northeast1-a"
+  zone = "asia-northeast1-c"
 
   boot_disk {
     initialize_params {
-      image  = "debian-cloud/debian-9"
+      image  = "debian-cloud/debian-11"
     }
   }
 

diff --git a/lint-and-validation/terraform-validate/main.tf b/lint-and-validation/terraform-validate/main.tf
@@ -1,11 +1,11 @@
 resource "google_compute_instance" "tf_validate_example" {
   name         = "tf-validate-test"
   machine_type = "f1-micro"
-  zone         = "asia-northeast1-a"
+  zone         = "asia-northeast1-c"
 
   boot_disk {
     initialize_params = {
-      image  = "debian-cloud/debian-9"
+      image  = "debian-cloud/debian-11"
     }
   }
 

diff --git a/lint-and-validation/tflint/.tflint.hcl b/lint-and-validation/tflint/.tflint.hcl
@@ -1,5 +1,7 @@
 plugin "google" {
     enabled = true
+    version = "0.19.0"
+    source  = "github.com/terraform-linters/tflint-ruleset-google"
 }
 
 rule "google_compute_address_invalid_address_type" {

diff --git a/lint-and-validation/tflint/README.md b/lint-and-validation/tflint/README.md
@@ -1,10 +1,5 @@
 ```console
 $ brew install tflint
-$ git clone [email protected]:terraform-linters/tflint-ruleset-google.git
-$ cd tflint-ruleset-google
-$ make install
-
-# Add .tflint.hcl
-
+$ tflint --init
 $ tflint
-```
+```
diff --git a/lint-and-validation/tflint/main.tf b/lint-and-validation/tflint/main.tf
@@ -1,11 +1,11 @@
 resource "google_compute_instance" "tflint_example" {
   name         = "tflint-test"
   machine_type = "invalid-machine-type"
-  zone         = "asia-northeast1-a"
+  zone         = "asia-northeast1-c"
 
   boot_disk {
     initialize_params {
-      image = "debian-cloud/debian-9"
+      image = "debian-cloud/debian-11"
     }
   }