LASB-3632 [CMA] Configure New Secrets for Sensitive Fields in the Cri…

…me Means Assessment (CMA) Service (#470) * LASB-3632 [CMA] Configure New Secrets for Sensitive Fields in the Crime Means Assessment (CMA) Service * LASB-3632 [CMA] Configure New Secrets for Sensitive Fields in the Crime Means Assessment (CMA) Service * LASB-3632 Upgraded the Springboot version to resolve the vulnerabilities found in pipeline build. * LASB-3632 Upgraded the tomcat version to resolve the vulnerabilities found in pipeline build.
ministryofjustice · Feb 13, 2025 · e155afc · e155afc
1 parent 30cd28b
commit e155afc
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ If the command is not found, [follow the steps on the 1Password developer docs t
 Once you're ready to run the application:
 
 ```sh
-./startup-local.sh
+./start-local.sh
 ```
 
 ### Decrypting values files

diff --git a/crime-means-assessment/build.gradle b/crime-means-assessment/build.gradle
@@ -20,8 +20,8 @@ def versions = [
         jUnitPlatformSuiteVersion    : "1.10.0",
         springCloudStubRunnerVersion : "4.0.4",
         h2DBVersion                  : '2.1.210',
-        postgresqlVersion            : "42.7.2"
-
+        postgresqlVersion            : "42.7.2",
+        tomcatVersion                : "10.1.34"
 ]
 
 
@@ -49,6 +49,8 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-validation"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 
+    implementation "org.apache.tomcat.embed:tomcat-embed-core:$versions.tomcatVersion"
+
     implementation "org.postgresql:postgresql:$versions.postgresqlVersion"
     implementation "io.micrometer:micrometer-registry-prometheus"
     implementation "org.liquibase:liquibase-core:$versions.liquibase"

diff --git a/helm_deploy/laa-crime-means-assessment/templates/_environment.tpl b/helm_deploy/laa-crime-means-assessment/templates/_environment.tpl
@@ -7,7 +7,10 @@ env:
   - name: AWS_REGION
     value: {{ .Values.aws_region }}
   - name: SENTRY_DSN
-    value: {{ .Values.sentry.dsn }}
+    valueFrom:
+      secretKeyRef:
+        name: sentry-dsn
+        key: SENTRY_DSN
   - name: SENTRY_ENV
     value: {{ .Values.java.host_env }}
   - name: SENTRY_SAMPLE_RATE

diff --git a/helm_deploy/laa-crime-means-assessment/values-dev.yaml b/helm_deploy/laa-crime-means-assessment/values-dev.yaml
diff --git a/helm_deploy/laa-crime-means-assessment/values-prod.yaml b/helm_deploy/laa-crime-means-assessment/values-prod.yaml
diff --git a/helm_deploy/laa-crime-means-assessment/values-test.yaml b/helm_deploy/laa-crime-means-assessment/values-test.yaml
diff --git a/helm_deploy/laa-crime-means-assessment/values-uat.yaml b/helm_deploy/laa-crime-means-assessment/values-uat.yaml