Merge pull request #257 from DFE-Digital/main

Merge main into release dac changes
DFE-Digital · Nov 21, 2024 · 5c1cced · 5c1cced
2 parents 2f2bc0e + cc053c0
commit 5c1cced
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 122 deletions.
diff --git a/.github/workflows/build-and-test-template.yml b/.github/workflows/build-and-test-template.yml
@@ -48,6 +48,7 @@ jobs:
         if: ${{ inputs.working_directory == 'service/service-directory-api' || inputs.working_directory == 'service/referral-api' }}
         shell: bash
         run: |
+          sudo apt-get update
           sudo apt-get install libspatialite-dev libsqlite3-mod-spatialite -y
           sudo ldconfig "/usr/lib/x86_64-linux-gnu/mod_spatialite.so"
 
@@ -73,4 +74,4 @@ jobs:
             cat results.md >> $GITHUB_STEP_SUMMARY
            else
             echo "Skipping - No tests found in this project."
-           fi
+           fi
diff --git a/terraform/modules/fhinfrastructurestack/fh-report-api-app.tf b/terraform/modules/fhinfrastructurestack/fh-report-api-app.tf
@@ -1,16 +1,5 @@
 # Report API Application Group
 
-# Create Application Insight for Report API
-resource "azurerm_application_insights" "fh_report_api_app_insights" {
-  name                  = "${var.prefix}-as-fh-report-api"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Report API
 resource "azurerm_windows_web_app" "fh_report_api" {
   app_settings = {

diff --git a/terraform/modules/fhinfrastructurestack/main.tf b/terraform/modules/fhinfrastructurestack/main.tf
@@ -137,17 +137,6 @@ resource "azurerm_monitor_autoscale_setting" "autoscale" {
   }
 }
 
-# Create Application Insights for IDAM Maintenance UI
-resource "azurerm_application_insights" "fh_idam_maintenance_ui_app_insights" {
-  name                  = "${var.prefix}-as-fh-idam-maintenance-ui"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for IDAM Maintenance UI
 resource "azurerm_windows_web_app" "fh_idam_maintenance_ui" {
   app_settings = {
@@ -199,17 +188,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_idam_mainten
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Referral API 
-resource "azurerm_application_insights" "fh_referral_api_app_insights" {
-  name                  = "${var.prefix}-as-fh-referral-api"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Referral API
 resource "azurerm_windows_web_app" "fh_referral_api" {
   app_settings = {
@@ -260,17 +238,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_referral_api
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Referral UI
-resource "azurerm_application_insights" "fh_referral_ui_app_insights" {
-  name                  = "${var.prefix}-as-fh-referral-ui"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Referral UI
 resource "azurerm_windows_web_app" "fh_referral_ui" {
   app_settings = {
@@ -322,18 +289,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_referral_ui"
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-
-# Create Application Insights for Service Directory API
-resource "azurerm_application_insights" "fh_sd_api_app_insights" {
-  name                  = "${var.prefix}-as-fh-sd-api"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Service Directory API
 resource "azurerm_windows_web_app" "fh_sd_api" {
   app_settings = {
@@ -355,6 +310,9 @@ resource "azurerm_windows_web_app" "fh_sd_api" {
   service_plan_id                               = azurerm_service_plan.apps_plan.id
   client_affinity_enabled                       = false
   https_only                                    = true
+  identity {
+    type                                        = "SystemAssigned"
+  }
   site_config {
     always_on                                   = true
     ftps_state                                  = "Disabled"
@@ -388,17 +346,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_sd_api" {
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Service Directory UI
-resource "azurerm_application_insights" "fh_sd_ui_app_insights" {
-  name                  = "${var.prefix}-as-fh-sd-ui"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Service Directory UI
 resource "azurerm_windows_web_app" "fh_sd_ui" {
   app_settings = {
@@ -413,6 +360,9 @@ resource "azurerm_windows_web_app" "fh_sd_ui" {
   service_plan_id                               = azurerm_service_plan.apps_plan.id
   client_affinity_enabled                       = false
   https_only                                    = false
+  identity {
+    type                                        = "SystemAssigned"
+  }
   site_config {
     always_on                                   = true
     ftps_state                                  = "Disabled"
@@ -447,17 +397,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_sd_ui" {
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Service Directory Admin UI
-resource "azurerm_application_insights" "fh_sd_admin_ui_app_insights" {
-  name                  = "${var.prefix}-as-fh-sd-admin-ui"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Service Directory Admin UI
 resource "azurerm_windows_web_app" "fh_sd_admin_ui" {
   app_settings = {
@@ -509,17 +448,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_sd_admin_ui"
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Referrals Dashboard UI
-resource "azurerm_application_insights" "fh_referral_dashboard_ui_app_insights" {
-  name                  = "${var.prefix}-as-fh-ref-dash-ui"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Referrals Dashboard UI
 resource "azurerm_windows_web_app" "fh_referral_dashboard_ui" {
   app_settings = {
@@ -570,17 +498,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_referral_das
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for IDAM API 
-resource "azurerm_application_insights" "fh_idam_api_app_insights" {
-  name                  = "${var.prefix}-as-fh-idam-api"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for IDAM API
 resource "azurerm_windows_web_app" "fh_idam_api" {
   app_settings = {
@@ -595,6 +512,9 @@ resource "azurerm_windows_web_app" "fh_idam_api" {
   service_plan_id                               = azurerm_service_plan.apps_plan.id
   client_affinity_enabled                       = false
   https_only                                    = true
+  identity {
+    type                                        = "SystemAssigned"
+  }
   site_config {
     always_on                                   = true
     ftps_state                                  = "Disabled"
@@ -628,17 +548,6 @@ resource "azurerm_app_service_virtual_network_swift_connection" "fh_idam_api" {
   subnet_id      = azurerm_subnet.vnetint.id
 }
 
-# Create Application Insights for Notification API 
-resource "azurerm_application_insights" "fh_notification_api_app_insights" {
-  name                  = "${var.prefix}-as-fh-notification-api"
-  resource_group_name   = local.resource_group_name
-  location              = var.location
-  application_type      = "web"
-  sampling_percentage   = 0
-  workspace_id          = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 # Create App Service for Notification API
 resource "azurerm_windows_web_app" "fh_notification_api" {
   app_settings = {
@@ -653,6 +562,9 @@ resource "azurerm_windows_web_app" "fh_notification_api" {
   service_plan_id                               = azurerm_service_plan.apps_plan.id
   client_affinity_enabled                       = false
   https_only                                    = true
+  identity {
+    type                                        = "SystemAssigned"
+  }
   site_config {
     always_on                                   = true
     ftps_state                                  = "Disabled"

diff --git a/terraform/modules/fhinfrastructurestack/open-referral-func.tf b/terraform/modules/fhinfrastructurestack/open-referral-func.tf
@@ -7,16 +7,6 @@ module "open_referral_storage_account" {
   tags = local.tags
 }
 
-resource "azurerm_application_insights" "open_referral_function_app_insights" {
-  name = "${var.prefix}-as-fh-open-referral-func"
-  resource_group_name = local.resource_group_name
-  location = var.location
-  application_type = "web"
-  sampling_percentage = 0
-  workspace_id = azurerm_log_analytics_workspace.app_services.id
-  tags = local.tags
-}
-
 resource "azurerm_windows_function_app" "open_referral_function_app" {
   name = "${var.prefix}-fa-fh-open-referral"
   location = var.location