refactor: Move some code from pre-commit to makefile

Author: tembleking

.github/workflows/pre-commit.yaml

@@ -60,10 +60,10 @@ jobs:
         run: |
           pip install pre-commit
           go install github.com/hashicorp/terraform-config-inspect@latest
-      - name: Execute generate-terraform-providers for organizational
+      - name: Initialize terraform modules
         if: ${{ matrix.directory !=  '.' }}
         run: |
-          pre-commit run generate-terraform-providers
+          make terraform-init
       - name: Execute pre-commit
         # Run only validate pre-commit check on min version supported
         if: ${{ matrix.directory !=  '.' }}

.pre-commit-config.yaml

@@ -6,25 +6,19 @@ repos:
         name: "Terraform Cleanup"
         pass_filenames: false
         language: system
-        entry: bash -c "find . \( -iname ".terraform*" ! -iname ".terraform-docs*" ! -path "*/test/*" \)  -print0 | xargs -0 rm -r; true"
+        entry: make clean
+      - id: terraform_init
+        name: "Terraform Init"
+        pass_filenames: false
+        language: system
+        entry: make terraform-init
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: local
-    # https://github.com/antonbabenko/pre-commit-terraform/#terraform_validate
-    # Adding this patch to fix organizational multi-provider terraform validate error
-    # 'missing provider provider["registry.terraform.io/hashicorp/google"].multiproject'
-    hooks:
-      - id: generate-terraform-providers
-        name: generate-terraform-providers
-        require_serial: true
-        always_run: true
-        entry: ./examples/organization/.generate-providers.sh
-        language: script
-        pass_filenames: false
 
   - repo: https://github.com/antonbabenko/pre-commit-terraform
     rev: v1.64.0

Makefile

@@ -7,19 +7,23 @@ deps:
 		mv tflint "`go env GOPATH`/bin"
 
 clean:
-	find -name ".terraform" -type d | xargs rm -rf 
+	find -name ".terraform" -type d | xargs rm -rf
 	find -name ".terraform.lock.hcl" -type f | xargs rm -f
 
-generate-terraform-providers: 
-	pre-commit run -a generate-terraform-providers
+
+# https://github.com/antonbabenko/pre-commit-terraform/#terraform_validate
+# Adding this patch to fix organizational multi-provider terraform validate error
+# 'missing provider provider["registry.terraform.io/hashicorp/google"].multiproject'
+generate-terraform-providers:
+	./examples/organization/.generate-providers.sh
 
 terraform-init: generate-terraform-providers
 	find -name "*.tf" | xargs dirname | uniq | xargs -I% -P0 sh -c 'cd %; terraform init --backend=false' 1>/dev/null
 
-lint: terraform-init 
+lint: terraform-init
 	pre-commit run -a terraform_validate
 	pre-commit run -a terraform_tflint
 
 fmt:
-	find -name "*.tf" | xargs dirname | uniq | xargs -I% -P0 sh -c 'cd %; terraform fmt' 
+	find -name "*.tf" | xargs dirname | uniq | xargs -I% -P0 sh -c 'cd %; terraform fmt'
 	pre-commit run -a terraform_fmt