Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CES-595] Remove AppBackend 3 #1367

Merged
merged 3 commits into from
Dec 18, 2024
Merged

[CES-595] Remove AppBackend 3 #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ddf576
remove appbackend3
Dec 17, 2024
c28967d
fix readme
Dec 17, 2024
8600301
Merge branch 'main' into CES-595-rimuovere-app-backend-3
Krusty93 Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/common/prod/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ locals {
2 = {
cidr_subnet = ["10.0.153.0/24"]
},
3 = {
cidr_subnet = ["10.0.156.0/24"]
}
}

app_backendli = {
Expand Down
8 changes: 1 addition & 7 deletions src/domains/cgn/_modules/functions_apps/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
}
2 changes: 0 additions & 2 deletions src/domains/cgn/_modules/functions_apps/function_app_cgn.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]

Expand Down Expand Up @@ -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,
]

Expand Down
6 changes: 0 additions & 6 deletions src/domains/citizen-auth-app/01_network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/domains/citizen-auth-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
8 changes: 1 addition & 7 deletions src/domains/eucovidcert/_modules/function_apps/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
}
}
2 changes: 0 additions & 2 deletions src/domains/eucovidcert/_modules/function_apps/function_app_eucovidcert.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]

Expand Down Expand Up @@ -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
]

Expand Down
6 changes: 0 additions & 6 deletions src/domains/messages-app/01_network.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/domains/messages-app/10_function_messages.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]

Expand Down Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions src/domains/messages-app/10_function_messages_xl.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]

Expand Down Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion src/domains/messages-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
Loading