Skip to content

Commit

Permalink
Update network configuration for backend 3 (#1065)
Browse files Browse the repository at this point in the history
  • Loading branch information
Krusty93 authored Jul 10, 2024
1 parent 124f9a4 commit 18def1e
Show file tree
Hide file tree
Showing 16 changed files with 46 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cgn_cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ jobs:
with:
environment: prod
dir: "src/domains/cgn/prod/westeurope"
use_private_agent: true
1 change: 1 addition & 0 deletions .github/workflows/cgn_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ jobs:
with:
environment: prod
dir: "src/domains/cgn/prod/westeurope"
use_private_agent: true
1 change: 1 addition & 0 deletions .github/workflows/eucovidcert_cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ jobs:
with:
environment: prod
dir: "src/domains/eucovidcert/prod/westeurope"
use_private_agent: true
1 change: 1 addition & 0 deletions .github/workflows/eucovidcert_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ jobs:
with:
environment: prod
dir: "src/domains/eucovidcert/prod/westeurope"
use_private_agent: true
6 changes: 6 additions & 0 deletions src/domains/cgn/_modules/functions_apps/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ data "azurerm_subnet" "snet_backendl2" {
resource_group_name = local.resource_group_name_common
}

data "azurerm_subnet" "snet_backendl3" {
name = "io-p-weu-backend-snet-03"
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
Expand Down
2 changes: 2 additions & 0 deletions src/domains/cgn/_modules/functions_apps/function_app_cgn.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ module "function_cgn" {
var.subnet_id,
data.azurerm_subnet.snet_backendl1.id,
data.azurerm_subnet.snet_backendl2.id,
data.azurerm_subnet.snet_backendl3.id,
data.azurerm_subnet.snet_backendli.id,
data.azurerm_subnet.snet_apim_v2.id,
]
Expand Down Expand Up @@ -89,6 +90,7 @@ module "function_cgn_staging_slot" {
data.azurerm_subnet.snet_azdoa.id,
data.azurerm_subnet.snet_backendl1.id,
data.azurerm_subnet.snet_backendl2.id,
data.azurerm_subnet.snet_backendl3.id,
data.azurerm_subnet.snet_backendli.id,
data.azurerm_subnet.snet_apim_v2.id,
]
Expand Down
6 changes: 6 additions & 0 deletions src/domains/citizen-auth-app/01_network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ data "azurerm_subnet" "app_backend_l2_snet" {
resource_group_name = local.vnet_common_resource_group_name
}

data "azurerm_subnet" "app_backend_l3_snet" {
name = "io-p-weu-backend-snet-03"
virtual_network_name = local.vnet_common_name
resource_group_name = local.vnet_common_resource_group_name
}

data "azurerm_subnet" "ioweb_profile_snet" {
name = format("%s-ioweb-profile-snet", local.common_project)
virtual_network_name = local.vnet_common_name
Expand Down
2 changes: 2 additions & 0 deletions src/domains/citizen-auth-app/07_function_fast_login.tf
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ module "function_fast_login" {
data.azurerm_subnet.apim_v2_snet.id,
data.azurerm_subnet.app_backend_l1_snet.id,
data.azurerm_subnet.app_backend_l2_snet.id,
data.azurerm_subnet.app_backend_l3_snet.id,
data.azurerm_subnet.ioweb_profile_snet.id,
module.session_manager_snet.id,
]
Expand Down Expand Up @@ -188,6 +189,7 @@ module "function_fast_login_staging_slot" {
data.azurerm_subnet.apim_v2_snet.id,
data.azurerm_subnet.app_backend_l1_snet.id,
data.azurerm_subnet.app_backend_l2_snet.id,
data.azurerm_subnet.app_backend_l3_snet.id,
]

tags = var.tags
Expand Down
1 change: 1 addition & 0 deletions src/domains/citizen-auth-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
| [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 |
Expand Down
6 changes: 6 additions & 0 deletions src/domains/eucovidcert/_modules/function_apps/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ data "azurerm_subnet" "snet_backendl2" {
resource_group_name = local.resource_group_name_common
}

data "azurerm_subnet" "snet_backendl3" {
name = "io-p-weu-backend-snet-03"
virtual_network_name = local.vnet_name_common
resource_group_name = local.resource_group_name_common
}

data "azurerm_subnet" "snet_pblevtdispatcher" {
name = "fnpblevtdispatcherout"
virtual_network_name = local.vnet_name_common
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module "function_eucovidcert" {
var.subnet_id,
data.azurerm_subnet.snet_backendl1.id,
data.azurerm_subnet.snet_backendl2.id,
data.azurerm_subnet.snet_backendl3.id,
data.azurerm_subnet.snet_pblevtdispatcher.id,
data.azurerm_subnet.snet_apim_v2.id,
]
Expand Down Expand Up @@ -77,6 +78,7 @@ module "function_eucovidcert_staging_slot" {
var.subnet_id,
data.azurerm_subnet.snet_backendl1.id,
data.azurerm_subnet.snet_backendl2.id,
data.azurerm_subnet.snet_backendl3.id,
data.azurerm_subnet.snet_pblevtdispatcher.id,
data.azurerm_subnet.snet_apim_v2.id,
]
Expand Down
6 changes: 6 additions & 0 deletions src/domains/functions/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,9 @@ data "azurerm_subnet" "app_backendl2_snet" {
resource_group_name = local.rg_common_name
virtual_network_name = local.vnet_common_name
}

data "azurerm_subnet" "app_backendl3_snet" {
name = "io-p-weu-backend-snet-03"
resource_group_name = local.rg_common_name
virtual_network_name = local.vnet_common_name
}
2 changes: 2 additions & 0 deletions src/domains/functions/function_app.tf
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ module "function_app" {
module.app_snet[count.index].id,
data.azurerm_subnet.app_backendl1_snet.id,
data.azurerm_subnet.app_backendl2_snet.id,
data.azurerm_subnet.app_backendl3_snet.id,
data.azurerm_subnet.app_backendli_snet.id,
data.azurerm_subnet.ioweb_profile_snet.id,
data.azurerm_subnet.session_manager_snet.id,
Expand Down Expand Up @@ -288,6 +289,7 @@ module "function_app_staging_slot" {
data.azurerm_subnet.azdoa_snet.id,
data.azurerm_subnet.app_backendl1_snet.id,
data.azurerm_subnet.app_backendl2_snet.id,
data.azurerm_subnet.app_backendl3_snet.id,
data.azurerm_subnet.app_backendli_snet.id,
]

Expand Down
6 changes: 6 additions & 0 deletions src/domains/messages-app/01_network.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ data "azurerm_subnet" "app_backendl2_snet" {
resource_group_name = local.vnet_common_resource_group_name
}

data "azurerm_subnet" "app_backendl3_snet" {
name = "io-p-weu-backend-snet-03"
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
Expand Down
2 changes: 2 additions & 0 deletions src/domains/messages-app/10_function_messages.tf
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ module "app_messages_function" {
module.app_messages_snet[count.index].id,
data.azurerm_subnet.app_backendl1_snet.id,
data.azurerm_subnet.app_backendl2_snet.id,
data.azurerm_subnet.app_backendl3_snet.id,
data.azurerm_subnet.apim_snet.id,
]

Expand Down Expand Up @@ -215,6 +216,7 @@ module "app_messages_function_staging_slot" {
module.app_messages_snet[count.index].id,
data.azurerm_subnet.app_backendl1_snet.id,
data.azurerm_subnet.app_backendl2_snet.id,
data.azurerm_subnet.app_backendl3_snet.id,
data.azurerm_subnet.azdoa_snet.id,
]

Expand Down
1 change: 1 addition & 0 deletions src/domains/messages-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
| [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.private_endpoints_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source |
| [azurerm_subnet.runner_subnet](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/subnet) | data source |
Expand Down

0 comments on commit 18def1e

Please sign in to comment.