From 7e7616796754c8efaf7bdc529c71ca4fb0a12378 Mon Sep 17 00:00:00 2001 From: Enda Kelly Date: Wed, 15 Jun 2022 15:47:14 +0100 Subject: [PATCH 1/4] Update azurerm provider for backend appgw --- components/backendappgateway/init.tf | 2 +- components/backendappgateway/main.tf | 2 +- environments/demo/backend_lb_config.yaml | 1 + environments/dev/backend_lb_config.yaml | 8 ++++++++ environments/ithc/backend_lb_config.yaml | 10 +++++++++- environments/prod/backend_lb_config.yaml | 14 ++++++++++++++ environments/sbox/backend_lb_config.yaml | 10 ++++++++++ environments/stg/backend_lb_config.yaml | 14 ++++++++++++++ environments/test/backend_lb_config.yaml | 15 +++++++++++++++ 9 files changed, 73 insertions(+), 3 deletions(-) diff --git a/components/backendappgateway/init.tf b/components/backendappgateway/init.tf index 90cb9e023..f45af20fb 100644 --- a/components/backendappgateway/init.tf +++ b/components/backendappgateway/init.tf @@ -7,7 +7,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "2.58.0" + version = "3.10.0" } } } diff --git a/components/backendappgateway/main.tf b/components/backendappgateway/main.tf index 8ea737c00..91fc3d95e 100644 --- a/components/backendappgateway/main.tf +++ b/components/backendappgateway/main.tf @@ -17,7 +17,7 @@ locals { } module "backendappgateway" { - source = "git::https://github.com/hmcts/terraform-module-application-backend.git?ref=master" + source = "git::https://github.com/hmcts/terraform-module-application-backend.git?ref=terraform-azurerm-v3" yaml_path = "${path.cwd}/../../environments/${var.env}/backend_lb_config.yaml" diff --git a/environments/demo/backend_lb_config.yaml b/environments/demo/backend_lb_config.yaml index 0a7a7ee9a..3c9e83b91 100644 --- a/environments/demo/backend_lb_config.yaml +++ b/environments/demo/backend_lb_config.yaml @@ -10,3 +10,4 @@ gateways: app_configuration: - product: dummy component: app + priority: 10 diff --git a/environments/dev/backend_lb_config.yaml b/environments/dev/backend_lb_config.yaml index 503849fef..597ade62e 100644 --- a/environments/dev/backend_lb_config.yaml +++ b/environments/dev/backend_lb_config.yaml @@ -11,25 +11,33 @@ gateways: # Toffee application - product: toffee component: recipe-backend + priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 20 - product: vh component: video-api ssl_enabled: true + priority: 30 - product: vh component: test-api ssl_enabled: true + priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 50 - product: vh component: notification-api ssl_enabled: true + priority: 60 - product: vh component: bookings-api ssl_enabled: true + priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true + priority: 80 \ No newline at end of file diff --git a/environments/ithc/backend_lb_config.yaml b/environments/ithc/backend_lb_config.yaml index dccf6320e..0c5605c03 100644 --- a/environments/ithc/backend_lb_config.yaml +++ b/environments/ithc/backend_lb_config.yaml @@ -11,25 +11,33 @@ gateways: # Toffee - product: toffee component: recipe-backend + priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 20 - product: vh component: video-api ssl_enabled: true + priority: 30 - product: vh component: test-api ssl_enabled: true + priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 50 - product: vh component: notification-api ssl_enabled: true + priority: 60 - product: vh component: bookings-api ssl_enabled: true + priority: 70 - product: vh component: booking-queue-subscriber - ssl_enabled: true \ No newline at end of file + ssl_enabled: true + priority: 80 \ No newline at end of file diff --git a/environments/prod/backend_lb_config.yaml b/environments/prod/backend_lb_config.yaml index 6d8eaf71b..db5350d53 100644 --- a/environments/prod/backend_lb_config.yaml +++ b/environments/prod/backend_lb_config.yaml @@ -11,44 +11,58 @@ gateways: # Toffee - product: toffee component: backend + priority: 10 # Publication and Information - product: pip component: business-rules ssl_enabled: true + priority: 20 - product: pip component: publication-services ssl_enabled: true + priority: 30 - product: pip component: data-management ssl_enabled: true + priority: 40 - product: pip component: channel-management ssl_enabled: true + priority: 50 - product: pip component: subscription-management ssl_enabled: true + priority: 60 - product: pip component: account-management ssl_enabled: true + priority: 70 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 80 - product: vh component: video-api ssl_enabled: true + priority: 90 - product: vh component: test-api ssl_enabled: true + priority: 100 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 110 - product: vh component: notification-api ssl_enabled: true + priority: 120 - product: vh component: bookings-api ssl_enabled: true + priority: 130 - product: vh component: booking-queue-subscriber ssl_enabled: true + priority: 140 \ No newline at end of file diff --git a/environments/sbox/backend_lb_config.yaml b/environments/sbox/backend_lb_config.yaml index 5e6e26a58..6029dd308 100644 --- a/environments/sbox/backend_lb_config.yaml +++ b/environments/sbox/backend_lb_config.yaml @@ -11,32 +11,42 @@ gateways: # Toffee - product: toffee component: recipe-backend + priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 20 - product: vh component: video-api ssl_enabled: true + priority: 30 - product: vh component: test-api ssl_enabled: true + priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 50 - product: vh component: notification-api ssl_enabled: true + priority: 60 - product: vh component: bookings-api ssl_enabled: true + priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true + priority: 80 #labs - product: labs component: mokainos + priority: 90 # test - product: test component: override host_name_suffix_override: service.core-compute-sandbox.internal + priority: 100 \ No newline at end of file diff --git a/environments/stg/backend_lb_config.yaml b/environments/stg/backend_lb_config.yaml index 66fd30978..a8ae839ee 100644 --- a/environments/stg/backend_lb_config.yaml +++ b/environments/stg/backend_lb_config.yaml @@ -11,44 +11,58 @@ gateways: # Toffee - product: toffee component: recipe-backend + priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 20 - product: vh component: video-api ssl_enabled: true + priority: 30 - product: vh component: test-api ssl_enabled: true + priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 50 - product: vh component: notification-api ssl_enabled: true + priority: 60 - product: vh component: bookings-api ssl_enabled: true + priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true + priority: 80 # Publication and Information - product: pip component: business-rules ssl_enabled: true + priority: 90 - product: pip component: publication-services ssl_enabled: true + priority: 100 - product: pip component: data-management ssl_enabled: true + priority: 110 - product: pip component: channel-management ssl_enabled: true + priority: 120 - product: pip component: subscription-management ssl_enabled: true + priority: 130 - product: pip component: account-management ssl_enabled: true + priority: 140 \ No newline at end of file diff --git a/environments/test/backend_lb_config.yaml b/environments/test/backend_lb_config.yaml index 42257aa4a..cf332cdd4 100644 --- a/environments/test/backend_lb_config.yaml +++ b/environments/test/backend_lb_config.yaml @@ -11,47 +11,62 @@ gateways: # Toffee - product: toffee component: recipe-backend + priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true + priority: 20 - product: vh component: video-api ssl_enabled: true + priority: 30 - product: vh component: test-api ssl_enabled: true + priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true + priority: 50 - product: vh component: notification-api ssl_enabled: true + priority: 60 - product: vh component: bookings-api ssl_enabled: true + priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true + priority: 80 # Publication and Information - product: pip component: frontend ssl_enabled: true + priority: 90 - product: pip component: business-rules ssl_enabled: true + priority: 100 - product: pip component: publication-services ssl_enabled: true + priority: 110 - product: pip component: data-management ssl_enabled: true + priority: 120 - product: pip component: channel-management ssl_enabled: true + priority: 130 - product: pip component: subscription-management ssl_enabled: true + priority: 140 - product: pip component: account-management ssl_enabled: true + priority: 150 \ No newline at end of file From be0843c65bd66a4a7d167c366363cb992053da05 Mon Sep 17 00:00:00 2001 From: Enda Kelly Date: Wed, 15 Jun 2022 15:51:23 +0100 Subject: [PATCH 2/4] fix branch name --- components/backendappgateway/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/backendappgateway/main.tf b/components/backendappgateway/main.tf index 91fc3d95e..1f7cbd287 100644 --- a/components/backendappgateway/main.tf +++ b/components/backendappgateway/main.tf @@ -17,7 +17,7 @@ locals { } module "backendappgateway" { - source = "git::https://github.com/hmcts/terraform-module-application-backend.git?ref=terraform-azurerm-v3" + source = "git::https://github.com/hmcts/terraform-module-application-backend.git?ref=terraform-v2.99-upgrade" yaml_path = "${path.cwd}/../../environments/${var.env}/backend_lb_config.yaml" From cd9f57f8bff169d99499a4ad5498be1f597c0ac6 Mon Sep 17 00:00:00 2001 From: Enda Kelly Date: Fri, 17 Jun 2022 10:02:26 +0100 Subject: [PATCH 3/4] remove priority on sandbox lb --- environments/sbox/backend_lb_config.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/environments/sbox/backend_lb_config.yaml b/environments/sbox/backend_lb_config.yaml index 6029dd308..e56cf629c 100644 --- a/environments/sbox/backend_lb_config.yaml +++ b/environments/sbox/backend_lb_config.yaml @@ -11,42 +11,32 @@ gateways: # Toffee - product: toffee component: recipe-backend - priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 20 - product: vh component: video-api ssl_enabled: true - priority: 30 - product: vh component: test-api ssl_enabled: true - priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 50 - product: vh component: notification-api ssl_enabled: true - priority: 60 - product: vh component: bookings-api ssl_enabled: true - priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true - priority: 80 #labs - product: labs component: mokainos - priority: 90 # test - product: test component: override - host_name_suffix_override: service.core-compute-sandbox.internal - priority: 100 \ No newline at end of file + host_name_suffix_override: service.core-compute-sandbox.internal \ No newline at end of file From 7cb877a2af0310e7250f40ac76c33e90a0b0693a Mon Sep 17 00:00:00 2001 From: Enda Kelly Date: Fri, 17 Jun 2022 10:07:59 +0100 Subject: [PATCH 4/4] remove priority from other envs --- environments/demo/backend_lb_config.yaml | 1 - environments/dev/backend_lb_config.yaml | 10 +--------- environments/ithc/backend_lb_config.yaml | 10 +--------- environments/prod/backend_lb_config.yaml | 16 +--------------- environments/stg/backend_lb_config.yaml | 16 +--------------- environments/test/backend_lb_config.yaml | 17 +---------------- 6 files changed, 5 insertions(+), 65 deletions(-) diff --git a/environments/demo/backend_lb_config.yaml b/environments/demo/backend_lb_config.yaml index 3c9e83b91..0a7a7ee9a 100644 --- a/environments/demo/backend_lb_config.yaml +++ b/environments/demo/backend_lb_config.yaml @@ -10,4 +10,3 @@ gateways: app_configuration: - product: dummy component: app - priority: 10 diff --git a/environments/dev/backend_lb_config.yaml b/environments/dev/backend_lb_config.yaml index 597ade62e..10f8f4d74 100644 --- a/environments/dev/backend_lb_config.yaml +++ b/environments/dev/backend_lb_config.yaml @@ -11,33 +11,25 @@ gateways: # Toffee application - product: toffee component: recipe-backend - priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 20 - product: vh component: video-api ssl_enabled: true - priority: 30 - product: vh component: test-api ssl_enabled: true - priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 50 - product: vh component: notification-api ssl_enabled: true - priority: 60 - product: vh component: bookings-api ssl_enabled: true - priority: 70 - product: vh component: booking-queue-subscriber - ssl_enabled: true - priority: 80 \ No newline at end of file + ssl_enabled: true \ No newline at end of file diff --git a/environments/ithc/backend_lb_config.yaml b/environments/ithc/backend_lb_config.yaml index 0c5605c03..dccf6320e 100644 --- a/environments/ithc/backend_lb_config.yaml +++ b/environments/ithc/backend_lb_config.yaml @@ -11,33 +11,25 @@ gateways: # Toffee - product: toffee component: recipe-backend - priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 20 - product: vh component: video-api ssl_enabled: true - priority: 30 - product: vh component: test-api ssl_enabled: true - priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 50 - product: vh component: notification-api ssl_enabled: true - priority: 60 - product: vh component: bookings-api ssl_enabled: true - priority: 70 - product: vh component: booking-queue-subscriber - ssl_enabled: true - priority: 80 \ No newline at end of file + ssl_enabled: true \ No newline at end of file diff --git a/environments/prod/backend_lb_config.yaml b/environments/prod/backend_lb_config.yaml index db5350d53..52696b4d8 100644 --- a/environments/prod/backend_lb_config.yaml +++ b/environments/prod/backend_lb_config.yaml @@ -11,58 +11,44 @@ gateways: # Toffee - product: toffee component: backend - priority: 10 # Publication and Information - product: pip component: business-rules ssl_enabled: true - priority: 20 - product: pip component: publication-services ssl_enabled: true - priority: 30 - product: pip component: data-management ssl_enabled: true - priority: 40 - product: pip component: channel-management ssl_enabled: true - priority: 50 - product: pip component: subscription-management ssl_enabled: true - priority: 60 - product: pip component: account-management ssl_enabled: true - priority: 70 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 80 - product: vh component: video-api ssl_enabled: true - priority: 90 - product: vh component: test-api ssl_enabled: true - priority: 100 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 110 - product: vh component: notification-api ssl_enabled: true - priority: 120 - product: vh component: bookings-api ssl_enabled: true - priority: 130 - product: vh component: booking-queue-subscriber - ssl_enabled: true - priority: 140 \ No newline at end of file + ssl_enabled: true \ No newline at end of file diff --git a/environments/stg/backend_lb_config.yaml b/environments/stg/backend_lb_config.yaml index a8ae839ee..58fe73afd 100644 --- a/environments/stg/backend_lb_config.yaml +++ b/environments/stg/backend_lb_config.yaml @@ -11,58 +11,44 @@ gateways: # Toffee - product: toffee component: recipe-backend - priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 20 - product: vh component: video-api ssl_enabled: true - priority: 30 - product: vh component: test-api ssl_enabled: true - priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 50 - product: vh component: notification-api ssl_enabled: true - priority: 60 - product: vh component: bookings-api ssl_enabled: true - priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true - priority: 80 # Publication and Information - product: pip component: business-rules ssl_enabled: true - priority: 90 - product: pip component: publication-services ssl_enabled: true - priority: 100 - product: pip component: data-management ssl_enabled: true - priority: 110 - product: pip component: channel-management ssl_enabled: true - priority: 120 - product: pip component: subscription-management ssl_enabled: true - priority: 130 - product: pip component: account-management - ssl_enabled: true - priority: 140 \ No newline at end of file + ssl_enabled: true \ No newline at end of file diff --git a/environments/test/backend_lb_config.yaml b/environments/test/backend_lb_config.yaml index cf332cdd4..fe7424eea 100644 --- a/environments/test/backend_lb_config.yaml +++ b/environments/test/backend_lb_config.yaml @@ -11,62 +11,47 @@ gateways: # Toffee - product: toffee component: recipe-backend - priority: 10 # Video Hearings - product: vh component: user-api ssl_enabled: true - priority: 20 - product: vh component: video-api ssl_enabled: true - priority: 30 - product: vh component: test-api ssl_enabled: true - priority: 40 - product: vh component: scheduler-jobs ssl_enabled: true - priority: 50 - product: vh component: notification-api ssl_enabled: true - priority: 60 - product: vh component: bookings-api ssl_enabled: true - priority: 70 - product: vh component: booking-queue-subscriber ssl_enabled: true - priority: 80 # Publication and Information - product: pip component: frontend ssl_enabled: true - priority: 90 - product: pip component: business-rules ssl_enabled: true - priority: 100 - product: pip component: publication-services ssl_enabled: true - priority: 110 - product: pip component: data-management ssl_enabled: true - priority: 120 - product: pip component: channel-management ssl_enabled: true - priority: 130 - product: pip component: subscription-management ssl_enabled: true - priority: 140 - product: pip component: account-management - ssl_enabled: true - priority: 150 \ No newline at end of file + ssl_enabled: true \ No newline at end of file