From 471d7c7d85be6d3736fae57bebc96c5e2d0dd61e Mon Sep 17 00:00:00 2001
From: Lars Bardgard Astveit <lab@digdir.no>
Date: Wed, 3 Apr 2024 09:15:24 +0200
Subject: [PATCH] MOVE-4016 renamed profile pipelinetest to dev

---
 .../main/resources/application-dev-local.yml  | 29 ++++++++++
 .../src/main/resources/application-dev.yml    | 46 +++++++++++++--
 .../resources/application-pipelinetest.yml    | 56 -------------------
 3 files changed, 70 insertions(+), 61 deletions(-)
 create mode 100644 serviceregistry-server/src/main/resources/application-dev-local.yml
 delete mode 100644 serviceregistry-server/src/main/resources/application-pipelinetest.yml

diff --git a/serviceregistry-server/src/main/resources/application-dev-local.yml b/serviceregistry-server/src/main/resources/application-dev-local.yml
new file mode 100644
index 00000000..2911f36b
--- /dev/null
+++ b/serviceregistry-server/src/main/resources/application-dev-local.yml
@@ -0,0 +1,29 @@
+spring:
+  cloud:
+    config:
+      uri: https://test-meldingsutveksling.dificloud.net/discovery/config
+  eureka:
+    client:
+      serviceUrl:
+        defaultZone: https://test-meldingsutveksling.dificloud.net/discovery/eureka
+
+difi:
+  move:
+    virksert:
+      endpointURL: https://test-meldingsutveksling.dificloud.net/virksomhetssertifikat/
+    dpv:
+      endpointURL: https://tt02.altinn.no/ServiceEngineExternal/CorrespondenceAgencyExternal.svc
+    dpi:
+      endpointURL: https://qaoffentlig.meldingsformidler.digipost.no/api/ebms
+    krr:
+      mp-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/personer
+      mp-dsf-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/mf/personer
+
+app:
+  logger:
+    destination: test-stream-meldingsutveksling.dificloud.net:443
+
+logging:
+  level:
+    org.springframework.ws.client.MessageTracing: TRACE
+    org.springframework.ws.server.MessageTracing: TRACE
diff --git a/serviceregistry-server/src/main/resources/application-dev.yml b/serviceregistry-server/src/main/resources/application-dev.yml
index 9cb59e81..a023416f 100644
--- a/serviceregistry-server/src/main/resources/application-dev.yml
+++ b/serviceregistry-server/src/main/resources/application-dev.yml
@@ -1,7 +1,40 @@
+server:
+  port: 8080
+management:
+  server:
+    port: 8090
+  endpoint:
+    health:
+      show-details: always
+      probes:
+        enabled: true
+  endpoints:
+    web:
+      base-path: /
+      exposure:
+        include: "*"
+        exclude: shutdown
+    enabled-by-default: true
+  metrics:
+    tags:
+      application: ${spring.application.name}
+  health:
+    livenessState:
+      enabled: true
+    readinessState:
+      enabled: true
+
+spring:
+  datasource:
+    url: jdbc:mysql://mysql:3306/move_sr_nextmove
+    username: move_sr
+    password: ${DATASOURCE_PASSWORD}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
 difi:
   move:
     virksert:
-      endpointURL: https://test-meldingsutveksling.dificloud.net/virksomhetssertifikat/
+      endpointURL: https://eformidling.dev/virksomhetssertifikat/
     dpv:
       endpointURL: https://tt02.altinn.no/ServiceEngineExternal/CorrespondenceAgencyExternal.svc
     dpi:
@@ -9,12 +42,15 @@ difi:
     krr:
       mp-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/personer
       mp-dsf-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/mf/personer
-
-app:
-  logger:
-    destination: test-stream-meldingsutveksling.dificloud.net:443
+    sign:
+      keystore:
+        path: ${DIFI_MOVE_SIGN_KEYSTORE_PATH}
+        alias: ${DIFI_MOVE_SIGN_KEYSTORE_ALIAS}
+        password: ${DIFI_MOVE_SIGN_KEYSTORE_PASSWORD}
+        type: JKS
 
 logging:
   level:
     org.springframework.ws.client.MessageTracing: TRACE
     org.springframework.ws.server.MessageTracing: TRACE
+    no.difi.meldingsutveksling.serviceregistry.controller: TRACE
diff --git a/serviceregistry-server/src/main/resources/application-pipelinetest.yml b/serviceregistry-server/src/main/resources/application-pipelinetest.yml
deleted file mode 100644
index a023416f..00000000
--- a/serviceregistry-server/src/main/resources/application-pipelinetest.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-server:
-  port: 8080
-management:
-  server:
-    port: 8090
-  endpoint:
-    health:
-      show-details: always
-      probes:
-        enabled: true
-  endpoints:
-    web:
-      base-path: /
-      exposure:
-        include: "*"
-        exclude: shutdown
-    enabled-by-default: true
-  metrics:
-    tags:
-      application: ${spring.application.name}
-  health:
-    livenessState:
-      enabled: true
-    readinessState:
-      enabled: true
-
-spring:
-  datasource:
-    url: jdbc:mysql://mysql:3306/move_sr_nextmove
-    username: move_sr
-    password: ${DATASOURCE_PASSWORD}
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-difi:
-  move:
-    virksert:
-      endpointURL: https://eformidling.dev/virksomhetssertifikat/
-    dpv:
-      endpointURL: https://tt02.altinn.no/ServiceEngineExternal/CorrespondenceAgencyExternal.svc
-    dpi:
-      endpointURL: https://qaoffentlig.meldingsformidler.digipost.no/api/ebms
-    krr:
-      mp-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/personer
-      mp-dsf-endpoint-uri: https://test.kontaktregisteret.no/rest/v1/mf/personer
-    sign:
-      keystore:
-        path: ${DIFI_MOVE_SIGN_KEYSTORE_PATH}
-        alias: ${DIFI_MOVE_SIGN_KEYSTORE_ALIAS}
-        password: ${DIFI_MOVE_SIGN_KEYSTORE_PASSWORD}
-        type: JKS
-
-logging:
-  level:
-    org.springframework.ws.client.MessageTracing: TRACE
-    org.springframework.ws.server.MessageTracing: TRACE
-    no.difi.meldingsutveksling.serviceregistry.controller: TRACE