From 23a580eb6e789b6dfd9a1bb563d246c60d3f3b01 Mon Sep 17 00:00:00 2001 From: antonioT90 <34568575+antonioT90@users.noreply.github.com> Date: Tue, 5 Oct 2021 18:25:20 +0200 Subject: [PATCH] Upgrade pagopa modules (#5) * pagopa modules reference updated * pre-commit execution Co-authored-by: anttorre --- src/core/README.md | 18 +++++++++--------- src/core/api/base_policy.tpl | 2 +- src/core/api/base_policy.xml | 2 +- src/core/api/monitor/mock_policy.xml | 2 +- src/core/api/monitor/openapi.json.tpl | 2 +- src/core/apim.tf | 8 ++++---- src/core/appgateway.tf | 6 +++--- src/core/azure_devops_agent.tf | 4 ++-- src/core/env/dev/backend.ini | 2 +- src/core/env/prod/backend.ini | 2 +- src/core/env/uat/backend.ini | 2 +- src/core/network.tf | 8 ++++---- src/core/redis_cache.tf | 4 ++-- src/core/security.tf | 4 ++-- src/core/terraform.sh | 2 +- src/core/variables.tf | 4 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/core/README.md b/src/core/README.md index 52e90d418..22dafcbf8 100644 --- a/src/core/README.md +++ b/src/core/README.md @@ -16,15 +16,15 @@ | Name | Source | Version | |------|--------|---------| -| [apim](#module\_apim) | git::https://github.com/pagopa/azurerm.git//api_management | v1.0.50 | -| [apim\_snet](#module\_apim\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.51 | -| [appgateway\_snet](#module\_appgateway\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.51 | -| [key\_vault](#module\_key\_vault) | git::https://github.com/pagopa/azurerm.git//key_vault | v1.0.48 | -| [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.16 | -| [redis](#module\_redis) | git::https://github.com/pagopa/azurerm.git//redis_cache | v1.0.37 | -| [redis\_snet](#module\_redis\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.7 | -| [vnet](#module\_vnet) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.51 | -| [vnet\_integration](#module\_vnet\_integration) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.51 | +| [apim](#module\_apim) | git::https://github.com/pagopa/azurerm.git//api_management | v1.0.58 | +| [apim\_snet](#module\_apim\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 | +| [appgateway\_snet](#module\_appgateway\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 | +| [key\_vault](#module\_key\_vault) | git::https://github.com/pagopa/azurerm.git//key_vault | v1.0.58 | +| [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.58 | +| [redis](#module\_redis) | git::https://github.com/pagopa/azurerm.git//redis_cache | v1.0.58 | +| [redis\_snet](#module\_redis\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 | +| [vnet](#module\_vnet) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.58 | +| [vnet\_integration](#module\_vnet\_integration) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.58 | ## Resources diff --git a/src/core/api/base_policy.tpl b/src/core/api/base_policy.tpl index caaa706eb..c9e15e4b7 100644 --- a/src/core/api/base_policy.tpl +++ b/src/core/api/base_policy.tpl @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/core/api/base_policy.xml b/src/core/api/base_policy.xml index 9fab776c4..ce1df461e 100644 --- a/src/core/api/base_policy.xml +++ b/src/core/api/base_policy.xml @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/src/core/api/monitor/mock_policy.xml b/src/core/api/monitor/mock_policy.xml index 89e5cef9a..9ab5d3f6b 100644 --- a/src/core/api/monitor/mock_policy.xml +++ b/src/core/api/monitor/mock_policy.xml @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/src/core/api/monitor/openapi.json.tpl b/src/core/api/monitor/openapi.json.tpl index ec8603ad3..5a85227d1 100644 --- a/src/core/api/monitor/openapi.json.tpl +++ b/src/core/api/monitor/openapi.json.tpl @@ -40,4 +40,4 @@ }, { "apiKeyQuery": [] }] -} \ No newline at end of file +} diff --git a/src/core/apim.tf b/src/core/apim.tf index 5741eed0d..30868d317 100644 --- a/src/core/apim.tf +++ b/src/core/apim.tf @@ -1,6 +1,6 @@ # APIM subnet module "apim_snet" { - source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.51" + source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.58" name = format("%s-apim-snet", local.project) resource_group_name = azurerm_resource_group.rg_vnet.name virtual_network_name = module.vnet_integration.name @@ -27,11 +27,11 @@ locals { } ########################### -## Api Management (apim) ## +## Api Management (apim) ## ########################### module "apim" { - source = "git::https://github.com/pagopa/azurerm.git//api_management?ref=v1.0.50" + source = "git::https://github.com/pagopa/azurerm.git//api_management?ref=v1.0.58" subnet_id = module.apim_snet.id location = azurerm_resource_group.rg_api.location name = format("%s-apim", local.project) @@ -104,7 +104,7 @@ resource "azurerm_api_management_custom_domain" "api_custom_domain" { ## monitor ## module "monitor" { - source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v1.0.16" + source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v1.0.58" name = format("%s-monitor", var.env_short) api_management_name = module.apim.name resource_group_name = azurerm_resource_group.rg_api.name diff --git a/src/core/appgateway.tf b/src/core/appgateway.tf index c302d1576..15d98c46c 100644 --- a/src/core/appgateway.tf +++ b/src/core/appgateway.tf @@ -11,14 +11,14 @@ resource "azurerm_public_ip" "appgateway_public_ip" { # Subnet to host the application gateway module "appgateway_snet" { - source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.51" + source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.58" name = format("%s-appgateway-snet", local.project) address_prefixes = var.cidr_subnet_appgateway resource_group_name = azurerm_resource_group.rg_vnet.name virtual_network_name = module.vnet.name } -## Application gateway ## +## Application gateway ## # Since these variables are re-used - a locals block makes this more maintainable locals { backend_address_pool_name = format("%s-appgw-be-address-pool", local.project) @@ -36,7 +36,7 @@ locals { # Application gateway: Multilistener configuraiton module "app_gw" { - source = "git::https://github.com/pagopa/azurerm.git//app_gateway?ref=v1.0.55" + source = "git::https://github.com/pagopa/azurerm.git//app_gateway?ref=v1.0.58" resource_group_name = azurerm_resource_group.rg_vnet.name location = azurerm_resource_group.rg_vnet.location diff --git a/src/core/azure_devops_agent.tf b/src/core/azure_devops_agent.tf index 3ecdbedd2..7626ffa79 100644 --- a/src/core/azure_devops_agent.tf +++ b/src/core/azure_devops_agent.tf @@ -7,7 +7,7 @@ resource "azurerm_resource_group" "azdo_rg" { } module "azdoa_snet" { - source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.3" + source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.58" count = var.enable_azdoa ? 1 : 0 name = format("%s-azdoa-snet", local.project) address_prefixes = var.cidr_subnet_azdoa @@ -17,7 +17,7 @@ module "azdoa_snet" { } module "azdoa_li" { - source = "git::https://github.com/pagopa/azurerm.git//azure_devops_agent?ref=v1.0.57" + source = "git::https://github.com/pagopa/azurerm.git//azure_devops_agent?ref=v1.0.58" count = var.enable_azdoa ? 1 : 0 name = format("%s-azdoa-vmss-li", local.project) resource_group_name = azurerm_resource_group.azdo_rg[0].name diff --git a/src/core/env/dev/backend.ini b/src/core/env/dev/backend.ini index 73ee9c6b7..200a37a11 100644 --- a/src/core/env/dev/backend.ini +++ b/src/core/env/dev/backend.ini @@ -1 +1 @@ -subscription=DEV-SelfCare \ No newline at end of file +subscription=DEV-SelfCare diff --git a/src/core/env/prod/backend.ini b/src/core/env/prod/backend.ini index 0343b4a0d..dc3318a88 100644 --- a/src/core/env/prod/backend.ini +++ b/src/core/env/prod/backend.ini @@ -1 +1 @@ -subscription=PROD-SelfCare \ No newline at end of file +subscription=PROD-SelfCare diff --git a/src/core/env/uat/backend.ini b/src/core/env/uat/backend.ini index 8cadfd658..8be578585 100644 --- a/src/core/env/uat/backend.ini +++ b/src/core/env/uat/backend.ini @@ -1 +1 @@ -subscription=UAT-SelfCare \ No newline at end of file +subscription=UAT-SelfCare diff --git a/src/core/network.tf b/src/core/network.tf index bf3834c37..c282a056b 100644 --- a/src/core/network.tf +++ b/src/core/network.tf @@ -7,7 +7,7 @@ resource "azurerm_resource_group" "rg_vnet" { # vnet module "vnet" { - source = "git::https://github.com/pagopa/azurerm.git//virtual_network?ref=v1.0.51" + source = "git::https://github.com/pagopa/azurerm.git//virtual_network?ref=v1.0.58" name = format("%s-vnet", local.project) location = azurerm_resource_group.rg_vnet.location resource_group_name = azurerm_resource_group.rg_vnet.name @@ -18,7 +18,7 @@ module "vnet" { # vnet integration module "vnet_integration" { - source = "git::https://github.com/pagopa/azurerm.git//virtual_network?ref=v1.0.51" + source = "git::https://github.com/pagopa/azurerm.git//virtual_network?ref=v1.0.58" name = format("%s-vnet-integration", local.project) location = azurerm_resource_group.rg_vnet.location resource_group_name = azurerm_resource_group.rg_vnet.name @@ -27,9 +27,9 @@ module "vnet_integration" { tags = var.tags } -## Peering between the vnet(main) and integration vnet +## Peering between the vnet(main) and integration vnet module "vnet_peering" { - source = "git::https://github.com/pagopa/azurerm.git//virtual_network_peering?ref=v1.0.30" + source = "git::https://github.com/pagopa/azurerm.git//virtual_network_peering?ref=v1.0.58" location = azurerm_resource_group.rg_vnet.location diff --git a/src/core/redis_cache.tf b/src/core/redis_cache.tf index f84ba01f9..c2d698410 100644 --- a/src/core/redis_cache.tf +++ b/src/core/redis_cache.tf @@ -1,6 +1,6 @@ ## Database subnet module "redis_snet" { - source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.51" + source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v1.0.58" count = var.redis_sku_name == "Premium" && length(var.cidr_subnet_redis) > 0 ? 1 : 0 name = format("%s-redis-snet", local.project) address_prefixes = var.cidr_subnet_redis @@ -10,7 +10,7 @@ module "redis_snet" { module "redis" { count = var.redis_cache_enabled ? 1 : 0 - source = "git::https://github.com/pagopa/azurerm.git//redis_cache?ref=v1.0.37" + source = "git::https://github.com/pagopa/azurerm.git//redis_cache?ref=v1.0.58" name = format("%s-redis", local.project) resource_group_name = azurerm_resource_group.data.name location = azurerm_resource_group.data.location diff --git a/src/core/security.tf b/src/core/security.tf index 23449c14c..918e2da38 100644 --- a/src/core/security.tf +++ b/src/core/security.tf @@ -6,7 +6,7 @@ resource "azurerm_resource_group" "sec_rg" { } module "key_vault" { - source = "git::https://github.com/pagopa/azurerm.git//key_vault?ref=v1.0.48" + source = "git::https://github.com/pagopa/azurerm.git//key_vault?ref=v1.0.58" name = format("%s-kv", local.project) location = azurerm_resource_group.sec_rg.location resource_group_name = azurerm_resource_group.sec_rg.name @@ -16,7 +16,7 @@ module "key_vault" { tags = var.tags } -# ## api management policy ## +# ## api management policy ## resource "azurerm_key_vault_access_policy" "api_management_policy" { key_vault_id = module.key_vault.id tenant_id = data.azurerm_client_config.current.tenant_id diff --git a/src/core/terraform.sh b/src/core/terraform.sh index 369bd0187..2ead9e508 100755 --- a/src/core/terraform.sh +++ b/src/core/terraform.sh @@ -35,4 +35,4 @@ if echo "init plan apply refresh import output state taint destroy" | grep -w $a else echo "Action not allowed." exit 1 -fi \ No newline at end of file +fi diff --git a/src/core/variables.tf b/src/core/variables.tf index a1599d743..57f879ec3 100644 --- a/src/core/variables.tf +++ b/src/core/variables.tf @@ -201,7 +201,7 @@ variable "enable_iac_pipeline" { default = false } -## Database server postgresl +## Database server postgresl variable "postgresql_sku_name" { type = string description = "Specifies the SKU Name for this PostgreSQL Server." @@ -284,4 +284,4 @@ variable "postgresql_schema" { variable "prostgresql_db_mockpsp" { type = string default = null -} \ No newline at end of file +}