DMP-5252-ARM-5-2-Upgrade

Started to move the ARM clients into a service so the current version and new version can be enabled accordingly

Author: karen-hedges

README.md

@@ -143,6 +143,8 @@ export AZURE_AD_FUNCTIONAL_TEST_USERNAME=
 export AZURE_AD_FUNCTIONAL_TEST_PASSWORD=
 export ARM_SAS_ENDPOINT=
 export ARM_URL=
+export ARM_AUTH_URL=
+export ARM_API_URL=
 export ARM_USERNAME=
 export ARM_PASSWORD=
 export DARTS_INBOUND_STORAGE_SAS_URL=

bin/secrets-stg-environment.sh

@@ -33,6 +33,8 @@ echo "ARM_SAS_ENDPOINT=$(az keyvault secret show --vault-name darts-stg --name A
 echo "ARM_USERNAME=$(az keyvault secret show --vault-name darts-stg --name ArmUsername | jq .value -r)"
 echo "ARM_PASSWORD=$(az keyvault secret show --vault-name darts-stg --name ArmPassword | jq .value -r)"
 echo "ARM_URL=$(az keyvault secret show --vault-name darts-stg --name ArmUrl | jq .value -r)"
+echo "ARM_AUTH_URL=$(az keyvault secret show --vault-name darts-stg --name ArmAuthUrl | jq .value -r)"
+echo "ARM_API_URL=$(az keyvault secret show --vault-name darts-stg --name ArmApiUrl | jq .value -r)"
 echo "DETS_SAS_URL_ENDPOINT=$(az keyvault secret show --vault-name darts-stg --name DETSSasURLEndpoint | jq .value -r)"
 echo "AAD_TENANT_ID_JUSTICE=$(az keyvault secret show --vault-name darts-stg --name AzureADTenantIdJustice | jq .value -r)"
 echo "AAD_CLIENT_ID_JUSTICE=$(az keyvault secret show --vault-name darts-stg --name AzureADClientIdJustice | jq .value -r)"

charts/darts-api/values.dev.template.yaml

@@ -319,6 +319,8 @@ function:
     ACTIVE_DIRECTORY_B2C_BASE_URI: https://hmctsstgextid.b2clogin.com
     ACTIVE_DIRECTORY_B2C_AUTH_URI: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
     ARM_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_AUTH_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_API_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
     FEIGN_LOG_LEVEL: none
     IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
     ARM_RPO_THREAD_SLEEP_DURATION: 60s

charts/darts-api/values.stg.template.yaml

@@ -12,6 +12,8 @@ java:
     TESTING_SUPPORT_ENDPOINTS_ENABLED: true
     DARTS_GATEWAY_URL: http://darts-gateway.staging.platform.hmcts.net
     ARM_URL: http://darts-stub-services.staging.platform.hmcts.net
+    ARM_AUTH_URL: http://darts-stub-services.staging.platform.hmcts.net
+    ARM_API_URL: http://darts-stub-services.staging.platform.hmcts.net
     FEIGN_LOG_LEVEL: none
     IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"

charts/darts-api/values.yaml

@@ -115,6 +115,8 @@ java:
     ACTIVE_DIRECTORY_B2C_BASE_URI: https://hmctsstgextid.b2clogin.com
     ACTIVE_DIRECTORY_B2C_AUTH_URI: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
     ARM_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_AUTH_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_API_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
     FEIGN_LOG_LEVEL: none
     ARM_RPO_THREAD_SLEEP_DURATION: 60s
     ARM_RPO_POLL_DURATION: 4h
@@ -234,6 +236,8 @@ function:
     ACTIVE_DIRECTORY_B2C_BASE_URI: https://hmctsstgextid.b2clogin.com
     ACTIVE_DIRECTORY_B2C_AUTH_URI: https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
     ARM_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_AUTH_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
+    ARM_API_URL: http://darts-stub-services.{{ .Values.global.environment }}.platform.hmcts.net
     FEIGN_LOG_LEVEL: none
     IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
     ARM_RPO_THREAD_SLEEP_DURATION: 60s

docker-compose-local.yml

@@ -49,6 +49,8 @@ services:
       - ARM_PASSWORD
       - ARM_SERVICE_PROFILE
       - ARM_URL=http://darts-stub-services:4551
+      - ARM_AUTH_URL=http://darts-stub-services:4551
+      - ARM_API_URL=http://darts-stub-services:4551
       - ACTIVE_DIRECTORY_B2C_BASE_URI=https://hmctsstgextid.b2clogin.com
       - ACTIVE_DIRECTORY_B2C_AUTH_URI=https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
       - MAX_FILE_UPLOAD_SIZE_MEGABYTES=350
@@ -57,8 +59,6 @@ services:
       - DARTS_UNSTRUCTURED_STORAGE_SAS_URL
       - ARM_SERVICE_ENTITLEMENT
       - ARM_STORAGE_ACCOUNT_NAME
-      - ARM_AUTH_URL
-      - ARM_API_URL
     build:
       context: .
       dockerfile: Dockerfile

src/main/java/uk/gov/hmcts/darts/arm/client/version/fivetwo/ArmAuthClient.java

@@ -11,6 +11,7 @@
     name = "arm-auth-client",
     url = "${darts.storage.arm-api.version5-2.authentication.auth-base-url}"
 )
+@FunctionalInterface
 public interface ArmAuthClient {
 
     @PostMapping(value = "${darts.storage.arm-api.version5-2.authentication.token-path}",

src/main/java/uk/gov/hmcts/darts/arm/component/ArchiveRecordFileGenerator.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 public interface ArchiveRecordFileGenerator {
+
     boolean generateArchiveRecord(ArchiveRecord archiveRecord, File archiveRecordFile, ArchiveRecordType archiveRecordType);
 
     String generateArchiveRecords(String archiveFileName, List<ArchiveRecord> archiveRecords);

src/main/java/uk/gov/hmcts/darts/arm/component/ArmRpoDownloadProduction.java

@@ -4,4 +4,5 @@
 public interface ArmRpoDownloadProduction {
 
     feign.Response downloadProduction(String bearerToken, Integer executionId, String productionExportFileId);
+
 }

src/main/java/uk/gov/hmcts/darts/arm/component/impl/ArmRetentionEventDateCalculatorImpl.java

@@ -10,7 +10,6 @@
 import uk.gov.hmcts.darts.arm.component.ArmRetentionEventDateCalculator;
 import uk.gov.hmcts.darts.arm.config.ArmDataManagementConfiguration;
 import uk.gov.hmcts.darts.arm.helper.ArmHelper;
-import uk.gov.hmcts.darts.authorisation.component.UserIdentity;
 import uk.gov.hmcts.darts.common.entity.ConfidenceAware;
 import uk.gov.hmcts.darts.common.entity.ExternalObjectDirectoryEntity;
 import uk.gov.hmcts.darts.common.enums.ObjectRecordStatusEnum;
@@ -29,7 +28,6 @@
 public class ArmRetentionEventDateCalculatorImpl implements ArmRetentionEventDateCalculator {
     private final ExternalObjectDirectoryRepository externalObjectDirectoryRepository;
     private final ArmDataManagementApi armDataManagementApi;
-    private final UserIdentity userIdentity;
     private final ArmDataManagementConfiguration armDataManagementConfiguration;
     private final ArmHelper armHelper;