feat: renamed unspec to civil (CMC-1541) (#9)

Jenkinsfile_CNP

@@ -26,8 +26,8 @@ def secrets = [
     secret('ccd-api-gateway-oauth2-client-secret', 'CCD_API_GATEWAY_IDAM_CLIENT_SECRET'),
     secret('postcode-info-address-lookup-token', 'ADDRESS_LOOKUP_TOKEN')
   ],
-  'unspec-${env}': [
-    secret('microservicekey-unspec-service', 'S2S_SECRET'),
+  'civil-${env}': [
+    secret('microservicekey-civil-service', 'S2S_SECRET'),
     secret('ccd-importer-username', 'CCD_CONFIGURER_IMPORTER_USERNAME'),
     secret('ccd-importer-password', 'CCD_CONFIGURER_IMPORTER_PASSWORD')
   ]
@@ -101,7 +101,7 @@ withPipeline(type, product, component) {
       ./bin/import-ccd-definition.sh
     """
     env.URL="https://xui-civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
-    env.UNSPEC_SERVICE_URL="http://civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
+    env.CIVIL_SERVICE_URL="http://civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
   }
 
   after('smoketest:preview') {
@@ -113,7 +113,7 @@ withPipeline(type, product, component) {
     env.SERVICE_AUTH_PROVIDER_API_BASE_URL = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
     env.CCD_DATA_STORE_URL = "http://ccd-data-store-api-civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
     env.DM_STORE_URL = "http://dm-store-aat.service.core-compute-aat.internal"
-    env.UNSPEC_SERVICE_URL="http://civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
+    env.CIVIL_SERVICE_URL="http://civil-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
     dir("${WORKSPACE}/bin") {
       sh """
         eval \$(./variables/load-preview-environment-variables.sh ${CHANGE_ID})
@@ -135,7 +135,7 @@ withPipeline(type, product, component) {
       ./bin/import-ccd-definition.sh
     """
     env.URL="https://civil-camunda-xui-staging.aat.platform.hmcts.net"
-    env.UNSPEC_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
+    env.CIVIL_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
   }
 
   after('smoketest:aat') {
@@ -147,7 +147,7 @@ withPipeline(type, product, component) {
     env.SERVICE_AUTH_PROVIDER_API_BASE_URL = "http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
     env.CCD_DATA_STORE_URL = "http://civil-camunda-data-store-staging-aat.service.core-compute-aat.internal"
     env.DM_STORE_URL = "http://dm-store-aat.service.core-compute-aat.internal"
-    env.UNSPEC_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
+    env.CIVIL_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
 
     uploadBpmnDiagrams('staging')
   }

audit.json

@@ -1,7 +1,7 @@
 {
-  "100001_Unexpected Content-Type was returned_http://unspec-service-aat.service.core-compute-aat.internal/_GET":  "ignore",
-  "100000_A Client Error response code was returned by the server_http://unspec-service-aat.service.core-compute-aat.internal/cases/callbacks/version/version/callback-type_POST":  "ignore",
-  "100000_A Client Error response code was returned by the server_http://unspec-service-aat.service.core-compute-aat.internal/cases/callbacks/version/version/callback-type/page-id_POST": "ignore",
-  "100000_A Client Error response code was returned by the server_http://unspec-service-aat.service.core-compute-aat.internal/cases/callbacks/callback-type_POST":  "ignore",
-  "100000_A Client Error response code was returned by the server_http://unspec-service-aat.service.core-compute-aat.internal/cases/callbacks/callback-type/page-id_POST": "ignore"
+  "100001_Unexpected Content-Type was returned_http://civil-service-aat.service.core-compute-aat.internal/_GET":  "ignore",
+  "100000_A Client Error response code was returned by the server_http://civil-service-aat.service.core-compute-aat.internal/cases/callbacks/version/version/callback-type_POST":  "ignore",
+  "100000_A Client Error response code was returned by the server_http://civil-service-aat.service.core-compute-aat.internal/cases/callbacks/version/version/callback-type/page-id_POST": "ignore",
+  "100000_A Client Error response code was returned by the server_http://civil-service-aat.service.core-compute-aat.internal/cases/callbacks/callback-type_POST":  "ignore",
+  "100000_A Client Error response code was returned by the server_http://civil-service-aat.service.core-compute-aat.internal/cases/callbacks/callback-type/page-id_POST": "ignore"
 }

bin/import-bpmn-diagram.sh

@@ -3,7 +3,7 @@
 set -eu
 workspace=${1}
 
-serviceToken=$($(realpath $workspace)/bin/utils/idam-lease-service-token.sh unspec_service \
+serviceToken=$($(realpath $workspace)/bin/utils/idam-lease-service-token.sh civil_service \
   $(docker run --rm toolbelt/oathtool --totp -b ${S2S_SECRET:-AABBCCDDEEFFGGHH}))
 filepath="$(realpath $workspace)/src/main/resources/camunda"
 

bin/import-ccd-definition.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 definition_input_dir=$(realpath 'ccd-definition')
-definition_output_file="$(realpath ".")/build/ccd-development-config/ccd-unspec-dev.xlsx"
+definition_output_file="$(realpath ".")/build/ccd-development-config/ccd-civil-dev.xlsx"
 params="$@"
 
 ./bin/utils/import-ccd-definition.sh "${definition_input_dir}" "${definition_output_file}" "${params}"

build.gradle

@@ -124,7 +124,7 @@ task checkDependenciesIntegrity(type: Exec, description: 'Checks integrity of Ya
 
 task awaitApplicationReadiness(type: Exec, description: 'Awaits until application is ready.') {
   commandLine './bin/wait-for.sh', System.env.URL
-  commandLine './bin/wait-for.sh', System.env.UNSPEC_SERVICE_URL
+  commandLine './bin/wait-for.sh', System.env.CIVIL_SERVICE_URL
 }
 
 task runSmokeTests(type: Exec, description: 'Runs smoke tests.') {
@@ -212,7 +212,7 @@ dependencies {
   testImplementation group: 'com.h2database', name: 'h2', version: '1.4.200'
 }
 
-mainClassName = 'uk.gov.hmcts.reform.unspec.Application'
+mainClassName = 'uk.gov.hmcts.reform.civil.Application'
 
 bootJar {
   getArchiveFileName().set(provider {

charts/civil-camunda/Chart.yaml

@@ -14,7 +14,7 @@ dependencies:
     version: 5.0.2
     repository: '@hmctspublic'
     tags:
-      - unspec-ccd-stack
+      - civil-ccd-stack
   - name: xui-webapp
     version: ~0.2.1
     repository: '@hmctspublic'

charts/civil-camunda/values.aat.template.yaml

@@ -1,5 +1,5 @@
 tags:
-  unspec-ccd-stack: true
+  civil-ccd-stack: true
 
 postgresql:
   enabled: true
@@ -26,16 +26,16 @@ postgresql:
 
 java:
   applicationPort: 4000
-  aadIdentityName: unspec
+  aadIdentityName: civil
   image: 'hmctspublic.azurecr.io/civil/service:latest'
   imagePullPolicy: Always
   ingressHost: ${SERVICE_FQDN}
   keyVaults:
-    unspec:
-      resourceGroup: unspec
+    civil:
+      resourceGroup: civil
       secrets:
-        - unspec-idam-client-secret
-        - microservicekey-unspec-service
+        - civil-idam-client-secret
+        - microservicekey-civil-service
         - system-update-user-username
         - system-update-user-password
         - cross-access-user-username
@@ -50,7 +50,7 @@ java:
         - robotics-notification-recipient
         - launch-darkly-sdk-key
   environment:
-    IDAM_CLIENT_ID: unspec-service
+    IDAM_CLIENT_ID: civil-service
     IDAM_CLIENT_REDIRECT_URI: https://civil-camunda-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback
     IDAM_API_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
     IDAM_WEB_URL: https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net
@@ -149,10 +149,10 @@ ccd:
       environment:
         DATA_STORE_DB_HOST: ${SERVICE_NAME}-postgresql
         DATA_STORE_IDAM_KEY: ${CCD_DATA_STORE_S2S_SECRET}
-        DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,unspec_service
+        DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,civil_service
         IDAM_USER_URL: https://idam-web-public.aat.platform.hmcts.net
         OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts
-        CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: unspec_service
+        CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: civil_service
       keyVaults: []
       ingressHost: civil-camunda-data-store-staging-aat.service.core-compute-aat.internal
   ccd-definition-store-api:

charts/civil-camunda/values.preview.template.yaml

@@ -1,5 +1,5 @@
 tags:
-  unspec-ccd-stack: true
+  civil-ccd-stack: true
 
 postgresql:
   enabled: true
@@ -30,11 +30,11 @@ java:
   imagePullPolicy: Always
   ingressHost: ${SERVICE_FQDN}
   keyVaults:
-    unspec:
-      resourceGroup: unspec
+    civil:
+      resourceGroup: civil
       secrets:
-        - unspec-idam-client-secret
-        - microservicekey-unspec-service
+        - civil-idam-client-secret
+        - microservicekey-civil-service
         - system-update-user-username
         - system-update-user-password
         - cross-access-user-username
@@ -49,7 +49,7 @@ java:
         - robotics-notification-recipient
         - launch-darkly-sdk-key
   environment:
-    IDAM_CLIENT_ID: unspec-service
+    IDAM_CLIENT_ID: civil-service
     IDAM_CLIENT_REDIRECT_URI: https://civil-camunda-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback
     IDAM_API_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
     IDAM_WEB_URL: https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net
@@ -145,10 +145,10 @@ ccd:
       environment:
         DATA_STORE_DB_HOST: ${SERVICE_NAME}-postgresql
         DATA_STORE_IDAM_KEY: ${CCD_DATA_STORE_S2S_SECRET}
-        DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,unspec_service
+        DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,civil_service
         IDAM_USER_URL: https://idam-web-public.aat.platform.hmcts.net
         OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-{{ .Values.global.environment }}.internal:8443/openam/oauth2/hmcts
-        CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: unspec_service,aac_manage_case_assignment
+        CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: civil_service,aac_manage_case_assignment
       keyVaults: []
       ingressHost: ccd-data-store-api-${SERVICE_FQDN}
   ccd-definition-store-api:

charts/civil-camunda/values.yaml

@@ -1,5 +1,5 @@
 tags:
-  unspec-ccd-stack: false
+  civil-ccd-stack: false
 
 postgresql:
   enabled: false
@@ -16,13 +16,13 @@ camunda-bpm:
 java:
   applicationPort: 4000
   image: 'hmctspublic.azurecr.io/civil/service:latest'
-  aadIdentityName: unspec
+  aadIdentityName: civil
   keyVaults:
-    unspec:
-      resourceGroup: unspec
+    civil:
+      resourceGroup: civil
       secrets:
-        - unspec-idam-client-secret
-        - microservicekey-unspec-service
+        - civil-idam-client-secret
+        - microservicekey-civil-service
         - system-update-user-username
         - system-update-user-password
         - AppInsightsInstrumentationKey

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/AcknowledgeClaimTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/AcknowledgeClaimTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/BpmnBaseTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/BpmnBaseTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.ProcessEngineConfiguration;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/CaseDismissedSchedulerTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/CaseDismissedSchedulerTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.externaltask.LockedExternalTask;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/ClaimantResponseTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/ClaimantResponseTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/DefendantResponseTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/DefendantResponseTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/DismissClaimTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/DismissClaimTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/NotifyClaimDeadlineSchedulerTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyClaimDeadlineSchedulerTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.externaltask.LockedExternalTask;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/NotifyClaimDetailsTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyClaimDetailsTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/NotifyClaimTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/NotifyClaimTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/PollingEventEmitterSchedulerTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/PollingEventEmitterSchedulerTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.externaltask.LockedExternalTask;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/ResetRpaNotifyBusinessProcessTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/ResetRpaNotifyBusinessProcessTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.junit.jupiter.api.Test;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/RetryRpaNotificationTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/RetryRpaNotificationTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/TakeCaseOfflineSchedulerTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/TakeCaseOfflineSchedulerTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.externaltask.LockedExternalTask;

src/test/java/uk/gov/hmcts/reform/unspec/bpmn/TakeCaseOfflineTest.java → src/test/java/uk/gov/hmcts/reform/civil/bpmn/TakeCaseOfflineTest.java

@@ -1,4 +1,4 @@
-package uk.gov.hmcts.reform.unspec.bpmn;
+package uk.gov.hmcts.reform.civil.bpmn;
 
 import org.camunda.bpm.engine.externaltask.ExternalTask;
 import org.camunda.bpm.engine.variable.VariableMap;