ci: adding everything to pre-commit

ci: adding everything to pre-commit

Author: florianow

.github/workflows/build.yml

@@ -30,9 +30,3 @@ jobs:
 
       - name: Run pre-commit checks
         run: pre-commit run --all-files --show-diff-on-failure
-
-      - name: Run validation script and write summary
-        run: |
-          export GITHUB_STEP_SUMMARY="$GITHUB_STEP_SUMMARY"
-          chmod +x ci/validate_modules.sh
-          ci/validate_modules.sh

.pre-commit-config.yaml

@@ -1,4 +1,19 @@
 repos:
+  - repo: local
+    hooks:
+      - id: check-terraform-structure
+        name: Check Terraform module structure
+        entry: bash ci/check_tf_structure.sh
+        language: system
+        pass_filenames: false
+  - repo: local
+    hooks:
+      - id: validate-buildingblock
+        name: Validate README and PNG in buildingblocks
+        entry: bash ci/validate_modules.sh
+        language: system
+        pass_filenames: false
+
   - repo: https://github.com/antonbabenko/pre-commit-terraform
     rev: v1.81.0
     hooks:
@@ -7,8 +22,10 @@ repos:
             - --args=--config=.terraform-docs.yml
       - id: terraform_fmt
       - id: terragrunt_fmt
+      - id: terraform_validate
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0  # Use the ref you want to point at
     hooks:
       - id: trailing-whitespace
         exclude: "^compliance/"
+

check_tf_structure.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+warnings=()
+recommended_tf_files=("main.tf" "variables.tf" "outputs.tf" "provider.tf" "versions.tf")
+
+# Nur Verzeichnisse prüfen, in denen mindestens eine .tf-Datei liegt
+for buildingblock_path in $(find . -type f -name "*.tf" -exec dirname {} \; | sort -u); do
+  for tf_file in "${recommended_tf_files[@]}"; do
+    if [[ ! -f "$buildingblock_path/$tf_file" ]]; then
+      warnings+=("⚠️  '$tf_file' missing in $buildingblock_path")
+    fi
+  done
+done
+
+# Ausgabe & Exit-Code
+if [ "${#warnings[@]}" -gt 0 ]; then
+  for warn in "${warnings[@]}"; do
+    echo "$warn"
+  done
+  exit 1
+else
+  echo "✅ All recommended Terraform files are present."
+fi

ci/check_tf_structure.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+warnings=()
+recommended_tf_files=("main.tf" "variables.tf" "outputs.tf" "provider.tf" "versions.tf")
+
+# Nur Verzeichnisse prüfen, in denen mindestens eine .tf-Datei liegt
+for buildingblock_path in $(find . -type f -name "*.tf" -exec dirname {} \; | sort -u); do
+  for tf_file in "${recommended_tf_files[@]}"; do
+    if [[ ! -f "$buildingblock_path/$tf_file" ]]; then
+      warnings+=("⚠️  '$tf_file' fehlt in $buildingblock_path")
+    fi
+  done
+done
+
+# Ausgabe & Exit-Code
+if [ "${#warnings[@]}" -gt 0 ]; then
+  for warn in "${warnings[@]}"; do
+    echo "$warn"
+  done
+  exit 1
+else
+  echo "✅ Alle empfohlenen Terraform-Dateien sind vorhanden."
+fi

ci/validate_modules.sh

@@ -80,46 +80,6 @@ check_png_naming() {
 	fi
 }
 
-check_terraform_files() {
-	local buildingblock_path="$1"
-
-	# Check for at least one .tf file (excluding .terraform subfolder)
-	if ! find "$buildingblock_path" -maxdepth 1 -type f -name '*.tf' | grep -q .; then
-		errors+=("No Terraform (.tf) files found in $buildingblock_path")
-		return 1
-	fi
-
-	# Optional recommended file check
-	local recommended_tf_files=("main.tf" "variables.tf" "outputs.tf", "provider.tf" "versions.tf")
-	for tf_file in "${recommended_tf_files[@]}"; do
-		if [[ ! -f "$buildingblock_path/$tf_file" ]]; then
-			warnings+=("Recommended file '$tf_file' is missing in $buildingblock_path")
-		fi
-	done
-
-	# Run terraform init + validate with visible output
-	pushd "$buildingblock_path" > /dev/null || return 1
-	rm -rf .terraform/ > /dev/null 2>&1
-
-	echo "🔄 Running terraform init in $buildingblock_path"
-	if ! terraform init -backend=false -input=false; then
-		echo -e "❌ ${RED}Terraform init failed in $buildingblock_path${NC}"
-		errors+=("Terraform init failed in $buildingblock_path")
-		popd > /dev/null
-		return 1
-	fi
-
-	echo "🔄 Running terraform validate in $buildingblock_path"
-	if terraform validate; then
-		echo -e "✅ ${buildingblock_path} validated successfully"
-	else
-		echo -e "❌ ${RED}Terraform validate failed in $buildingblock_path${NC}"
-		errors+=("Terraform validate failed in $buildingblock_path")
-	fi
-
-	popd > /dev/null
-}
-
 # Ensure script is run from repo root
 cd "$(dirname "$0")/.." || exit 1
 modules_path="modules"
@@ -141,10 +101,10 @@ for png_file in $(find $modules_glob -maxdepth 1 -name '*.png'); do
 	check_png_naming "$png_file"
 done
 
-Check each buildingblock directory
-for buildingblock_dir in $(find $modules_glob -type d -name 'buildingblock'); do
-	check_terraform_files "$buildingblock_dir"
-done
+# Check each buildingblock directory
+# for buildingblock_dir in $(find $modules_glob -type d -name 'buildingblock'); do
+# 	check_terraform_files "$buildingblock_dir"
+# done
 
 # Output summary
 echo ""
@@ -168,18 +128,3 @@ else
 	echo "✅ All checks passed successfully."
 	exit 0
 fi
-
-if [[ -n "$GITHUB_STEP_SUMMARY" ]]; then
-  {
-    echo "## 🧪 Module Validation Summary"
-    echo ""
-    echo "**Errors:** ${#errors[@]}"
-    for e in "${errors[@]}"; do echo "- ❌ $e"; done
-    echo ""
-    echo "**Warnings:** ${#warnings[@]}"
-    for w in "${warnings[@]}"; do echo "- ⚠️ $w"; done
-    if [[ ${#errors[@]} -eq 0 && ${#warnings[@]} -eq 0 ]]; then
-      echo "- ✅ All checks passed successfully."
-    fi
-  }
-fi