Skip to content

Commit

Permalink
Merge branch 'main' into IOCOM-1810-app-messages-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacavallaro authored Oct 4, 2024
2 parents 14c5c9c + cb21a1c commit 23e319b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 1 deletion.
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 = "appbackendl3"
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
4 changes: 3 additions & 1 deletion src/domains/citizen-auth-app/07_function_fast_login.tf
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ module "function_fast_login" {
data.azurerm_subnet.app_backend_l2_snet.id,
data.azurerm_subnet.ioweb_profile_snet.id,
module.session_manager_snet.id,
data.azurerm_subnet.app_backend_l3_snet.id
]

# Action groups for alerts
Expand Down Expand Up @@ -321,7 +322,8 @@ module "function_fast_login_staging_slot" {
data.azurerm_subnet.azdoa_snet[0].id,
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_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 @@ -154,6 +154,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/functions/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,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 = "appbackendl3"
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 @@ -239,6 +239,7 @@ module "function_app" {
data.azurerm_subnet.app_backendli_snet.id,
data.azurerm_subnet.ioweb_profile_snet.id,
data.azurerm_subnet.session_manager_snet.id,
data.azurerm_subnet.app_backendl3_snet.id
]

sticky_app_setting_names = concat([
Expand Down Expand Up @@ -291,6 +292,7 @@ module "function_app_staging_slot" {
data.azurerm_subnet.app_backendl1_snet.id,
data.azurerm_subnet.app_backendl2_snet.id,
data.azurerm_subnet.app_backendli_snet.id,
data.azurerm_subnet.app_backendl3_snet.id
]

tags = var.tags
Expand Down

0 comments on commit 23e319b

Please sign in to comment.