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

@@ -69,6 +69,8 @@ There are few attributes which doesn't use Azure Keyvault secrets. Those environ
 | ACTIVE_DIRECTORY_B2C_BASE_URI | https://hmctsstgextid.b2clogin.com                               |
 | ACTIVE_DIRECTORY_B2C_AUTH_URI | https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com |
 | ARM_URL                       |                                                                  |  
+| ARM_AUTH_URL                  |                                                                  |
+| ARM_API_URL                   |                                                                  |
 
 To obtain the secret value, you may retrieve the keys from the Azure Vault by running the `az keyvault secret show`
 command in the terminal. E.g. to obtain the value for `GOVUK_NOTIFY_API_KEY`, you should run:

bin/secrets-stg-environment.sh

@@ -33,8 +33,6 @@ 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

@@ -125,6 +125,7 @@ java:
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"
     AZCOPY_OUTPUT_LEVEL: "--output-level=essential"
     APPLICATIONINSIGHTS_ROLE_NAME: "DARTS API PR-${CHANGE_ID}"
+    ENABLE_ARM_V5_2_UPGRADE: true
 
   secrets:
     DARTS_API_DB_PASSWORD:
@@ -329,6 +330,7 @@ function:
     ARM_RPO_POLL_DURATION: 4h
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"
     AZCOPY_OUTPUT_LEVEL: "--output-level=essential"
+    ENABLE_ARM_V5_2_UPGRADE: true
 
   secrets:
     DARTS_API_DB_PASSWORD:

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

@@ -18,3 +18,4 @@ java:
     IS_MOCK_ARM_RPO_DOWNLOAD_CSV: false
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"
     AZCOPY_OUTPUT_LEVEL: "--output-level=essential"
+    ENABLE_ARM_V5_2_UPGRADE: true

charts/darts-api/values.yaml

@@ -123,6 +123,7 @@ java:
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"
     AZCOPY_OUTPUT_LEVEL: "--output-level=essential"
     GRACEFUL_SHUTDOWN_TIMEOUT: '35s'
+    ENABLE_ARM_V5_2_UPGRADE: false
 
 function:
   scaleType: Job
@@ -244,6 +245,7 @@ function:
     ARM_RPO_POLL_DURATION: 4h
     AZCOPY_LOG_LEVEL: "--log-level=ERROR"
     AZCOPY_OUTPUT_LEVEL: "--output-level=essential"
+    ENABLE_ARM_V5_2_UPGRADE: false
 
   secrets:
     DARTS_API_DB_CONNECTION_STRING:

src/integrationTest/java/uk/gov/hmcts/darts/task/runner/impl/ArmRetentionEventDateCalculatorAutomatedTaskIntTest.java

@@ -62,9 +62,6 @@ class ArmRetentionEventDateCalculatorAutomatedTaskIntTest extends PostgresIntegr
     @MockitoBean
     private ArmTokenClient armTokenClient;
 
-    //@Autowired
-    //private ArmRetentionEventDateCalculator armRetentionEventDateCalculator;
-
     @Autowired
     private ArmRetentionEventDateCalculatorAutomatedTask armRetentionEventDateCalculatorAutomatedTask;
 

src/integrationTest/resources/application-intTest.yaml

@@ -85,6 +85,15 @@ darts:
       url: http://localhost:${wiremock.server.port}
       arm-service-entitlement: some-entitlement
       arm-storage-account-name: some-account-name
+
+      enable-arm-v5-2-upgrade: false
+
+      version5-2:
+        authentication:
+          auth-base-url: http://localhost:${wiremock.server.port}
+        api:
+          api-base-url: http://localhost:${wiremock.server.port}
+
     arm:
       temp-blob-workspace: ${java.io.tmpdir}/armworkspace
       max-continuation-batch-size: 10

src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmClientServiceImpl.java

@@ -38,8 +38,8 @@
  * Pre ARM version 5.2 implementation of the ArmClientService.
  * This implementation is activated when the property 'darts.storage.arm.arm-api.enable-arm-v5' is set to false.
  */
-@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "false")
 @Service
+@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "false", matchIfMissing = false)
 @RequiredArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceImpl implements ArmClientService {

src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmClientServiceWrapper.java

@@ -37,8 +37,8 @@
  * Post ARM version 5.2 implementation of the ArmClientService.
  * This implementation is activated when the property 'darts.storage.arm.arm-api.enable-arm-v5' is set to true.
  */
-@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "true")
 @Service
+@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "true")
 @RequiredArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceWrapper implements ArmClientService {

src/test/java/uk/gov/hmcts/darts/arm/service/impl/ArmApiServiceImplTest.java

@@ -43,8 +43,7 @@ class ArmApiServiceImplTest {
 
     @Mock
     private ArmDataManagementConfiguration armDataManagementConfiguration;
-
-
+    
     private ArmApiServiceImpl armApiService;
 
     @BeforeEach