From efe1b925ba771effc1bcdf5fb75d220c13342df6 Mon Sep 17 00:00:00 2001 From: Karl Baker Date: Fri, 25 Oct 2024 16:42:53 +0100 Subject: [PATCH] Remove CMA client configuration --- .../config/ServicesConfiguration.java | 25 ------------------ .../src/main/resources/application.yaml | 11 -------- .../config/MockServicesConfiguration.java | 10 ------- .../src/test/resources/application.yaml | 11 -------- .../templates/_environment.tpl | 14 ---------- .../laa-crime-evidence/values-dev.yaml | Bin 2577 -> 2389 bytes .../laa-crime-evidence/values-prod.yaml | Bin 2405 -> 2216 bytes .../laa-crime-evidence/values-test.yaml | Bin 2572 -> 2383 bytes .../laa-crime-evidence/values-uat.yaml | Bin 2568 -> 2380 bytes 9 files changed, 71 deletions(-) diff --git a/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/config/ServicesConfiguration.java b/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/config/ServicesConfiguration.java index 6d34d9f..52bfc6f 100644 --- a/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/config/ServicesConfiguration.java +++ b/crime-evidence/src/main/java/uk/gov/justice/laa/crime/evidence/config/ServicesConfiguration.java @@ -12,37 +12,12 @@ @ConfigurationProperties(prefix = "services") public class ServicesConfiguration { - @NotNull - private CmaApi cmaApi; - @NotNull private MaatApi maatApi; @NotNull private boolean oAuthEnabled; - @Data - @AllArgsConstructor - @NoArgsConstructor - public static class CmaApi { - @NotNull - private String baseUrl; - - @NotNull - private Endpoints endpoints; - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class Endpoints { - @NotNull - private String findUrl; - - @NotNull - private String updateUrl; - } - } - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/crime-evidence/src/main/resources/application.yaml b/crime-evidence/src/main/resources/application.yaml index 266fa83..3e67533 100644 --- a/crime-evidence/src/main/resources/application.yaml +++ b/crime-evidence/src/main/resources/application.yaml @@ -56,15 +56,9 @@ spring: oauth2: client: provider: - cma: - token-uri: ${CMA_API_OAUTH_URL} maat-api: token-uri: ${MAAT_API_OAUTH_URL} registration: - cma: - client-id: ${CMA_API_OAUTH_CLIENT_ID} - client-secret: ${CMA_API_OAUTH_CLIENT_SECRET} - authorization-grant-type: client_credentials maat-api: client-id: ${MAAT_API_OAUTH_CLIENT_ID} client-secret: ${MAAT_API_OAUTH_CLIENT_SECRET} @@ -79,11 +73,6 @@ retry-config: jitter-value: 0.75 services: - cma-api: - base-url: ${CMA_API_BASE_URL} - endpoints: - find-url: ${services.cma-api.base-url}/api/internal/v1/assessment/means/{financialAssessmentId} - update-url: ${services.cma-api.base-url}/api/internal/v1/assessment/means maat-api: base-url: ${MAAT_API_BASE_URL} assessments-domain: ${services.maat-api.base-url}/api/internal/v1/assessment diff --git a/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/config/MockServicesConfiguration.java b/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/config/MockServicesConfiguration.java index a98098c..73c954c 100644 --- a/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/config/MockServicesConfiguration.java +++ b/crime-evidence/src/test/java/uk/gov/justice/laa/crime/evidence/config/MockServicesConfiguration.java @@ -8,27 +8,17 @@ public static ServicesConfiguration getConfiguration(int port) { ServicesConfiguration servicesConfiguration = new ServicesConfiguration(); ServicesConfiguration.MaatApi maatApiConfiguration = new ServicesConfiguration.MaatApi(); - ServicesConfiguration.CmaApi cmaApiConfiguration = new ServicesConfiguration.CmaApi(); ServicesConfiguration.MaatApi.RepOrderEndpoints repOrderEndpoints = new ServicesConfiguration.MaatApi.RepOrderEndpoints( "/rep-orders/capital/reporder/{repId}" ); - ServicesConfiguration.CmaApi.Endpoints cmaEndpoints = - new ServicesConfiguration.CmaApi.Endpoints( - "/assessment/means/{financialAssessmentId}", - "/assessment/means"); - maatApiConfiguration.setBaseUrl(host); maatApiConfiguration.setRepOrderEndpoints(repOrderEndpoints); - cmaApiConfiguration.setBaseUrl(host); - cmaApiConfiguration.setEndpoints(cmaEndpoints); - servicesConfiguration.setOAuthEnabled(false); servicesConfiguration.setMaatApi(maatApiConfiguration); - servicesConfiguration.setCmaApi(cmaApiConfiguration); return servicesConfiguration; } diff --git a/crime-evidence/src/test/resources/application.yaml b/crime-evidence/src/test/resources/application.yaml index 2067143..879a578 100644 --- a/crime-evidence/src/test/resources/application.yaml +++ b/crime-evidence/src/test/resources/application.yaml @@ -24,15 +24,9 @@ spring: oauth2: client: provider: - cma: - token-uri: http://localhost:${wiremock.server.port}/oauth2/token maat-api: token-uri: http://localhost:9999/oauth2/token registration: - cma: - client-id: dummy-client - client-secret: dummy-client - authorization-grant-type: client_credentials maat-api: client-id: dummy-client client-secret: dummy-secret @@ -51,11 +45,6 @@ springdoc: operationsSorter: method services: - cma-api: - base-url: http://localhost:${wiremock.server.port} - endpoints: - find-url: ${services.cma-api.base-url}/api/internal/v1/assessment/means/{financialAssessmentId} - update-url: ${services.cma-api.base-url}/api/internal/v1/assessment/means maat-api: oAuthEnabled: true baseUrl: http://localhost:9999 diff --git a/helm_deploy/laa-crime-evidence/templates/_environment.tpl b/helm_deploy/laa-crime-evidence/templates/_environment.tpl index 84aa1d2..7724523 100644 --- a/helm_deploy/laa-crime-evidence/templates/_environment.tpl +++ b/helm_deploy/laa-crime-evidence/templates/_environment.tpl @@ -14,20 +14,6 @@ env: value: {{ .Values.sentry.sampleRate | quote }} - name: LOG_LEVEL value: {{ .Values.logging.level }} - - name: CMA_API_BASE_URL - value: {{ .Values.cmaApi.baseUrl }} - - name: CMA_API_OAUTH_URL - value: {{ .Values.cmaApi.oauthUrl }} - - name: CMA_API_OAUTH_CLIENT_ID - valueFrom: - secretKeyRef: - name: cma-api-oauth-client-id - key: CMA_API_OAUTH_CLIENT_ID - - name: CMA_API_OAUTH_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: cma-api-oauth-client-secret - key: CMA_API_OAUTH_CLIENT_SECRET - name: MAAT_API_BASE_URL value: {{ .Values.maatApi.baseUrl }} - name: MAAT_API_OAUTH_URL diff --git a/helm_deploy/laa-crime-evidence/values-dev.yaml b/helm_deploy/laa-crime-evidence/values-dev.yaml index 7133fe7a1b1ed6ed0e199b4a9020bc03a61d5e75..205619f86711c254093c314f227d69ef7d3d01e2 100644 GIT binary patch literal 2389 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 diff --git a/helm_deploy/laa-crime-evidence/values-prod.yaml b/helm_deploy/laa-crime-evidence/values-prod.yaml index 8650056faa732b8dd83131f7cf92171f6276bbd2..1baaa2038d7bd6ac8e6197d164379c80a294ad86 100644 GIT binary patch literal 2216 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 XG6FK)-D^6L@+%%ZUDZU5?3rRUYf+%{ diff --git a/helm_deploy/laa-crime-evidence/values-test.yaml b/helm_deploy/laa-crime-evidence/values-test.yaml index 0c7d2908d37e0ec58953ac30ade458ee5dd93032..11d23f2b215040eefb871e29caee0b3a341cd769 100644 GIT binary patch literal 2383 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 diff --git a/helm_deploy/laa-crime-evidence/values-uat.yaml b/helm_deploy/laa-crime-evidence/values-uat.yaml index 98a4473696c0afcb61683b3c764c12f05ba32115..d5f68c6779167bb16d1fc0b33177bc158d8d2d62 100644 GIT binary patch literal 2380 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