From 82b41e1b9b594b10ae1d19402b1a94a97d04f2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Niclas=20Str=C3=BCwer?=
<jan-niclas.struewer@iem.fraunhofer.de>
Date: Wed, 31 Jul 2024 09:24:37 +0000
Subject: [PATCH] Single Logical File for build setup
---
.../src/main/resources/application.properties | 33 +++++++++++++++++--
app/backend/src/main/resources/dev.properties | 11 -------
.../src/main/resources/local.properties | 15 ---------
.../src/main/resources/prod.properties | 0
docker-compose.yml | 2 +-
kubernetes/configmap-prod.yaml | 2 +-
kubernetes/configmap.yaml | 2 +-
7 files changed, 34 insertions(+), 31 deletions(-)
delete mode 100644 app/backend/src/main/resources/dev.properties
delete mode 100644 app/backend/src/main/resources/local.properties
delete mode 100644 app/backend/src/main/resources/prod.properties
diff --git a/app/backend/src/main/resources/application.properties b/app/backend/src/main/resources/application.properties
index 693118a0..d6136641 100644
--- a/app/backend/src/main/resources/application.properties
+++ b/app/backend/src/main/resources/application.properties
@@ -52,6 +52,35 @@ spring.datasource.driver-class-name=org.postgresql.Driver
# Generates db schema if it doesn't exist in db
spring.jpa.generate-ddl=true
spring.jpa.show-sql=false
+#---
+spring.config.activate.on-profile=local
+opencode.host=https://gitlab.opencode.de/
+opencode.analyze-private-repos=true
+
+# Tool APIs
+opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
+opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session/
+
+# Database Settings
+spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
+spring.jpa.hibernate.ddl-auto=create-drop
+
+# Import local .env
+spring.config.import=optional:classpath:.env[.properties]
+
+#---
+spring.config.activate.on-profile=dev
+# Config for the OpencoDE platform
+opencode.host=https://gitlab.dev.o4oe.de/
+opencode.analyze-private-repos=true
+
+# Tool APIs
+opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
+opencode.api.auth=https://sl.dev.o4oe.de/api/
+
+# Database Settings
+spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
+spring.jpa.hibernate.ddl-auto=update
-# Import profile specific properties (Default is prod)
-spring.config.import=optional:file:${SPRING_PROFILE}.properties
+#---
+spring.config.activate.on-profile=prod
diff --git a/app/backend/src/main/resources/dev.properties b/app/backend/src/main/resources/dev.properties
deleted file mode 100644
index 297bd070..00000000
--- a/app/backend/src/main/resources/dev.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config for the OpencoDE platform
-opencode.host=https://gitlab.dev.o4oe.de/
-opencode.analyze-private-repos=true
-
-# Tool APIs
-opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
-opencode.api.auth=https://sl.dev.o4oe.de/api/
-
-# Database Settings
-spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
-spring.jpa.hibernate.ddl-auto=update
diff --git a/app/backend/src/main/resources/local.properties b/app/backend/src/main/resources/local.properties
deleted file mode 100644
index 22be05e0..00000000
--- a/app/backend/src/main/resources/local.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Config for the OpencoDE platform
-opencode.host=https://gitlab.opencode.de/
-opencode.analyze-private-repos=true
-
-# Tool APIs
-opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
-opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session/
-
-# Database Settings
-spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
-spring.jpa.hibernate.ddl-auto=create-drop
-
-# Import local .env
-spring.config.import=optional:classpath:.env[.properties]
-
diff --git a/app/backend/src/main/resources/prod.properties b/app/backend/src/main/resources/prod.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/docker-compose.yml b/docker-compose.yml
index d93a403f..a731b2f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,6 +33,6 @@ services:
- HMAC_KEY=012345678901234567890123456789
- API_KEY=012345678901234567890123456789
- - SPRING_PROFILE=local
+ - SPRING_PROFILES_ACTIVE=local
ports:
- 4000:4000
diff --git a/kubernetes/configmap-prod.yaml b/kubernetes/configmap-prod.yaml
index 400d2693..29b491c9 100644
--- a/kubernetes/configmap-prod.yaml
+++ b/kubernetes/configmap-prod.yaml
@@ -10,4 +10,4 @@ data:
XDG_CONFIG_HOME: "/app/.config"
CORS_ORIGIN: "https://sec-kpi.opencode.de"
PROJECT_IDS: 1108, 888, 438, 1189, 820, 788, 400, 1052
- SPRING_PROFILE: prod
+ SPRING_PROFILES_ACTIVE: prod
diff --git a/kubernetes/configmap.yaml b/kubernetes/configmap.yaml
index 8c4cb264..f4981583 100644
--- a/kubernetes/configmap.yaml
+++ b/kubernetes/configmap.yaml
@@ -10,4 +10,4 @@ data:
XDG_CONFIG_HOME: "/app/.config"
CORS_ORIGIN: "*"
PROJECT_IDS: 159,106, 124
- SPRING_PROFILE: dev
+ SPRING_PROFILES_ACTIVE: dev
--
GitLab