OK-735: Muutetaan configin sijaintia, jotta sovellus löytää ne

Opetushallitus · Nov 29, 2024 · 5fc2ed2 · 5fc2ed2
1 parent 9c62dc7
commit 5fc2ed2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,6 +75,8 @@ jobs:
           source ci-tools/common/setup-tools.sh
           mv ovara-backend/target/ovara-backend-*.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar
           cp -vr ovara-backend/src/main/resources/oph-configuration $DOCKER_BUILD_DIR/config/oph-configuration/
+          ls $DOCKER_BUILD_DIR/config/oph-configuration/
+          cat $DOCKER_BUILD_DIR/config/oph-configuration/application.properties.template
           ./ci-tools/common/pull-image.sh
           ./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
           ./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
diff --git a/ovara-backend/.gitignore b/ovara-backend/.gitignore
@@ -34,6 +34,6 @@ build/
 
 .mise.toml
 
-application-dev.properties
+src/main/resources/oph-configuration/application-dev.properties
 
 ovara.dump
diff --git a/ovara-backend/src/main/resources/application.properties b/ovara-backend/src/main/resources/application.properties
diff --git a/ovara-backend/src/main/resources/oph-configuration/application.properties b/ovara-backend/src/main/resources/oph-configuration/application.properties
@@ -0,0 +1,2 @@
+spring.application.name=ovara-backend
+server.servlet.context-path=/ovara-backend
diff --git a/ovara-backend/src/main/resources/oph-configuration/application.properties.template b/ovara-backend/src/main/resources/oph-configuration/application.properties.template
@@ -1,6 +1,3 @@
-spring.application.name=ovara-backend
-server.servlet.context-path=/ovara-backend
-
 # ENVIRONMENT SPECIFIC CONFIG
 # DB CONNECTION
 spring.datasource.url={{host_postgresql_ovara}}
@@ -9,8 +6,9 @@ spring.datasource.password={{ovara_backend_postgresql_password}}
 
 # CAS
 opintopolku.virkailija.domain={{host_virkailija}}
-ovara.backend.url=https://${opintopolku.virkailija.domain}/ovara-backend
-ovara.ui.url=https://${opintopolku.virkailija.domain}/raportointi
-cas.url=https://${opintopolku.virkailija.domain}/cas
+opintopolku.virkailija.url=https://${opintopolku.virkailija.domain}
+ovara.backend.url=${opintopolku.virkailija.url}/ovara-backend
+ovara.ui.url=${opintopolku.virkailija.url}/raportointi
+cas.url=${opintopolku.virkailija.url}/cas
 ovara-backend.cas.username={{ovara_backend_cas_username}}
-ovara-backend.cas.password={{ovara_backend_cas_password}}
+ovara-backend.cas.password={{ovara_backend_cas_password}}
diff --git a/ovara-backend/src/main/scala/fi/oph/ovara/backend/security/CasConfig.scala b/ovara-backend/src/main/scala/fi/oph/ovara/backend/security/CasConfig.scala
@@ -29,7 +29,7 @@ class CasConfig  {
   @Value("${ovara.backend.url}")
   val ovara_backend_url: String = null
 
-  @Value("${opintopolku.virkailija.domain}")
+  @Value("${opintopolku.virkailija.url}")
   val opintopolku_virkailija_domain: String = null
 
   @Value("${ovara-backend.cas.username}")

diff --git a/ovara-backend/src/main/scala/fi/oph/ovara/backend/service/OnrService.scala b/ovara-backend/src/main/scala/fi/oph/ovara/backend/service/OnrService.scala
@@ -18,7 +18,7 @@ import scala.jdk.javaapi.FutureConverters.asScala
 class OnrService {
   val LOG: Logger = LoggerFactory.getLogger(classOf[OnrService])
 
-  @Value("${opintopolku.virkailija.domain}")
+  @Value("${opintopolku.virkailija.url}")
   val opintopolku_virkailija_domain: String = null
 
   @Autowired
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		spring.application.name=ovara-backend
		server.servlet.context-path=/ovara-backend