feat(terragrunt): changes on terragrunt and precommit

susilnem · susilnem · commit 6323b20ccc03 · 2026-03-14T16:22:16.000+05:45
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,9 +18,8 @@ jobs:
     name: Pre-Commit Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
-      # Terragrunt & OpenTofu versions are read from mase.toml
       - name: Install Terragrunt and OpenTofu
         uses: gruntwork-io/terragrunt-action@v3
 
@@ -29,14 +28,20 @@ jobs:
           curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
           echo "$HOME/.tflint.d/bin" >> $GITHUB_PATH
 
+      - name: Show tool versions
+        run: |
+          terragrunt --version
+          tofu --version || true
+          tflint --version
+
       - uses: pre-commit/action@v3.0.1
 
   lint_and_format:
     name: Terragrunt Lint & Format
     runs-on: ubuntu-latest
     needs: pre_commit_check
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Install Terragrunt and OpenTofu
         uses: gruntwork-io/terragrunt-action@v3
@@ -48,33 +53,49 @@ jobs:
 
       - name: Terragrunt Format Check
         run: terragrunt hcl format --check
+        working-directory: environments/local
+
+      - name: Cache TFLint plugins
+        uses: actions/cache@v4
+        with:
+          path: ~/.tflint.d
+          key: tflint-${{ runner.os }}-${{ hashFiles('.tflint.hcl') }}
 
-      - name: Run TFLint
-        run: tflint --config .tflint.hcl
+      - name: Run TFLint (init + lint)
+        run: |
+          tflint --init --config ../../.tflint.hcl
+          tflint --config ../../.tflint.hcl
+        working-directory: environments/local
 
   validate:
     name: Terragrunt Validate
     runs-on: ubuntu-latest
     needs: [pre_commit_check, lint_and_format]
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Install Terragrunt and OpenTofu
         uses: gruntwork-io/terragrunt-action@v3
 
+      - name: Terragrunt init
+        run: terragrunt init --backend=false
+
       - name: Terragrunt Validate
-        run: terragrunt run-all validate
+        run: terragrunt validate
 
   plan:
     name: Terragrunt Plan
     runs-on: ubuntu-latest
     needs: validate
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Install Terragrunt and OpenTofu
         uses: gruntwork-io/terragrunt-action@v3
 
+      - name: Terragrunt Init
+        run: terragrunt init --backend=false
+
       - name: Terragrunt Plan
-        run: terragrunt plan --all --non-interactive
+        run: terragrunt run plan --non-interactive
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,19 +7,21 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: detect-private-key
+
   - repo: https://github.com/gitleaks/gitleaks
     rev: v8.30.0
     hooks:
       - id: gitleaks
+
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.99.0 # Get the latest from: https://github.com/antonbabenko/pre-commit-terraform/releases
+    rev: v1.99.0
     hooks:
       - id: terraform_validate
         args:
-         - --hook-config=--tf-path=tofu
+          - --hook-config=--tf-path=tofu
+
       - id: terraform_fmt
+
       - id: terraform_tflint
         args:
-         - --hook-config=--tf-path=tofu
-          - --args=-no-color
-          - --args=-diff
+          - --hook-config=--tf-path=tofu
diff --git a/.tflint.hcl b/.tflint.hcl
@@ -4,15 +4,15 @@ config {
 }
 
 plugin "terraform" {
-    enabled = true
-    version = "0.12.0"
-    source  = "github.com/terraform-linters/tflint-ruleset-terraform"
+  enabled = true
+  version = "0.12.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-terraform"
 }
 
 plugin "azurerm" {
-    enabled = true
-    version = "0.23.0"
-    source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
+  enabled = true
+  version = "0.23.0"
+  source  = "github.com/terraform-linters/tflint-ruleset-azurerm"
 }
 
 # FIXME: USE rules to override the warnings
