feat: renamed civil damages to civil (CMC-1541)

Jenkinsfile_CNP

@@ -4,7 +4,7 @@
 import uk.gov.hmcts.contino.AppPipelineConfig
 
 def type = "java"
-def product = "civil-damages"
+def product = "civil"
 def component = "camunda"
 AppPipelineConfig pipelineConf
 
@@ -77,7 +77,7 @@ withPipeline(type, product, component) {
             git push --force origin HEAD:demo
           '''
         } catch (err) {
-          notifyBuildEvent channel: '#civil_notifications', color: 'warning', message: 'civil-damages-camunda-bpmn-definition: failed to update demo branch'
+          notifyBuildEvent channel: '#civil_notifications', color: 'warning', message: 'civil-camunda-bpmn-definition: failed to update demo branch'
         }
       }
     }
@@ -96,12 +96,12 @@ withPipeline(type, product, component) {
     sh """
       eval \$(./bin/variables/load-preview-environment-variables.sh ${CHANGE_ID})
       ./bin/add-roles.sh
-      ./bin/pull-latest-release-asset.sh civil-damages-ccd-definition civil-damages-ccd-definition.zip
-      ./bin/pull-latest-release-asset.sh civil-damages-ccd-definition civil-damages-e2e.zip
+      ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-ccd-definition.zip
+      ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-e2e.zip
       ./bin/import-ccd-definition.sh
     """
-    env.URL="https://xui-civil-damages-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
-    env.UNSPEC_SERVICE_URL="http://civil-damages-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
+    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"
   }
 
   after('smoketest:preview') {
@@ -111,9 +111,9 @@ withPipeline(type, product, component) {
   before('functionalTest:preview') {
     env.IDAM_API_URL = "https://idam-api.aat.platform.hmcts.net"
     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-damages-camunda-pr-${CHANGE_ID}.service.core-compute-preview.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-damages-camunda-pr-${CHANGE_ID}.service.core-compute-preview.internal"
+    env.UNSPEC_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})
@@ -130,12 +130,12 @@ withPipeline(type, product, component) {
     sh """
       eval \$(./bin/variables/load-staging-environment-variables.sh)
       ./bin/add-roles.sh
-      ./bin/pull-latest-release-asset.sh civil-damages-ccd-definition civil-damages-ccd-definition.zip
-      ./bin/pull-latest-release-asset.sh civil-damages-ccd-definition civil-damages-e2e.zip
+      ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-ccd-definition.zip
+      ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-e2e.zip
       ./bin/import-ccd-definition.sh
     """
-    env.URL="https://civil-damages-camunda-xui-staging.aat.platform.hmcts.net"
-    env.UNSPEC_SERVICE_URL="http://civil-damages-camunda-staging.service.core-compute-aat.internal"
+    env.URL="https://civil-camunda-xui-staging.aat.platform.hmcts.net"
+    env.UNSPEC_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
   }
 
   after('smoketest:aat') {
@@ -145,9 +145,9 @@ withPipeline(type, product, component) {
   before('functionalTest:aat') {
     env.IDAM_API_URL = "https://idam-api.aat.platform.hmcts.net"
     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-damages-camunda-data-store-staging-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-damages-camunda-staging.service.core-compute-aat.internal"
+    env.UNSPEC_SERVICE_URL="http://civil-camunda-staging.service.core-compute-aat.internal"
 
     uploadBpmnDiagrams('staging')
   }

README.md

@@ -1,6 +1,6 @@
-# civil-damages-camunda-bpmn-definition
+# civil-camunda-bpmn-definition
 
-Civil Damages Camunda BPMN Definition
+Civil Camunda BPMN Definition
 
 ### Contents:
 - [Building and deploying application](#building-and-deploying-the-application)
@@ -10,11 +10,11 @@ Civil Damages Camunda BPMN Definition
 
 ### Dependencies
 
-The project is dependent on other Civil Damages repositories:
-- [civil-damages-service](https://github.com/hmcts/civil-damages-service)
-- [civil-damages-ccd-definition](https://github.com/hmcts/civil-damages-ccd-definition)
+The project is dependent on other Civil repositories:
+- [civil-service](https://github.com/hmcts/civil-service)
+- [civil-ccd-definition](https://github.com/hmcts/civil-ccd-definition)
 
-To set up complete local environment for Civil Damages check [civil-damages-sdk](https://github.com/hmcts/civil-damages-sdk)
+To set up complete local environment for Civil check [civil-sdk](https://github.com/hmcts/civil-sdk)
 
 ### Preview environment
 
@@ -23,14 +23,14 @@ Camunda BPMN definitions will be pulled from the latest GitHub release.
 Service instance will be running the latest version deployed to ACR.
 
 To access XUI visit url (make sure that it starts with `https`, otherwise IDAM won't let you log in):
-- `https://xui-civil-damages-camunda-pr-PR_NUMBER.service.core-compute-preview.internal`
+- `https://xui-civil-camunda-pr-PR_NUMBER.service.core-compute-preview.internal`
 
 To access Camunda visit url (login and password are both `admin`):
-- `https://camunda-civil-damages-camunda-pr-PR_NUMBER.service.core-compute-preview.internal`
+- `https://camunda-civil-camunda-pr-PR_NUMBER.service.core-compute-preview.internal`
 
 ## Camunda
 
-To spin up local instance of Camunda go to `civil-damages-sdk` repo and follow the instructions.
+To spin up local instance of Camunda go to `civil-sdk` repo and follow the instructions.
 
 Camunda UI runs on `http://localhost:9404`. You can login with:
 ```$xslt
@@ -40,7 +40,7 @@ password: demo
 
 The REST API is available at `http://localhost:9404/engine-rest/`. Documentation is available [here](https://docs.camunda.org/manual/latest/reference/rest/).
 
-To upload all bpmn diagrams via the REST API go to`civil-damages-sdk` repo and run `./bin/import-bpmn-diagram.sh` script.
+To upload all bpmn diagrams via the REST API go to`civil-sdk` repo and run `./bin/import-bpmn-diagram.sh` script.
 
 The diagram must exist within `src/main/resources/camunda`.
 

bin/create-github-release.sh

@@ -46,12 +46,12 @@ if [ -z "$BUILD_URL" ]; then
 fi
 
 cp -r src/main/resources/camunda camunda
-zip -r civil-damages-camunda-bpmn-definition.zip camunda
+zip -r civil-camunda-bpmn-definition.zip camunda
 rm -r camunda
 
 az login --identity
-releaseId=$(createNewRelease civil-damages-camunda-bpmn-definition)
+releaseId=$(createNewRelease civil-camunda-bpmn-definition)
 
-uploadReleaseAsset civil-damages-camunda-bpmn-definition $releaseId civil-damages-camunda-bpmn-definition.zip
+uploadReleaseAsset civil-camunda-bpmn-definition $releaseId civil-camunda-bpmn-definition.zip
 
-rm civil-damages-camunda-bpmn-definition.zip
+rm civil-camunda-bpmn-definition.zip

bin/variables/load-preview-environment-variables.sh

@@ -10,8 +10,8 @@ echo 'export ENVIRONMENT=preview'
 echo "export SERVICE_AUTH_PROVIDER_API_BASE_URL=http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
 echo "export IDAM_API_BASE_URL=https://idam-api.aat.platform.hmcts.net"
 echo "export CCD_IDAM_REDIRECT_URL=https://ccd-case-management-web-aat.service.core-compute-aat.internal/oauth2redirect"
-echo "export CCD_DEFINITION_STORE_API_BASE_URL=https://ccd-definition-store-civil-damages-camunda-pr-${pr}.service.core-compute-preview.internal"
-echo "export CAMUNDA_BASE_URL=https://camunda-civil-damages-camunda-pr-${pr}.service.core-compute-preview.internal"
+echo "export CCD_DEFINITION_STORE_API_BASE_URL=https://ccd-definition-store-civil-camunda-pr-${pr}.service.core-compute-preview.internal"
+echo "export CAMUNDA_BASE_URL=https://camunda-civil-camunda-pr-${pr}.service.core-compute-preview.internal"
 
 # definition placeholders
-echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-damages-camunda-pr-${pr}.service.core-compute-preview.internal"
+echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-camunda-pr-${pr}.service.core-compute-preview.internal"

bin/variables/load-staging-environment-variables.sh

@@ -8,8 +8,8 @@ echo 'export ENVIRONMENT=aat'
 echo "export SERVICE_AUTH_PROVIDER_API_BASE_URL=http://rpe-service-auth-provider-aat.service.core-compute-aat.internal"
 echo "export IDAM_API_BASE_URL=https://idam-api.aat.platform.hmcts.net"
 echo "export CCD_IDAM_REDIRECT_URL=https://ccd-case-management-web-aat.service.core-compute-aat.internal/oauth2redirect"
-echo "export CCD_DEFINITION_STORE_API_BASE_URL=http://civil-damages-camunda-definition-store-staging-aat.service.core-compute-aat.internal"
-echo "export CAMUNDA_BASE_URL=http://civil-damages-camunda-camunda-staging-aat.service.core-compute-aat.internal"
+echo "export CCD_DEFINITION_STORE_API_BASE_URL=http://civil-camunda-definition-store-staging-aat.service.core-compute-aat.internal"
+echo "export CAMUNDA_BASE_URL=http://civil-camunda-camunda-staging-aat.service.core-compute-aat.internal"
 
 # definition placeholders
-echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-damages-camunda-staging.service.core-compute-aat.internal"
+echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-camunda-staging.service.core-compute-aat.internal"

build.gradle

@@ -158,8 +158,8 @@ project.tasks['sonarqube'].dependsOn test, jacocoTestReport
 
 sonarqube {
   properties {
-    property "sonar.projectName", "UNSPEC :: civil-damages-camunda-bpmn-definition"
-    property "sonar.projectKey", "civil-damages-camunda-bpmn-definition"
+    property "sonar.projectName", "CIVIL :: camunda-bpmn-definition"
+    property "sonar.projectKey", "civil-camunda-bpmn-definition"
     property "sonar.coverage.jacoco.xmlReportPaths", "${jacocoTestReport.reports.xml.destination.path}"
     property "sonar.host.url", "https://sonar.reform.hmcts.net/"
   }

charts/civil-damages-camunda/Chart.yaml → charts/civil-camunda/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-description: A Helm chart for civil-damages-camunda App
-name: civil-damages-camunda
-home: https://github.com/hmcts/civil-damages-camunda-bpmn-definition
+description: A Helm chart for civil-camunda App
+name: civil-camunda
+home: https://github.com/hmcts/civil-camunda-bpmn-definition
 version: 0.0.4
 maintainers:
-  - name: HMCTS Unspecified team
+  - name: HMCTS Civil team
 
 dependencies:
   - name: java

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

@@ -27,7 +27,7 @@ postgresql:
 java:
   applicationPort: 4000
   aadIdentityName: unspec
-  image: 'hmctspublic.azurecr.io/civil-damages/service:latest'
+  image: 'hmctspublic.azurecr.io/civil/service:latest'
   imagePullPolicy: Always
   ingressHost: ${SERVICE_FQDN}
   keyVaults:
@@ -51,7 +51,7 @@ java:
         - launch-darkly-sdk-key
   environment:
     IDAM_CLIENT_ID: unspec-service
-    IDAM_CLIENT_REDIRECT_URI: https://civil-damages-camunda-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback
+    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
     IDAM_S2S_AUTH_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
@@ -76,9 +76,9 @@ java:
     CMC_DB_PASSWORD: hmcts
     CMC_DB_CONNECTION_OPTIONS: '?sslmode=allow'
     REFERENCE_DATABASE_MIGRATION: true
-    FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://civil-damages-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://civil-damages-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://civil-damages-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
+    FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://civil-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
+    FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://civil-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
+    FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://civil-camunda-camunda-staging-aat.service.core-compute-aat.internal/engine-rest/
     TESTING_SUPPORT_ENABLED: true
     POLLING_EVENT_EMITTER_ENABLED: false
     LAUNCH_DARKLY_ENV: camunda-staging
@@ -88,15 +88,15 @@ idam-pr:
   enabled: true
   redirect_uris:
     XUI:
-      - https://civil-damages-camunda-xui-staging.aat.platform.hmcts.net/oauth2/callback
+      - https://civil-camunda-xui-staging.aat.platform.hmcts.net/oauth2/callback
 
 xui-webapp:
   enabled: true
   nodejs:
     imagePullPolicy: Always
     releaseNameOverride: ${SERVICE_NAME}-xui-webapp
     image: hmctspublic.azurecr.io/xui/webapp:latest
-    ingressHost: civil-damages-camunda-xui-staging.aat.platform.hmcts.net
+    ingressHost: civil-camunda-xui-staging.aat.platform.hmcts.net
     environment:
       HEALTH_CCD_COMPONENT_API: http://${SERVICE_NAME}-ccd-api-gw/health
       HEALTH_CCD_DATA_API: http://${SERVICE_NAME}-ccd-data-store-api/health
@@ -123,7 +123,7 @@ ccd:
       enabled: false
 
   global:
-    ccdApiGatewayIngress: http://civil-damages-camunda-gateway-staging-aat.service.core-compute-aat.internal
+    ccdApiGatewayIngress: http://civil-camunda-gateway-staging-aat.service.core-compute-aat.internal
     ccdDataStoreUrl: http://${SERVICE_NAME}-ccd-data-store-api
     ccdDefinitionStoreUrl: http://${SERVICE_NAME}-ccd-definition-store
     ccdUserProfileUrl: http://${SERVICE_NAME}-ccd-user-profile-api
@@ -140,7 +140,7 @@ ccd:
         IDAM_SERVICE_KEY: ${CCD_API_GATEWAY_S2S_SECRET}
         IDAM_OAUTH2_CLIENT_SECRET: ${CCD_API_GATEWAY_IDAM_CLIENT_SECRET}
         PROXY_DOCUMENT_MANAGEMENT: http://dm-store-aat.service.core-compute-aat.internal
-      ingressHost: civil-damages-camunda-gateway-staging-aat.service.core-compute-aat.internal
+      ingressHost: civil-camunda-gateway-staging-aat.service.core-compute-aat.internal
       ingressIP: ${INGRESS_IP}
       keyVaults: []
   ccd-data-store-api:
@@ -154,7 +154,7 @@ ccd:
         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
       keyVaults: []
-      ingressHost: civil-damages-camunda-data-store-staging-aat.service.core-compute-aat.internal
+      ingressHost: civil-camunda-data-store-staging-aat.service.core-compute-aat.internal
   ccd-definition-store-api:
     java:
       imagePullPolicy: Always
@@ -163,14 +163,14 @@ ccd:
         DEFINITION_STORE_IDAM_KEY: ${CCD_DEFINITION_STORE_S2S_SECRET}
         IDAM_USER_URL: https://idam-web-public.aat.platform.hmcts.net
       keyVaults: []
-      ingressHost: civil-damages-camunda-definition-store-staging-aat.service.core-compute-aat.internal
+      ingressHost: civil-camunda-definition-store-staging-aat.service.core-compute-aat.internal
   ccd-user-profile-api:
     java:
       imagePullPolicy: Always
       enviroment:
         USER_PROFILE_DB_HOST: ${SERVICE_NAME}-postgresql
       keyVaults: []
-      ingressHost: civil-damages-camunda-user-profile-staging-aat.service.core-compute-aat.internal
+      ingressHost: civil-camunda-user-profile-staging-aat.service.core-compute-aat.internal
 
   postgresql:
     persistence:
@@ -181,7 +181,7 @@ camunda-bpm:
   java:
     disableKeyVaults: true
     releaseNameOverride: ${SERVICE_NAME}-camunda
-    ingressHost: civil-damages-camunda-camunda-staging-aat.service.core-compute-aat.internal
+    ingressHost: civil-camunda-camunda-staging-aat.service.core-compute-aat.internal
     environment:
       CAMUNDA_API_AUTH_ENABLED: false
       CAMUNDA_DB_HOST: ${SERVICE_NAME}-postgresql

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

@@ -26,7 +26,7 @@ postgresql:
 
 java:
   applicationPort: 4000
-  image: 'hmctspublic.azurecr.io/civil-damages/service:latest'
+  image: 'hmctspublic.azurecr.io/civil/service:latest'
   imagePullPolicy: Always
   ingressHost: ${SERVICE_FQDN}
   keyVaults:
@@ -50,7 +50,7 @@ java:
         - launch-darkly-sdk-key
   environment:
     IDAM_CLIENT_ID: unspec-service
-    IDAM_CLIENT_REDIRECT_URI: https://civil-damages-camunda-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback
+    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
     IDAM_S2S_AUTH_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal

charts/civil-damages-camunda/values.yaml → charts/civil-camunda/values.yaml

@@ -15,7 +15,7 @@ camunda-bpm:
 
 java:
   applicationPort: 4000
-  image: 'hmctspublic.azurecr.io/civil-damages/service:latest'
+  image: 'hmctspublic.azurecr.io/civil/service:latest'
   aadIdentityName: unspec
   keyVaults:
     unspec: