Skip to content

Commit

Permalink
Upgrade pagopa modules (#5)
Browse files Browse the repository at this point in the history 
* pagopa modules reference updated

* pre-commit execution

Co-authored-by: anttorre <[email protected]>
  • Loading branch information
@antonioT90
antonioT90 and anttorre authored Oct 5, 2021
1 parent 8d4a483 commit 23a580e
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 36 deletions.
18 changes: 9 additions & 9 deletions src/core/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

| Name | Source | Version |
|------|--------|---------|
| <a name="module_apim"></a> [apim](#module\_apim) | git::https://github.com/pagopa/azurerm.git//api_management | v1.0.50 |
| <a name="module_apim_snet"></a> [apim\_snet](#module\_apim\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.51 |
| <a name="module_appgateway_snet"></a> [appgateway\_snet](#module\_appgateway\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.51 |
| <a name="module_key_vault"></a> [key\_vault](#module\_key\_vault) | git::https://github.com/pagopa/azurerm.git//key_vault | v1.0.48 |
| <a name="module_monitor"></a> [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.16 |
| <a name="module_redis"></a> [redis](#module\_redis) | git::https://github.com/pagopa/azurerm.git//redis_cache | v1.0.37 |
| <a name="module_redis_snet"></a> [redis\_snet](#module\_redis\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.7 |
| <a name="module_vnet"></a> [vnet](#module\_vnet) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.51 |
| <a name="module_vnet_integration"></a> [vnet\_integration](#module\_vnet\_integration) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.51 |
| <a name="module_apim"></a> [apim](#module\_apim) | git::https://github.com/pagopa/azurerm.git//api_management | v1.0.58 |
| <a name="module_apim_snet"></a> [apim\_snet](#module\_apim\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 |
| <a name="module_appgateway_snet"></a> [appgateway\_snet](#module\_appgateway\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 |
| <a name="module_key_vault"></a> [key\_vault](#module\_key\_vault) | git::https://github.com/pagopa/azurerm.git//key_vault | v1.0.58 |
| <a name="module_monitor"></a> [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.58 |
| <a name="module_redis"></a> [redis](#module\_redis) | git::https://github.com/pagopa/azurerm.git//redis_cache | v1.0.58 |
| <a name="module_redis_snet"></a> [redis\_snet](#module\_redis\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 |
| <a name="module_vnet"></a> [vnet](#module\_vnet) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.58 |
| <a name="module_vnet_integration"></a> [vnet\_integration](#module\_vnet\_integration) | git::https://github.com/pagopa/azurerm.git//virtual_network | v1.0.58 |

## Resources

Expand Down
2 changes: 1 addition & 1 deletion src/core/api/base_policy.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
</backend>
<outbound />
<on-error />
</policies>
</policies>
2 changes: 1 addition & 1 deletion src/core/api/base_policy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
<on-error>
<base />
</on-error>
</policies>
</policies>
2 changes: 1 addition & 1 deletion src/core/api/monitor/mock_policy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
<on-error>
<base />
</on-error>
</policies>
</policies>
2 changes: 1 addition & 1 deletion src/core/api/monitor/openapi.json.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
}, {
"apiKeyQuery": []
}]
}
}
8 changes: 4 additions & 4 deletions src/core/apim.tf
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/core/appgateway.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core/azure_devops_agent.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/env/dev/backend.ini
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
subscription=DEV-SelfCare
subscription=DEV-SelfCare
2 changes: 1 addition & 1 deletion src/core/env/prod/backend.ini
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
subscription=PROD-SelfCare
subscription=PROD-SelfCare
2 changes: 1 addition & 1 deletion src/core/env/uat/backend.ini
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
subscription=UAT-SelfCare
subscription=UAT-SelfCare
8 changes: 4 additions & 4 deletions src/core/network.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/core/redis_cache.tf
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/core/security.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/terraform.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
fi
4 changes: 2 additions & 2 deletions src/core/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -284,4 +284,4 @@ variable "postgresql_schema" {
variable "prostgresql_db_mockpsp" {
type = string
default = null
}
}

0 comments on commit 23a580e

Please sign in to comment.