diff --git a/README.md b/README.md index d073ff18..a0269710 100644 --- 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 index 97c65442..e4c75c91 100644 --- 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 index 1a2435ee..5d87fe97 100644 --- 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 index b1d5d556..daa6382a 100644 Binary files a/helm_deploy/laa-crime-means-assessment/values-dev.yaml and b/helm_deploy/laa-crime-means-assessment/values-dev.yaml differ diff --git a/helm_deploy/laa-crime-means-assessment/values-prod.yaml b/helm_deploy/laa-crime-means-assessment/values-prod.yaml index fe11ef34..2074a24f 100644 Binary files a/helm_deploy/laa-crime-means-assessment/values-prod.yaml and b/helm_deploy/laa-crime-means-assessment/values-prod.yaml differ diff --git a/helm_deploy/laa-crime-means-assessment/values-test.yaml b/helm_deploy/laa-crime-means-assessment/values-test.yaml index c729a335..8164149b 100644 Binary files a/helm_deploy/laa-crime-means-assessment/values-test.yaml and b/helm_deploy/laa-crime-means-assessment/values-test.yaml differ diff --git a/helm_deploy/laa-crime-means-assessment/values-uat.yaml b/helm_deploy/laa-crime-means-assessment/values-uat.yaml index 182bebe5..f7d82c48 100644 Binary files a/helm_deploy/laa-crime-means-assessment/values-uat.yaml and b/helm_deploy/laa-crime-means-assessment/values-uat.yaml differ