diff --git a/environments/local/network/terragrunt.hcl b/environments/local/network/terragrunt.hcl
@@ -14,69 +14,69 @@ terraform {
 }
 
 inputs = merge(
-    local.common_vars.locals.common_vars,
-    {
-      # Virtual Network Configuration
-      vnet_config = {
-        name          = "vnet-example"
-        address_space = ["10.0.0.0/16"]
+  local.common_vars.locals.common_vars,
+  {
+    # Virtual Network Configuration
+    vnet_config = {
+      name          = "vnet-example"
+      address_space = ["10.0.0.0/16"]
+    }
+    # Subnet Configuration
+    subnet_configs = {
+      public = {
+        address_prefixes = ["10.0.1.0/24"]
+      }
+      private = {
+        address_prefixes = ["10.0.2.0/24"]
       }
-      # Subnet Configuration
-      subnet_configs = {
-        public = {
-          address_prefixes = ["10.0.1.0/24"]
-        }
-        private = {
-          address_prefixes = ["10.0.2.0/24"]
-        }
+    }
+    # Network Security Group Configuration
+    nsg_configs = {
+      public = {
+        security_rules = [
+          {
+            name                       = "SSH"
+            priority                   = 100
+            direction                  = "Inbound"
+            access                     = "Allow"
+            protocol                   = "Tcp"
+            source_port_range          = "*"
+            destination_port_range     = "22"
+            source_address_prefix      = "*"
+            destination_address_prefix = "*"
+          }
+        ]
       }
-      # Network Security Group Configuration
-      nsg_configs = {
-        public = {
-          security_rules = [
-            {
-              name                       = "SSH"
-              priority                   = 100
-              direction                  = "Inbound"
-              access                     = "Allow"
-              protocol                   = "Tcp"
-              source_port_range          = "*"
-              destination_port_range     = "22"
-              source_address_prefix      = "*"
-              destination_address_prefix = "*"
-            }
-          ]
-        }
-        private = {
-          security_rules = [
-            {
-              name                       = "SSH-from-public"
-              priority                   = 100
-              direction                  = "Inbound"
-              access                     = "Allow"
-              protocol                   = "Tcp"
-              source_port_range          = "*"
-              destination_port_range     = "22"
-              source_address_prefix      = "10.0.1.0/24"
-              destination_address_prefix = "*"
-            }
-          ]
-        }
+      private = {
+        security_rules = [
+          {
+            name                       = "SSH-from-public"
+            priority                   = 100
+            direction                  = "Inbound"
+            access                     = "Allow"
+            protocol                   = "Tcp"
+            source_port_range          = "*"
+            destination_port_range     = "22"
+            source_address_prefix      = "10.0.1.0/24"
+            destination_address_prefix = "*"
+          }
+        ]
+      }
+    }
+    # Route Table Configuration
+    route_table_configs = {
+      public = {
+        routes = [
+          {
+            name           = "default-route"
+            address_prefix = "0.0.0.0/0"
+            next_hop_type  = "Internet"
+          }
+        ]
       }
-      # Route Table Configuration
-      route_table_configs = {
-        public = {
-          routes = [
-            {
-              name           = "default-route"
-              address_prefix = "0.0.0.0/0"
-              next_hop_type  = "Internet"
-            }
-          ]
-        }
-        private = {
-          routes = []
-        }
+      private = {
+        routes = []
       }
     }
+  }
 )
diff --git a/environments/local/virtual_machine/terragrunt.hcl b/environments/local/virtual_machine/terragrunt.hcl
@@ -14,31 +14,31 @@ terraform {
 }
 
 dependency "network" {
-  config_path = find_in_parent_folders("network")
+  config_path = "../network"
 
   mock_outputs = {
     subnets = {
-      public  = "subnet-id-public"
+      public = "subnet-id-public"
     }
   }
 }
 inputs = merge(
-    local.common_vars.locals.common_vars,
-    {
-      subnet_id = dependency.network.outputs.subnets["public"]
-      vm_config = {
-          name                     = "public-vm"
-          subnet_key               = "public"
-          size                     = "Standard_B1s"
-          admin_username           = "adminuser"
-          admin_ssh_key_public_key = "~/.ssh/id_rsa.pub"
-          public_ip                = true
-          os_image = {
-            publisher = "Canonical"
-            offer     = "UbuntuServer"
-            sku       = "18.04-LTS"
-            version   = "latest"
-          }
+  local.common_vars.locals.common_vars,
+  {
+    subnet_id = dependency.network.outputs.subnets["public"]
+    vm_config = {
+      name                     = "public-vm"
+      subnet_key               = "public"
+      size                     = "Standard_B1s"
+      admin_username           = "adminuser"
+      admin_ssh_key_public_key = "~/.ssh/id_rsa.pub"
+      public_ip                = true
+      os_image = {
+        publisher = "Canonical"
+        offer     = "UbuntuServer"
+        sku       = "18.04-LTS"
+        version   = "latest"
       }
     }
+  }
 )
diff --git a/environments/root.hcl b/environments/root.hcl
@@ -2,7 +2,7 @@
 generate "backend" {
   path      = "backend.tf"
   if_exists = "overwrite_terragrunt"
-  contents = <<EOF
+  contents  = <<EOF
   terraform {
     backend "azurerm" {
       resource_group_name  = "susilnemterraformstate-rg"
diff --git a/providers.tf b/providers.tf
@@ -9,3 +9,7 @@ terraform {
     }
   }
 }
+
+provider "azurerm" {
+  features {}
+}
diff --git a/terragrunt.hcl b/terragrunt.hcl
@@ -15,7 +15,6 @@ remote_state {
   }
 }
 
-
 locals {
   azure_provider_config = <<EOF
 terraform {
@@ -28,24 +27,16 @@ terraform {
     }
   }
 }
+
+provider "azurerm" {
+  features {}
+}
 EOF
 }
 
-# Configure the Azure provider
+# Generate providers
 generate "providers" {
   path      = "providers.tf"
   if_exists = "overwrite_terragrunt"
   contents  = local.azure_provider_config
 }
-
-generate "provider-az-network" {
-  path      = "modules/az_network/providers.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = local.azure_provider_config
-}
-
-generate "provider-az-virtual-machine" {
-  path      = "modules/az_virtual_machine/providers.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = local.azure_provider_config
-}

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@ config {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`plugin "terraform" {`
`7`		`- enabled = true`
`8`		`- version = "0.12.0"`
`9`		`- source = "github.com/terraform-linters/tflint-ruleset-terraform"`
	`7`	`+ enabled = true`
	`8`	`+ version = "0.12.0"`
	`9`	`+ source = "github.com/terraform-linters/tflint-ruleset-terraform"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`plugin "azurerm" {`
`13`		`- enabled = true`
`14`		`- version = "0.23.0"`
`15`		`- source = "github.com/terraform-linters/tflint-ruleset-azurerm"`
	`13`	`+ enabled = true`
	`14`	`+ version = "0.23.0"`
	`15`	`+ source = "github.com/terraform-linters/tflint-ruleset-azurerm"`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`# FIXME: USE rules to override the warnings`
Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,7 @@ terraform {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+provider "azurerm" {`
	`14`	`+ features {}`
	`15`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ remote_state {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-`
`19`	`18`	`locals {`
`20`	`19`	`azure_provider_config = <<EOF`
`21`	`20`	`terraform {`
`@@ -28,24 +27,16 @@ terraform {`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`}`
	`30`	`+`
	`31`	`+provider "azurerm" {`
	`32`	`+ features {}`
	`33`	`+}`
`31`	`34`	`EOF`
`32`	`35`	`}`
`33`	`36`
`34`		`-# Configure the Azure provider`
	`37`	`+# Generate providers`
`35`	`38`	`generate "providers" {`
`36`	`39`	`path = "providers.tf"`
`37`	`40`	`if_exists = "overwrite_terragrunt"`
`38`	`41`	`contents = local.azure_provider_config`
`39`	`42`	`}`
`40`		`-`
`41`		`-generate "provider-az-network" {`
`42`		`- path = "modules/az_network/providers.tf"`
`43`		`- if_exists = "overwrite_terragrunt"`
`44`		`- contents = local.azure_provider_config`
`45`		`-}`
`46`		`-`
`47`		`-generate "provider-az-virtual-machine" {`
`48`		`- path = "modules/az_virtual_machine/providers.tf"`
`49`		`- if_exists = "overwrite_terragrunt"`
`50`		`- contents = local.azure_provider_config`
`51`		`-}`