diff --git a/src/common/prod/locals.tf b/src/common/prod/locals.tf index 5a50a41d6..78f59c1dd 100644 --- a/src/common/prod/locals.tf +++ b/src/common/prod/locals.tf @@ -52,9 +52,6 @@ locals { 2 = { cidr_subnet = ["10.0.153.0/24"] }, - 3 = { - cidr_subnet = ["10.0.156.0/24"] - } } app_backendli = { diff --git a/src/domains/cgn/_modules/functions_apps/data.tf b/src/domains/cgn/_modules/functions_apps/data.tf index eafa1d254..90a49e356 100644 --- a/src/domains/cgn/_modules/functions_apps/data.tf +++ b/src/domains/cgn/_modules/functions_apps/data.tf @@ -33,12 +33,6 @@ data "azurerm_subnet" "snet_backendl2" { resource_group_name = local.resource_group_name_common } -data "azurerm_subnet" "snet_backendl3" { - name = "appbackendl3" - virtual_network_name = local.vnet_name_common - resource_group_name = local.resource_group_name_common -} - data "azurerm_subnet" "snet_backendli" { name = "appbackendli" virtual_network_name = local.vnet_name_common @@ -104,4 +98,4 @@ data "azurerm_subnet" "private_endpoints_subnet" { data "azurerm_private_dns_zone" "function_app" { name = "privatelink.azurewebsites.net" resource_group_name = local.resource_group_name_common -} \ No newline at end of file +} diff --git a/src/domains/cgn/_modules/functions_apps/function_app_cgn.tf b/src/domains/cgn/_modules/functions_apps/function_app_cgn.tf index 0e659fc41..68199e909 100644 --- a/src/domains/cgn/_modules/functions_apps/function_app_cgn.tf +++ b/src/domains/cgn/_modules/functions_apps/function_app_cgn.tf @@ -45,7 +45,6 @@ module "function_cgn" { data.azurerm_subnet.snet_backendl2.id, data.azurerm_subnet.snet_backendli.id, data.azurerm_subnet.snet_apim_v2.id, - data.azurerm_subnet.snet_backendl3.id, data.azurerm_subnet.apim_itn_snet.id, ] @@ -90,7 +89,6 @@ module "function_cgn_staging_slot" { data.azurerm_subnet.snet_backendl2.id, data.azurerm_subnet.snet_backendli.id, data.azurerm_subnet.snet_apim_v2.id, - data.azurerm_subnet.snet_backendl3.id, data.azurerm_subnet.apim_itn_snet.id, ] diff --git a/src/domains/citizen-auth-app/01_network.tf b/src/domains/citizen-auth-app/01_network.tf index dd3fd1b2b..9c6dfdf5b 100644 --- a/src/domains/citizen-auth-app/01_network.tf +++ b/src/domains/citizen-auth-app/01_network.tf @@ -74,12 +74,6 @@ data "azurerm_subnet" "app_backend_l2_snet" { resource_group_name = local.vnet_common_resource_group_name } -data "azurerm_subnet" "app_backend_l3_snet" { - name = "appbackendl3" - virtual_network_name = local.vnet_common_name - resource_group_name = local.vnet_common_resource_group_name -} - data "azurerm_subnet" "fims_op_app_snet_01" { name = "io-p-weu-fims-op-app-snet-01" virtual_network_name = local.vnet_common_name diff --git a/src/domains/citizen-auth-app/README.md b/src/domains/citizen-auth-app/README.md index a2ff11980..d75eef1a9 100644 --- a/src/domains/citizen-auth-app/README.md +++ b/src/domains/citizen-auth-app/README.md @@ -156,7 +156,6 @@ | [azurerm_subnet.apim_v2_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.app_backend_l1_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.app_backend_l2_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | -| [azurerm_subnet.app_backend_l3_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.appgateway_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.azdoa_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.fims_op_app_snet_01](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | diff --git a/src/domains/eucovidcert/_modules/function_apps/data.tf b/src/domains/eucovidcert/_modules/function_apps/data.tf index 0c1404baf..43f8bc789 100644 --- a/src/domains/eucovidcert/_modules/function_apps/data.tf +++ b/src/domains/eucovidcert/_modules/function_apps/data.tf @@ -33,12 +33,6 @@ data "azurerm_subnet" "snet_backendl2" { resource_group_name = local.resource_group_name_common } -data "azurerm_subnet" "snet_backendl3" { - name = "appbackendl3" - virtual_network_name = local.vnet_name_common - resource_group_name = local.resource_group_name_common -} - data "azurerm_linux_function_app" "function_services" { count = 2 name = "${var.project}-services-fn-${count.index + 1}" @@ -118,4 +112,4 @@ data "azurerm_key_vault_secret" "fn_eucovidcert_FNSERVICES_API_KEY" { data "azurerm_monitor_action_group" "error_action_group" { name = "${replace("${var.project}", "-", "")}error" resource_group_name = local.resource_group_name_common -} \ No newline at end of file +} diff --git a/src/domains/eucovidcert/_modules/function_apps/function_app_eucovidcert.tf b/src/domains/eucovidcert/_modules/function_apps/function_app_eucovidcert.tf index 2a96c4808..3c607d280 100644 --- a/src/domains/eucovidcert/_modules/function_apps/function_app_eucovidcert.tf +++ b/src/domains/eucovidcert/_modules/function_apps/function_app_eucovidcert.tf @@ -39,7 +39,6 @@ module "function_eucovidcert" { data.azurerm_subnet.snet_backendl1.id, data.azurerm_subnet.snet_backendl2.id, data.azurerm_subnet.snet_apim_v2.id, - data.azurerm_subnet.snet_backendl3.id, data.azurerm_subnet.apim_itn_snet.id ] @@ -79,7 +78,6 @@ module "function_eucovidcert_staging_slot" { data.azurerm_subnet.snet_backendl1.id, data.azurerm_subnet.snet_backendl2.id, data.azurerm_subnet.snet_apim_v2.id, - data.azurerm_subnet.snet_backendl3.id, data.azurerm_subnet.apim_itn_snet.id ] diff --git a/src/domains/messages-app/01_network.tf b/src/domains/messages-app/01_network.tf index 4379d366d..d09eee3cf 100644 --- a/src/domains/messages-app/01_network.tf +++ b/src/domains/messages-app/01_network.tf @@ -64,12 +64,6 @@ data "azurerm_subnet" "app_backendl2_snet" { resource_group_name = local.vnet_common_resource_group_name } -data "azurerm_subnet" "app_backendl3_snet" { - name = "appbackendl3" - virtual_network_name = local.vnet_common_name - resource_group_name = local.vnet_common_resource_group_name -} - data "azurerm_subnet" "apim_snet" { name = "apimv2api" virtual_network_name = local.vnet_common_name diff --git a/src/domains/messages-app/10_function_messages.tf b/src/domains/messages-app/10_function_messages.tf index c87210e36..37f6f3f0e 100644 --- a/src/domains/messages-app/10_function_messages.tf +++ b/src/domains/messages-app/10_function_messages.tf @@ -168,7 +168,6 @@ module "app_messages_function" { data.azurerm_subnet.app_backendl1_snet.id, data.azurerm_subnet.app_backendl2_snet.id, data.azurerm_subnet.apim_snet.id, - data.azurerm_subnet.app_backendl3_snet.id, data.azurerm_subnet.apim_itn_snet.id, ] @@ -223,7 +222,6 @@ module "app_messages_function_staging_slot" { data.azurerm_subnet.app_backendl1_snet.id, data.azurerm_subnet.app_backendl2_snet.id, data.azurerm_subnet.azdoa_snet.id, - data.azurerm_subnet.app_backendl3_snet.id ] allowed_ips = concat( diff --git a/src/domains/messages-app/10_function_messages_xl.tf b/src/domains/messages-app/10_function_messages_xl.tf index e6d07451b..9fba14388 100644 --- a/src/domains/messages-app/10_function_messages_xl.tf +++ b/src/domains/messages-app/10_function_messages_xl.tf @@ -87,7 +87,6 @@ module "app_messages_function_xl" { data.azurerm_subnet.app_backendl1_snet.id, data.azurerm_subnet.app_backendl2_snet.id, data.azurerm_subnet.apim_snet.id, - data.azurerm_subnet.app_backendl3_snet.id, data.azurerm_subnet.apim_itn_snet.id, ] @@ -149,7 +148,6 @@ module "app_messages_function_staging_slot_xl" { data.azurerm_subnet.app_backendl2_snet.id, data.azurerm_subnet.azdoa_snet.id, data.azurerm_subnet.github_snet.id, - data.azurerm_subnet.app_backendl3_snet.id ] allowed_ips = concat( diff --git a/src/domains/messages-app/README.md b/src/domains/messages-app/README.md index 530b43644..d72e08b51 100644 --- a/src/domains/messages-app/README.md +++ b/src/domains/messages-app/README.md @@ -122,7 +122,6 @@ | [azurerm_subnet.apim_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.app_backendl1_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.app_backendl2_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | -| [azurerm_subnet.app_backendl3_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.azdoa_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.github_snet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source | | [azurerm_subnet.private_endpoints_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source |