From 2f7c582115d2c362148ec263b98e09273ee406fd Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Thu, 21 Apr 2022 17:36:15 +0200 Subject: [PATCH 1/4] upgraded apim module 2.12 --- src/core/apim.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/apim.tf b/src/core/apim.tf index 0be6dfb43..f587a770a 100644 --- a/src/core/apim.tf +++ b/src/core/apim.tf @@ -43,7 +43,7 @@ resource "azurerm_api_management_custom_domain" "api_custom_domain" { ########################### module "apim" { - source = "git::https://github.com/pagopa/azurerm.git//api_management?ref=v1.0.58" + source = "git::https://github.com/pagopa/azurerm.git//api_management?ref=v2.12.5" subnet_id = module.apim_snet.id location = azurerm_resource_group.rg_api.location name = format("%s-apim", local.project) @@ -265,4 +265,4 @@ module "apim_uservice_party_management_v1" { xml_content = file("./api/jwt_auth_op_policy.xml") } ] -} \ No newline at end of file +} From 2f2dbf70b1215e0a1ad934f485b2590eeef82d98 Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Thu, 21 Apr 2022 17:37:40 +0200 Subject: [PATCH 2/4] upgraded module version --- src/core/apim.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/apim.tf b/src/core/apim.tf index f587a770a..756613cc7 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.58" + source = "git::https://github.com/pagopa/azurerm.git//subnet?ref=v2.12.5" name = format("%s-apim-snet", local.project) resource_group_name = azurerm_resource_group.rg_vnet.name virtual_network_name = module.vnet.name @@ -77,7 +77,7 @@ module "apim" { ## monitor ## module "monitor" { - source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v1.0.58" + source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v2.12.5" name = format("%s-monitor", var.env_short) api_management_name = module.apim.name resource_group_name = azurerm_resource_group.rg_api.name @@ -116,7 +116,7 @@ resource "azurerm_api_management_api_version_set" "apim_uservice_party_process" } module "apim_uservice_party_process_v1" { - source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v1.0.58" + source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v2.12.5" name = format("%s-party-prc-api-v1", local.project) api_management_name = module.apim.name resource_group_name = azurerm_resource_group.rg_api.name @@ -194,7 +194,7 @@ resource "azurerm_api_management_api_version_set" "apim_uservice_party_managemen } module "apim_uservice_party_management_v1" { - source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v1.0.58" + source = "git::https://github.com/pagopa/azurerm.git//api_management_api?ref=v2.12.5" name = format("%s-party-mgmt-api-v1", local.project) api_management_name = module.apim.name resource_group_name = azurerm_resource_group.rg_api.name From c0147e0aeb04d5ced38c26c005ba6c6b3b4885a7 Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Fri, 22 Apr 2022 11:59:42 +0200 Subject: [PATCH 3/4] minor fix --- src/core/apim.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/apim.tf b/src/core/apim.tf index 756613cc7..c2d2dfea9 100644 --- a/src/core/apim.tf +++ b/src/core/apim.tf @@ -211,7 +211,7 @@ module "apim_uservice_party_management_v1" { content_format = "openapi" content_value = templatefile("./api/party_management/v1/open-api.yml.tpl", { - host = "selc-d-apim.azure-api.net" // azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name + host = azurerm_api_management_custom_domain.api_custom_domain.proxy[0].host_name basePath = "party-management/v1" }) From 4198fa561bd264e598d3aaf8c93a4e54d8c036c1 Mon Sep 17 00:00:00 2001 From: diegoitaliait Date: Fri, 22 Apr 2022 12:02:21 +0200 Subject: [PATCH 4/4] pre-commit fix --- src/core/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/README.md b/src/core/README.md index 1e4ad6258..a18dc087b 100644 --- a/src/core/README.md +++ b/src/core/README.md @@ -24,10 +24,10 @@ | [acr](#module\_acr) | git::https://github.com/pagopa/azurerm.git//container_registry | v1.0.58 | | [agid\_spid](#module\_agid\_spid) | git::https://github.com/pagopa/azurerm.git//jwt_keys | v2.7.0 | | [aks](#module\_aks) | git::https://github.com/pagopa/azurerm.git//kubernetes_cluster | v1.0.75 | -| [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 | -| [apim\_uservice\_party\_management\_v1](#module\_apim\_uservice\_party\_management\_v1) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.58 | -| [apim\_uservice\_party\_process\_v1](#module\_apim\_uservice\_party\_process\_v1) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.58 | +| [apim](#module\_apim) | git::https://github.com/pagopa/azurerm.git//api_management | v2.12.5 | +| [apim\_snet](#module\_apim\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v2.12.5 | +| [apim\_uservice\_party\_management\_v1](#module\_apim\_uservice\_party\_management\_v1) | git::https://github.com/pagopa/azurerm.git//api_management_api | v2.12.5 | +| [apim\_uservice\_party\_process\_v1](#module\_apim\_uservice\_party\_process\_v1) | git::https://github.com/pagopa/azurerm.git//api_management_api | v2.12.5 | | [app\_gw](#module\_app\_gw) | git::https://github.com/pagopa/azurerm.git//app_gateway | v2.9.0 | | [appgateway\_snet](#module\_appgateway\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.58 | | [azdoa\_li](#module\_azdoa\_li) | git::https://github.com/pagopa/azurerm.git//azure_devops_agent | v1.0.58 | @@ -44,7 +44,7 @@ | [key\_vault](#module\_key\_vault) | git::https://github.com/pagopa/azurerm.git//key_vault | v1.0.90 | | [mongdb\_collection\_products](#module\_mongdb\_collection\_products) | git::https://github.com/pagopa/azurerm.git//cosmosdb_mongodb_collection | v2.3.0 | | [mongdb\_collection\_user-groups](#module\_mongdb\_collection\_user-groups) | git::https://github.com/pagopa/azurerm.git//cosmosdb_mongodb_collection | v2.3.0 | -| [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v1.0.58 | +| [monitor](#module\_monitor) | git::https://github.com/pagopa/azurerm.git//api_management_api | v2.12.5 | | [postgres\_snet](#module\_postgres\_snet) | git::https://github.com/pagopa/azurerm.git//subnet | v1.0.60 | | [postgresql](#module\_postgresql) | git::https://github.com/pagopa/azurerm.git//postgresql_server | v1.0.79 | | [redis](#module\_redis) | git::https://github.com/pagopa/azurerm.git//redis_cache | v2.0.11 |