From 9e781f654183f6293e78afb3f95b312571ba1553 Mon Sep 17 00:00:00 2001 From: SabinaHMCTS Date: Thu, 25 Apr 2024 21:25:22 +0100 Subject: [PATCH 1/6] update up to update status --- .../CaseWorkerRefUsersController.java | 19 ++++++++++++++++--- .../cwrdapi/service/CaseWorkerService.java | 5 +++++ .../service/impl/CaseWorkerServiceImpl.java | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersController.java b/src/main/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersController.java index 3af3f5865..1b3fa4544 100644 --- a/src/main/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersController.java +++ b/src/main/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersController.java @@ -35,12 +35,14 @@ import uk.gov.hmcts.reform.cwrdapi.controllers.response.CaseWorkersProfileUpdationResponse; import uk.gov.hmcts.reform.cwrdapi.controllers.response.StaffProfileCreationResponse; import uk.gov.hmcts.reform.cwrdapi.domain.CaseWorkerProfile; +import uk.gov.hmcts.reform.cwrdapi.domain.UserProfileUpdatedData; import uk.gov.hmcts.reform.cwrdapi.service.CaseWorkerDeleteService; import uk.gov.hmcts.reform.cwrdapi.service.CaseWorkerProfileUpdateservice; import uk.gov.hmcts.reform.cwrdapi.service.CaseWorkerService; import uk.gov.hmcts.reform.cwrdapi.service.StaffRefDataService; import java.util.List; +import java.util.Optional; import static java.lang.String.format; import static org.apache.commons.lang3.ObjectUtils.isEmpty; @@ -51,6 +53,8 @@ import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.API_IS_NOT_AVAILABLE_IN_PROD_ENV; import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.BAD_REQUEST; import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.FORBIDDEN_ERROR; +import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.IDAM_STATUS_PENDING; +import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.IDAM_STATUS_SUSPENDED; import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.INTERNAL_SERVER_ERROR; import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.NO_DATA_FOUND; import static uk.gov.hmcts.reform.cwrdapi.util.CaseWorkerConstants.RECORDS_UPLOADED; @@ -337,9 +341,18 @@ public ResponseEntity updateCaseWorkerDetails(@RequestBody CaseWorkersPr caseWorkersProfileUpdationResponse = caseWorkerProfileUpdateservice .updateCaseWorkerProfile(caseWorkersProfileUpdationRequest); if (isNotEmpty(caseWorkersProfileUpdationResponse)) { - StaffProfileCreationResponse staffProfileCreationResponse = StaffProfileCreationResponse - .builder().caseWorkerId(caseWorkersProfileUpdationResponse.getUserId()).build(); - staffRefDataService.publishStaffProfileToTopic(staffProfileCreationResponse); + + Optional resultResponse = caseWorkerService.getUserProfileUpdateResponse( + UserProfileUpdatedData.builder().idamStatus( + caseWorkersProfileUpdationRequest.getSuspended() ? IDAM_STATUS_SUSPENDED + : IDAM_STATUS_PENDING).build(), + caseWorkersProfileUpdationRequest.getUserId(), "NON-EXUI"); + + if (isNotEmpty(resultResponse)) { + StaffProfileCreationResponse staffProfileCreationResponse = StaffProfileCreationResponse + .builder().caseWorkerId(caseWorkersProfileUpdationResponse.getUserId()).build(); + staffRefDataService.publishStaffProfileToTopic(staffProfileCreationResponse); + } } return ResponseEntity .status(HttpStatus.OK).body(caseWorkersProfileUpdationResponse); diff --git a/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/CaseWorkerService.java b/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/CaseWorkerService.java index 8c53b01c5..e1cf3ca80 100644 --- a/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/CaseWorkerService.java +++ b/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/CaseWorkerService.java @@ -7,8 +7,10 @@ import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkersProfileCreationRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.response.IdamRolesMappingResponse; import uk.gov.hmcts.reform.cwrdapi.domain.CaseWorkerProfile; +import uk.gov.hmcts.reform.cwrdapi.domain.UserProfileUpdatedData; import java.util.List; +import java.util.Optional; @Service public interface CaseWorkerService { @@ -47,5 +49,8 @@ List processCaseWorkerProfiles(List fetchStaffProfilesForRoleRefresh(String ccdServiceNames, PageRequest pageRequest); + + public Optional getUserProfileUpdateResponse(UserProfileUpdatedData userProfileUpdatedData, + String userId, String origin); } diff --git a/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/impl/CaseWorkerServiceImpl.java b/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/impl/CaseWorkerServiceImpl.java index b27c2948d..cd82916fb 100644 --- a/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/impl/CaseWorkerServiceImpl.java +++ b/src/main/java/uk/gov/hmcts/reform/cwrdapi/service/impl/CaseWorkerServiceImpl.java @@ -773,7 +773,7 @@ public boolean isEachRoleUpdated(UserProfileUpdatedData userProfileUpdatedData, return isEachRoleUpdated; } - private Optional getUserProfileUpdateResponse(UserProfileUpdatedData userProfileUpdatedData, + public Optional getUserProfileUpdateResponse(UserProfileUpdatedData userProfileUpdatedData, String userId, String origin) { Response response = userProfileFeignClient.modifyUserRoles(userProfileUpdatedData, userId, origin); log.info("{}:: UserProfile update roles :: status code {}:: Job Id {}", loggingComponentName, From c541197c10acf6b15dea93251b6ba15fd2c9392b Mon Sep 17 00:00:00 2001 From: Chi Cho Date: Thu, 6 Jun 2024 11:23:29 +0100 Subject: [PATCH 2/6] Added unit tests --- .../CaseWorkerRefUsersControllerTest.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/test/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersControllerTest.java b/src/test/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersControllerTest.java index 6f0c687bf..23b218918 100644 --- a/src/test/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersControllerTest.java +++ b/src/test/java/uk/gov/hmcts/reform/cwrdapi/controllers/CaseWorkerRefUsersControllerTest.java @@ -17,15 +17,18 @@ import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkersProfileUpdationRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.request.UserRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.response.CaseWorkerProfileCreationResponse; +import uk.gov.hmcts.reform.cwrdapi.controllers.response.CaseWorkersProfileUpdationResponse; import uk.gov.hmcts.reform.cwrdapi.domain.CaseWorkerProfile; import uk.gov.hmcts.reform.cwrdapi.service.CaseWorkerProfileUpdateservice; import uk.gov.hmcts.reform.cwrdapi.service.CaseWorkerService; +import uk.gov.hmcts.reform.cwrdapi.service.StaffRefDataService; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -40,6 +43,7 @@ class CaseWorkerRefUsersControllerTest { CaseWorkerService caseWorkerServiceMock; CaseWorkerProfileUpdateservice caseWorkerProfileUpdateserviceMock; + StaffRefDataService staffRefDataServiceMock; List caseWorkersProfileCreationRequest = new ArrayList<>(); CaseWorkersProfileCreationRequest cwRequest; CaseWorkerProfileCreationResponse cwProfileCreationResponse; @@ -52,6 +56,7 @@ class CaseWorkerRefUsersControllerTest { void setUp() { caseWorkerServiceMock = mock(CaseWorkerService.class); caseWorkerProfileUpdateserviceMock = mock(CaseWorkerProfileUpdateservice.class); + staffRefDataServiceMock = mock(StaffRefDataService.class); cwResponse = CaseWorkerProfileCreationResponse .builder() .caseWorkerRegistrationResponse("Case Worker Profiles Created.") @@ -232,4 +237,40 @@ void updateCaseWorkerProfileFromProfileSyncShouldThrow400() { caseWorkerRefUsersController.updateCaseWorkerDetails(caseWorkersProfileUpdationRequest)); } + + @Test + void updateCaseWorkerProfileAlsoUpdateStaffProfile() { + + CaseWorkersProfileUpdationRequest caseWorkersProfileUpdationRequest = CaseWorkersProfileUpdationRequest + .caseWorkersProfileUpdationRequest() + .suspended(true) + .build(); + when(caseWorkerProfileUpdateserviceMock.updateCaseWorkerProfile(caseWorkersProfileUpdationRequest)) + .thenReturn(new CaseWorkersProfileUpdationResponse()); + when(caseWorkerServiceMock.getUserProfileUpdateResponse(any(), any(), any())) + .thenReturn(Optional.empty()); + ResponseEntity actual = + caseWorkerRefUsersController.updateCaseWorkerDetails(caseWorkersProfileUpdationRequest); + assertNotNull(actual); + verify(staffRefDataServiceMock, times(1)) + .publishStaffProfileToTopic(any()); + } + + @Test + void updateCaseWorkerProfileWhenUserIdEmpty() { + + when(caseWorkerServiceMock.getUserProfileUpdateResponse(any(), any(), any())) + .thenReturn(any()); + CaseWorkersProfileUpdationRequest caseWorkersProfileUpdationRequest = CaseWorkersProfileUpdationRequest + .caseWorkersProfileUpdationRequest() + .suspended(true) + .build(); + when(caseWorkerProfileUpdateserviceMock.updateCaseWorkerProfile(caseWorkersProfileUpdationRequest)) + .thenReturn(new CaseWorkersProfileUpdationResponse()); + ResponseEntity actual = + caseWorkerRefUsersController.updateCaseWorkerDetails(caseWorkersProfileUpdationRequest); + assertNotNull(actual); + verify(staffRefDataServiceMock, times(0)) + .publishStaffProfileToTopic(any()); + } } From 22e016497f63b030968f959fb99b032671b96282 Mon Sep 17 00:00:00 2001 From: Kiran Yenigala Date: Thu, 13 Jun 2024 12:30:35 +0100 Subject: [PATCH 3/6] DTSRD-2845: Resize PG flexible server instance --- infrastructure/demo.tfvars | 3 ++- infrastructure/ithc.tfvars | 3 ++- infrastructure/main.tf | 1 + infrastructure/variables.tf | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/infrastructure/demo.tfvars b/infrastructure/demo.tfvars index 4f92c8158..280212d50 100644 --- a/infrastructure/demo.tfvars +++ b/infrastructure/demo.tfvars @@ -1 +1,2 @@ -db_replicas = [ "replica" ] \ No newline at end of file +db_replicas = [ "replica" ] +pgsql_sku = "GP_Standard_D2s_v3" \ No newline at end of file diff --git a/infrastructure/ithc.tfvars b/infrastructure/ithc.tfvars index 4f92c8158..280212d50 100644 --- a/infrastructure/ithc.tfvars +++ b/infrastructure/ithc.tfvars @@ -1 +1,2 @@ -db_replicas = [ "replica" ] \ No newline at end of file +db_replicas = [ "replica" ] +pgsql_sku = "GP_Standard_D2s_v3" \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 7fd135e34..23ec51d41 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -62,6 +62,7 @@ module "db-rd-caseworker-ref-v16" { subnet_suffix = "expanded" pgsql_version = "16" + pgsql_sku = var.pgsql_sku product = "rd" name = join("-", [var.product-v16, var.component-v16]) diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf index 7aeeea6fe..9962f1c0a 100644 --- a/infrastructure/variables.tf +++ b/infrastructure/variables.tf @@ -133,4 +133,9 @@ variable "pgsql_server_configuration" { value = "OFF" } ] +} + +variable "pgsql_sku" { + description = "The PGSql flexible server instance sku" + default = "GP_Standard_D4s_v3" } \ No newline at end of file From faa79f18b21e5e8e5910e89d1fd0351224ccedaf Mon Sep 17 00:00:00 2001 From: Kiran Yenigala Date: Thu, 13 Jun 2024 12:36:33 +0100 Subject: [PATCH 4/6] Revert "DTSRD-2845: Resize PG flexible server instance" This reverts commit 22e016497f63b030968f959fb99b032671b96282. --- infrastructure/demo.tfvars | 3 +-- infrastructure/ithc.tfvars | 3 +-- infrastructure/main.tf | 1 - infrastructure/variables.tf | 5 ----- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/infrastructure/demo.tfvars b/infrastructure/demo.tfvars index 280212d50..4f92c8158 100644 --- a/infrastructure/demo.tfvars +++ b/infrastructure/demo.tfvars @@ -1,2 +1 @@ -db_replicas = [ "replica" ] -pgsql_sku = "GP_Standard_D2s_v3" \ No newline at end of file +db_replicas = [ "replica" ] \ No newline at end of file diff --git a/infrastructure/ithc.tfvars b/infrastructure/ithc.tfvars index 280212d50..4f92c8158 100644 --- a/infrastructure/ithc.tfvars +++ b/infrastructure/ithc.tfvars @@ -1,2 +1 @@ -db_replicas = [ "replica" ] -pgsql_sku = "GP_Standard_D2s_v3" \ No newline at end of file +db_replicas = [ "replica" ] \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 23ec51d41..7fd135e34 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -62,7 +62,6 @@ module "db-rd-caseworker-ref-v16" { subnet_suffix = "expanded" pgsql_version = "16" - pgsql_sku = var.pgsql_sku product = "rd" name = join("-", [var.product-v16, var.component-v16]) diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf index 9962f1c0a..7aeeea6fe 100644 --- a/infrastructure/variables.tf +++ b/infrastructure/variables.tf @@ -133,9 +133,4 @@ variable "pgsql_server_configuration" { value = "OFF" } ] -} - -variable "pgsql_sku" { - description = "The PGSql flexible server instance sku" - default = "GP_Standard_D4s_v3" } \ No newline at end of file From 1380fa3d1c2aa30965d46fb1a44eb1cb2e86c86b Mon Sep 17 00:00:00 2001 From: Chi Cho Date: Wed, 10 Jul 2024 11:20:42 +0100 Subject: [PATCH 5/6] Added functional test --- .../cwrdapi/CaseWorkerRefFunctionalTest.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/cwrdapi/CaseWorkerRefFunctionalTest.java b/src/functionalTest/java/uk/gov/hmcts/reform/cwrdapi/CaseWorkerRefFunctionalTest.java index 4eae2beea..320aac374 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/cwrdapi/CaseWorkerRefFunctionalTest.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/cwrdapi/CaseWorkerRefFunctionalTest.java @@ -24,12 +24,14 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; +import uk.gov.hmcts.reform.cwrdapi.client.domain.CaseWorkerProfile; import uk.gov.hmcts.reform.cwrdapi.client.domain.StaffProfileWithServiceName; import uk.gov.hmcts.reform.cwrdapi.client.domain.WorkArea; import uk.gov.hmcts.reform.cwrdapi.client.response.UserProfileResponse; import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkerRoleRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkerWorkAreaRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkersProfileCreationRequest; +import uk.gov.hmcts.reform.cwrdapi.controllers.request.CaseWorkersProfileUpdationRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.request.UserRequest; import uk.gov.hmcts.reform.cwrdapi.controllers.response.CaseWorkerFileCreationResponse; import uk.gov.hmcts.reform.cwrdapi.controllers.response.CaseWorkerProfileCreationResponse; @@ -51,6 +53,7 @@ import static java.lang.String.format; import static org.apache.commons.collections.CollectionUtils.isEmpty; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -797,6 +800,42 @@ private void createCaseWorkerIds() { caseWorkerIds = caseWorkerProfileCreationResponse.getCaseWorkerIds(); } + @Test + public void updateCaseworkerToSuspended() { + + List caseWorkersProfileCreationRequests = caseWorkerApiClient + .createCaseWorkerProfiles(); + Response response = caseWorkerApiClient.createUserProfiles(caseWorkersProfileCreationRequests); + + CaseWorkerProfileCreationResponse caseWorkerProfileCreationResponse = + response.getBody().as(CaseWorkerProfileCreationResponse.class); + List caseWorkerIds = caseWorkerProfileCreationResponse.getCaseWorkerIds(); + + CaseWorkersProfileUpdationRequest caseWorkersProfileUpdationRequest = CaseWorkersProfileUpdationRequest + .caseWorkersProfileUpdationRequest().firstName("StaffProfilefirstNamesnew") + .lastName("StaffProfilelastNamenew") + .userId(caseWorkerIds.get(0)) + .emailId(String.format(EMAIL_TEMPLATE, randomAlphanumeric(10)).toLowerCase()) + .suspended(true) + .build(); + + Response updateResponse = caseWorkerApiClient.updateCaseWorkerProfile(caseWorkersProfileUpdationRequest); + assertEquals(200,updateResponse.statusCode()); + Response fetchResponse = caseWorkerApiClient.getMultipleAuthHeadersInternal(ROLE_CWD_SYSTEM_USER) + .body(UserRequest.builder().userIds(caseWorkerIds).build()) + .post("/refdata/case-worker/users/fetchUsersById/") + .andReturn(); + fetchResponse.then() + .assertThat() + .statusCode(200); + + List fetchedList = + Arrays.asList(fetchResponse.getBody().as( + CaseWorkerProfile[].class)); + assertEquals(1, fetchedList.size()); + assertEquals("true", fetchedList.get(0).getSuspended()); + } + @AfterAll public static void cleanUpTestData() { try { From d2d1b9ccd08b1c77d3c313a206d9ab63f0f6922b Mon Sep 17 00:00:00 2001 From: 54687 <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 10:28:52 +0000 Subject: [PATCH 6/6] Updating Terraform Formatting --- infrastructure/aat.tfvars | 4 +- infrastructure/demo.tfvars | 2 +- infrastructure/ithc.tfvars | 2 +- infrastructure/main.tf | 96 +++++++++++++++++----------------- infrastructure/perftest.tfvars | 2 +- infrastructure/prod.tfvars | 4 +- infrastructure/terraform.tf | 2 +- infrastructure/variables.tf | 8 +-- 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/infrastructure/aat.tfvars b/infrastructure/aat.tfvars index 0f41ddc7d..6daeb4056 100644 --- a/infrastructure/aat.tfvars +++ b/infrastructure/aat.tfvars @@ -1,4 +1,4 @@ -db_replicas = [ "replica" ] +db_replicas = ["replica"] pgsql_server_configuration = [ { name = "azure.extensions" @@ -7,4 +7,4 @@ pgsql_server_configuration = [ { name = "backslash_quote" value = "ON" - }] \ No newline at end of file +}] \ No newline at end of file diff --git a/infrastructure/demo.tfvars b/infrastructure/demo.tfvars index 4f92c8158..d81502790 100644 --- a/infrastructure/demo.tfvars +++ b/infrastructure/demo.tfvars @@ -1 +1 @@ -db_replicas = [ "replica" ] \ No newline at end of file +db_replicas = ["replica"] \ No newline at end of file diff --git a/infrastructure/ithc.tfvars b/infrastructure/ithc.tfvars index 4f92c8158..d81502790 100644 --- a/infrastructure/ithc.tfvars +++ b/infrastructure/ithc.tfvars @@ -1 +1 @@ -db_replicas = [ "replica" ] \ No newline at end of file +db_replicas = ["replica"] \ No newline at end of file diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 7fd135e34..1bc5cf8f9 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -1,11 +1,11 @@ locals { - preview_vault_name = join("-", [var.raw_product, "aat"]) - non_preview_vault_name = join("-", [var.raw_product, var.env]) - key_vault_name = var.env == "preview" || var.env == "spreview" ? local.preview_vault_name : local.non_preview_vault_name + preview_vault_name = join("-", [var.raw_product, "aat"]) + non_preview_vault_name = join("-", [var.raw_product, var.env]) + key_vault_name = var.env == "preview" || var.env == "spreview" ? local.preview_vault_name : local.non_preview_vault_name - s2s_rg_prefix = "rpe-service-auth-provider" - s2s_key_vault_name = var.env == "preview" || var.env == "spreview" ? join("-", ["s2s", "aat"]) : join("-", ["s2s", var.env]) - s2s_vault_resource_group = var.env == "preview" || var.env == "spreview" ? join("-", [local.s2s_rg_prefix, "aat"]) : join("-", [local.s2s_rg_prefix, var.env]) + s2s_rg_prefix = "rpe-service-auth-provider" + s2s_key_vault_name = var.env == "preview" || var.env == "spreview" ? join("-", ["s2s", "aat"]) : join("-", ["s2s", var.env]) + s2s_vault_resource_group = var.env == "preview" || var.env == "spreview" ? join("-", [local.s2s_rg_prefix, "aat"]) : join("-", [local.s2s_rg_prefix, var.env]) } data "azurerm_key_vault" "rd_key_vault" { @@ -19,14 +19,14 @@ data "azurerm_key_vault" "s2s_key_vault" { } data "azurerm_key_vault_secret" "s2s_secret" { - name = "microservicekey-rd-caseworker-ref-api" - key_vault_id = data.azurerm_key_vault.s2s_key_vault.id + name = "microservicekey-rd-caseworker-ref-api" + key_vault_id = data.azurerm_key_vault.s2s_key_vault.id } resource "azurerm_key_vault_secret" "caseworker_s2s_secret" { - name = "caseworker-ref-api-s2s-secret" - value = data.azurerm_key_vault_secret.s2s_secret.value - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = "caseworker-ref-api-s2s-secret" + value = data.azurerm_key_vault_secret.s2s_secret.value + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } # Create the database server v16 @@ -53,17 +53,17 @@ module "db-rd-caseworker-ref-v16" { force_user_permissions_trigger = "3" # Sets correct DB owner after migration to fix permissions - enable_schema_ownership = var.enable_schema_ownership + enable_schema_ownership = var.enable_schema_ownership force_schema_ownership_trigger = "3" - kv_subscription = var.kv_subscription - kv_name = data.azurerm_key_vault.rd_key_vault.name - user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name - pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name + kv_subscription = var.kv_subscription + kv_name = data.azurerm_key_vault.rd_key_vault.name + user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name + pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name - subnet_suffix = "expanded" - pgsql_version = "16" - product = "rd" - name = join("-", [var.product-v16, var.component-v16]) + subnet_suffix = "expanded" + pgsql_version = "16" + product = "rd" + name = join("-", [var.product-v16, var.component-v16]) pgsql_server_configuration = var.pgsql_server_configuration @@ -92,50 +92,50 @@ module "db-rd-caseworker-ref-v16-replica" { force_user_permissions_trigger = "3" # Sets correct DB owner after migration to fix permissions - enable_schema_ownership = var.enable_schema_ownership + enable_schema_ownership = var.enable_schema_ownership force_schema_ownership_trigger = "3" - kv_subscription = var.kv_subscription - kv_name = data.azurerm_key_vault.rd_key_vault.name - user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name - pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name - - subnet_suffix = "expanded" - pgsql_version = "16" - product = "rd" - name = join("-", [var.product-v16, var.component-v16,"replica"]) - resource_group_name = "rd-caseworker-ref-api-postgres-db-v16-data-${var.env}" - create_mode = "Replica" - source_server_id = var.primary_server_id + kv_subscription = var.kv_subscription + kv_name = data.azurerm_key_vault.rd_key_vault.name + user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name + pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name + + subnet_suffix = "expanded" + pgsql_version = "16" + product = "rd" + name = join("-", [var.product-v16, var.component-v16, "replica"]) + resource_group_name = "rd-caseworker-ref-api-postgres-db-v16-data-${var.env}" + create_mode = "Replica" + source_server_id = var.primary_server_id pgsql_server_configuration = var.pgsql_server_configuration } resource "azurerm_key_vault_secret" "POSTGRES-PASS" { - name = join("-", [var.component, "POSTGRES-PASS"]) - value = module.db-rd-caseworker-ref-v16.password - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = join("-", [var.component, "POSTGRES-PASS"]) + value = module.db-rd-caseworker-ref-v16.password + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } resource "azurerm_key_vault_secret" "POSTGRES_DATABASE" { - name = join("-", [var.component, "POSTGRES-DATABASE"]) - value = "dbrdcaseworker" - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = join("-", [var.component, "POSTGRES-DATABASE"]) + value = "dbrdcaseworker" + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } resource "azurerm_key_vault_secret" "POSTGRES_HOST" { - name = join("-", [var.component, "POSTGRES-HOST"]) - value = module.db-rd-caseworker-ref-v16.fqdn - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = join("-", [var.component, "POSTGRES-HOST"]) + value = module.db-rd-caseworker-ref-v16.fqdn + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } resource "azurerm_key_vault_secret" "POSTGRES_PORT" { - name = join("-", [var.component, "POSTGRES-PORT"]) - value = "5432" - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = join("-", [var.component, "POSTGRES-PORT"]) + value = "5432" + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } resource "azurerm_key_vault_secret" "POSTGRES-USER" { - name = join("-", [var.component, "POSTGRES-USER"]) - value = module.db-rd-caseworker-ref-v16.username - key_vault_id = data.azurerm_key_vault.rd_key_vault.id + name = join("-", [var.component, "POSTGRES-USER"]) + value = module.db-rd-caseworker-ref-v16.username + key_vault_id = data.azurerm_key_vault.rd_key_vault.id } \ No newline at end of file diff --git a/infrastructure/perftest.tfvars b/infrastructure/perftest.tfvars index 4f92c8158..d81502790 100644 --- a/infrastructure/perftest.tfvars +++ b/infrastructure/perftest.tfvars @@ -1 +1 @@ -db_replicas = [ "replica" ] \ No newline at end of file +db_replicas = ["replica"] \ No newline at end of file diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars index 43291e533..7bc77321d 100644 --- a/infrastructure/prod.tfvars +++ b/infrastructure/prod.tfvars @@ -1,3 +1,3 @@ -db_replicas = [ "replica" ] +db_replicas = ["replica"] enable_schema_ownership = true -kv_subscription = "DCD-CNP-Prod" \ No newline at end of file +kv_subscription = "DCD-CNP-Prod" \ No newline at end of file diff --git a/infrastructure/terraform.tf b/infrastructure/terraform.tf index 72cb40513..0a9f458c4 100644 --- a/infrastructure/terraform.tf +++ b/infrastructure/terraform.tf @@ -18,7 +18,7 @@ terraform { required_providers { azurerm = { - source = "hashicorp/azurerm" + source = "hashicorp/azurerm" version = "~> 3.106" } diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf index 7aeeea6fe..063b3a37f 100644 --- a/infrastructure/variables.tf +++ b/infrastructure/variables.tf @@ -45,13 +45,13 @@ variable "db_replicas" { variable "product-v16" { - type = string - default="rd-caseworker-ref-api" + type = string + default = "rd-caseworker-ref-api" } variable "component-v16" { - type = string - default="postgres-db-v16" + type = string + default = "postgres-db-v16" } variable "aks_subscription_id" { }