Make registry modules lock scripts resilient

.changeset/shaggy-vans-check.md

@@ -0,0 +1,5 @@
+---
+"pre_commit_scripts": major
+---
+
+First working version of the lock_modules pre-commit script

.changeset/tall-keys-protect.md

@@ -0,0 +1,15 @@
+---
+"github_selfhosted_runner_on_container_app_jobs": patch
+"azure_function_app_exposed": patch
+"azure_app_service_exposed": patch
+"azure_postgres_server": patch
+"azure_storage_account": patch
+"azure_api_management": patch
+"azure_cosmos_account": patch
+"azure_function_app": patch
+"azure_app_service": patch
+"azure_core_infra": patch
+"azure_event_hub": patch
+---
+
+Relative module referencing substituted with terraform registry referencing

.github/workflows/infra_apply.yaml

@@ -154,7 +154,7 @@ jobs:
 
           calculate_hash() {
               local module_path="$1"
-              tar --exclude=.* -cvf - "$module_path" | sha256sum | awk '{ print $1 }'
+              find "$module_path" -type f -not -path "$module_path/.*" | sort | xargs sha256sum | awk '{print $1}' | sha256sum | awk '{print $1}'
           }
 
           # Iterate over modules listed in the metadata that were sourced from the Terraform registry

.github/workflows/infra_plan.yaml

@@ -157,7 +157,7 @@ jobs:
 
           calculate_hash() {
               local module_path="$1"
-              tar --exclude=.* -cvf - "$module_path" | sha256sum | awk '{ print $1 }'
+              find "$module_path" -type f -not -path "$module_path/.*" | sort | xargs sha256sum | awk '{print $1}' | sha256sum | awk '{print $1}'
           }
 
           # Iterate over modules listed in the metadata that were sourced from the Terraform registry

.pre-commit-config.yaml

@@ -1,4 +1,15 @@
 repos:
+  - repo: local
+    hooks:
+      - id: lock_modules
+        name: Lock Terraform Registry modules
+        description: 'Locks Terraform module versions and maintains hashes'
+        entry: infra/scripts/lock-modules.sh
+        language: script
+        files: '\.tf$'
+        exclude: ^.*\/modules\/.*
+        pass_filenames: true
+        require_serial: true
   - repo: https://github.com/antonbabenko/pre-commit-terraform
     rev: v1.96.2
     hooks:

.pre-commit-hooks.yaml

@@ -1,9 +1,11 @@
 - id: lock_modules
   name: Lock Terraform Registry modules
-  description: Create the file that contains terraform registry modules hashes
+  description: 'Locks Terraform module versions and maintains hashes'
   entry: infra/scripts/lock-modules.sh
   language: script
-
+  files: '\.tf$'
+  pass_filenames: true
+  require_serial: true
 - id: terraform_providers_lock_staged
   name: Terraform Providers Lock (on staged .terraform.lock.hcl files)
   entry: infra/scripts/terraform_lock_precommit.sh

infra/identity/dev/tfmodules.lock.json

@@ -0,0 +1 @@
+{}

infra/modules/azure_api_management/README.md

@@ -48,7 +48,7 @@ module "apim" {
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_api_management/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_app_service/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_app_service/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_app_service_exposed/README.md

@@ -14,7 +14,7 @@ This module is used to create an Azure App Service, allowing it to be configured
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_app_service_exposed/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_core_infra/README.md

@@ -44,7 +44,7 @@ module "core" {
 |------|--------|---------|
 | <a name="module_dns"></a> [dns](#module\_dns) | ./_modules/dns | n/a |
 | <a name="module_key_vault"></a> [key\_vault](#module\_key\_vault) | ./_modules/key_vault | n/a |
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 | <a name="module_nat_gateway"></a> [nat\_gateway](#module\_nat\_gateway) | ./_modules/nat_gateway | n/a |
 | <a name="module_network"></a> [network](#module\_network) | ./_modules/networking | n/a |
 | <a name="module_vpn"></a> [vpn](#module\_vpn) | ./_modules/vpn | n/a |

infra/modules/azure_core_infra/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_cosmos_account/README.md

@@ -11,7 +11,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_cosmos_account/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_event_hub/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_event_hub/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_function_app/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_function_app/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_function_app_exposed/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_function_app_exposed/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_postgres_server/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_postgres_server/main.tf

@@ -8,7 +8,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/azure_storage_account/README.md

@@ -11,7 +11,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/azure_storage_account/main.tf

@@ -12,7 +12,8 @@ provider "azurerm" {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/modules/github_selfhosted_runner_on_container_app_jobs/README.md

@@ -12,7 +12,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | ../azure_naming_convention | n/a |
+| <a name="module_naming_convention"></a> [naming\_convention](#module\_naming\_convention) | pagopa/dx-azure-naming-convention/azurerm | ~> 0 |
 
 ## Resources
 

infra/modules/github_selfhosted_runner_on_container_app_jobs/main.tf

@@ -9,7 +9,8 @@ terraform {
 }
 
 module "naming_convention" {
-  source = "../azure_naming_convention"
+  source  = "pagopa/dx-azure-naming-convention/azurerm"
+  version = "~> 0"
 
   environment = {
     prefix          = var.environment.prefix

infra/repository/tfmodules.lock.json

@@ -0,0 +1 @@
+{}

infra/resources/dev/main.tf

@@ -50,4 +50,4 @@ module "core" {
   test_enabled = true
 
   tags = local.tags
-}
+}

infra/resources/dev/tfmodules.lock.json

@@ -0,0 +1,3 @@
+{
+  "core.naming_convention": "807e8fafaf3cda8d1df7cc5c624715555ff150e87a8df0becc7e5cab3e54f855"
+}