Skip to content

Commit

Permalink
fix: modules versions from registry
Browse files Browse the repository at this point in the history
  • Loading branch information
christian-calabrese committed Jan 2, 2025
1 parent e913f25 commit 98ded0c
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pagopa/dx
rev: 498e30be0ec7abd03f71148b939cde1c784f8135
rev: 83b57f9f84da82d2f0c04c5a45f7f9395db21b45
hooks:
- id: terraform_providers_lock_staged
- id: lock_modules
Expand Down
4 changes: 3 additions & 1 deletion src/_modules/data_factory_cosmos/iam.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module "roles" {
source = "github.com/pagopa/dx//infra/modules/azure_role_assignments?ref=main"
source = "pagopa/dx-azure-role-assignments/azurerm"
version = "~> 0"

principal_id = var.data_factory_principal_id

cosmos = [
Expand Down
3 changes: 2 additions & 1 deletion src/_modules/data_factory_cosmos/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ terraform {
}

module "naming_convention" {
source = "github.com/pagopa/dx//infra/modules/azure_naming_convention/?ref=main"
source = "pagopa/dx-azure-naming-convention/azurerm"
version = "~> 0"

environment = {
prefix = var.environment.prefix
Expand Down
4 changes: 3 additions & 1 deletion src/_modules/data_factory_storage_account/iam.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module "roles" {
source = "github.com/pagopa/dx//infra/modules/azure_role_assignments?ref=main"
source = "pagopa/dx-azure-role-assignments/azurerm"
version = "~> 0"

principal_id = var.data_factory_principal_id

storage_blob = var.what_to_migrate.blob.enabled ? [
Expand Down
3 changes: 2 additions & 1 deletion src/_modules/data_factory_storage_account/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ terraform {
}

module "naming_convention" {
source = "github.com/pagopa/dx//infra/modules/azure_naming_convention/?ref=main"
source = "pagopa/dx-azure-naming-convention/azurerm"
version = "~> 0"

environment = {
prefix = var.environment.prefix
Expand Down
69 changes: 0 additions & 69 deletions src/common/prod/.terraform.lock.hcl

This file was deleted.

1 change: 1 addition & 0 deletions src/common/prod/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
| <a name="module_application_gateway_weu"></a> [application\_gateway\_weu](#module\_application\_gateway\_weu) | ../_modules/application_gateway | n/a |
| <a name="module_assets_cdn_weu"></a> [assets\_cdn\_weu](#module\_assets\_cdn\_weu) | ../_modules/assets_cdn | n/a |
| <a name="module_cosmos_api_weu"></a> [cosmos\_api\_weu](#module\_cosmos\_api\_weu) | ../_modules/cosmos_api | n/a |
| <a name="module_dx-azure-naming-convention"></a> [dx-azure-naming-convention](#module\_dx-azure-naming-convention) | pagopa/dx-azure-naming-convention/azurerm | 0.0.3 |
| <a name="module_event_hubs_weu"></a> [event\_hubs\_weu](#module\_event\_hubs\_weu) | ../_modules/event_hubs | n/a |
| <a name="module_github_runner_itn"></a> [github\_runner\_itn](#module\_github\_runner\_itn) | ../_modules/github_runner | n/a |
| <a name="module_global"></a> [global](#module\_global) | ../_modules/global | n/a |
Expand Down
4 changes: 1 addition & 3 deletions src/common/prod/tfmodules.lock.json
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
{
"dx-azure-naming-convention": "84ff92691f909a05b224e1c56abb4864f01b4f8e3c854e4bb4c7baf1d3f6d652"
}
{}
5 changes: 1 addition & 4 deletions src/core/prod/tfmodules.lock.json
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{
"networking_itn.dx-azure-naming-convention": "84ff92691f909a05b224e1c56abb4864f01b4f8e3c854e4bb4c7baf1d3f6d652",
"networking_weu.dx-azure-naming-convention": "84ff92691f909a05b224e1c56abb4864f01b4f8e3c854e4bb4c7baf1d3f6d652"
}
{}
3 changes: 2 additions & 1 deletion src/domains/functions/function_assets_cdn.tf
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ module "function_assets_cdn_staging_slot" {
}

module "function_assets_cdn_autoscale" {
source = "github.com/pagopa/dx//infra/modules/azure_app_service_plan_autoscaler?ref=main"
source = "pagopa/dx-azure-app-service-plan-autoscaler/azurerm"
version = "~> 0"
resource_group_name = local.rg_assets_cdn_name
target_service = {
function_app_name = module.function_assets_cdn.name
Expand Down
4 changes: 2 additions & 2 deletions src/domains/ioweb-common/06_cdn_itn.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ resource "azurerm_resource_group" "io_web_profile_itn_fe_rg" {
}

module "io_web_profile_itn_fe_st" {
source = "github.com/pagopa/dx//infra/modules/azure_storage_account?ref=main"

source = "pagopa/dx-azure-storage-account/azurerm"
version = "~> 0"
// s tier -> Standard LRS
// l tier -> Standard ZRS
tier = "l"
Expand Down
3 changes: 2 additions & 1 deletion src/identity/prod/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ provider "azurerm" {
}

module "federated_identities" {
source = "github.com/pagopa/dx//infra/modules/azure_federated_identity_with_github?ref=main"
source = "pagopa/dx-azure-federated-identity-with-github/azurerm"
version = "~> 0"

prefix = local.prefix
env_short = local.env_short
Expand Down
3 changes: 3 additions & 0 deletions src/identity/prod/tfmodules.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"federated_identities": "1e36a9f2561832bce69725dce4875455fe390fd487c8ec8bbdc81b7ba42c9b4c"
}
6 changes: 6 additions & 0 deletions src/migration/prod/tfmodules.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"migrate_cosmos_accounts.naming_convention": "807e8fafaf3cda8d1df7cc5c624715555ff150e87a8df0becc7e5cab3e54f855",
"migrate_cosmos_accounts.roles": "286469e8fb2a96ed28912a0def0115207e20ff9f2ab2c16d751dcf2fd97a543a",
"migrate_storage_accounts.naming_convention": "807e8fafaf3cda8d1df7cc5c624715555ff150e87a8df0becc7e5cab3e54f855",
"migrate_storage_accounts.roles": "286469e8fb2a96ed28912a0def0115207e20ff9f2ab2c16d751dcf2fd97a543a"
}
1 change: 1 addition & 0 deletions src/repository/tfmodules.lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}

0 comments on commit 98ded0c

Please sign in to comment.