klass-forvaltning postgres support

.gitignore

@@ -4,6 +4,8 @@ target
 .settings/
 .designer/
 
+**/.env
+**/postgresql/data/
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

.nais/test/klass-api.yaml

@@ -13,8 +13,6 @@ spec:
   ingresses:
     - https://klass.intern.test.ssb.no
 
-  accessPolicy:
-
   replicas:
     min: 1
     max: 1
@@ -46,4 +44,4 @@ spec:
   startup:
     path: /actuator/health/liveness
     port: 8080
-    initialDelay: 60
+    initialDelay: 60

.nais/test/klass-forvaltning.yaml

@@ -25,23 +25,7 @@ spec:
     - name: SPRING_PROFILES_ACTIVE
       value: frontend, postgres, small-import, skip-indexing, ad-offline, embedded-solr
   envFrom:
-    - secret: sqluser-password-klass-forvaltning
     - secret: google-sql-klass
   filesFrom:
     - mountPath: /var/run/secrets/nais.io/sqlcertificate
       secret: sqeletor-klass-827ec8ec
----
-apiVersion: sql.cnrm.cloud.google.com/v1beta1
-kind: SQLUser
-metadata:
-  name: klass-forvaltning
-  namespace: dapla-metadata
-spec:
-  host: ""
-  instanceRef:
-    external: klass
-  password:
-    valueFrom:
-      secretKeyRef:
-        name: sqluser-password-klass-forvaltning
-        key: NAIS_DATABASE_KLASS_KLASS_FORVALTNING_PASSWORD

klass-forvaltning/pom.xml

@@ -6,15 +6,16 @@
     <name>Klass Forvaltning</name>
     <description>Forvaltningsgrensesnitt for Klass</description>
     <artifactId>klass-forvaltning</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <properties>
         <java.version>1.8</java.version>
         <github.repository>statisticsnorway/klass</github.repository>
         <!-- Klass dependencies are built with support for Java 8 and Spring Boot 1.4.4.
              Newer versions are not supported -->
-        <klass-version>2.1.7</klass-version>
+        <klass-shared-version>2.2.1</klass-shared-version>
+        <klass-solr-version>2.1.7</klass-solr-version>
         <!-- Vaadin 7.7.17 was the last public open-source version of the Vaadin 7 framework.
              See https://vaadin.com/support/vaadin-7-extended-maintenance  -->
         <vaadin-version>7.7.17</vaadin-version>
@@ -68,12 +69,12 @@
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-shared</artifactId>
-            <version>${klass-version}</version>
+            <version>${klass-shared-version}</version>
         </dependency>
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-solr</artifactId>
-            <version>${klass-version}</version>
+            <version>${klass-solr-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -144,15 +145,15 @@
             <artifactId>klass-shared</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${klass-version}</version>
+            <version>${klass-shared-version}</version>
         </dependency>
 
         <dependency>
             <groupId>no.ssb.klass</groupId>
             <artifactId>klass-solr</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${klass-version}</version>
+            <version>${klass-solr-version}</version>
         </dependency>
 
         <dependency>

klass-forvaltning/src/main/resources/application-postgres-local.properties

@@ -0,0 +1,13 @@
+# custom properties used when "postgres-local" Profile is used
+spring.datasource.url=jdbc:postgresql://${POSTGRES_INSTANCE}:5432/klass
+spring.datasource.username=${POSTGRES_USER}
+spring.datasource.password=${POSTGRES_PASSWORD}
+flyway.enabled=false
+spring.jpa.hibernate.ddl-auto=none
+spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.validation-timeout=3000
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql=TRACE
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

klass-forvaltning/src/main/resources/application-postgres.properties

@@ -1,9 +1,11 @@
 # custom properties used when "postgres" Profile is used
-spring.datasource.url=jdbc:postgresql://${NAIS_DATABASE_KLASS_KLASS_HOST}:5432/${NAIS_DATABASE_KLASS_KLASS_DATABASE}?password=${NAIS_DATABASE_KLASS_KLASS_FORVALTNING_PASSWORD}&sslcert=${NAIS_DATABASE_KLASS_KLASS_SSLCERT}&sslkey=${NAIS_DATABASE_KLASS_KLASS_SSLKEY_PK8}&sslmode=${NAIS_DATABASE_KLASS_KLASS_SSLMODE}&sslrootcert=${NAIS_DATABASE_KLASS_KLASS_SSLROOTCERT}&user=${NAIS_DATABASE_KLASS_KLASS_FORVALTNING_USER}
-spring.datasource.driverclassName=org.postgresql.Driver
+spring.datasource.url=${NAIS_DATABASE_KLASS_KLASS_JDBC_URL}
+spring.datasource.driver-class-name=org.postgresql.Driver
+flyway.enabled=false
 spring.jpa.hibernate.ddl-auto=none
-spring.flyway.enabled=false
 spring.datasource.hikari.connection-test-query=SELECT 1
 spring.datasource.hikari.validation-timeout=3000
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql=TRACE
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect

klass-shared/docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
   mariadb:
     image: mariadb:11.7
-    profiles: [migration-testing, migrate-data]
+    profiles: [ migration-testing, migrate-data ]
     container_name: klass_mariadb
     ports:
       - "3306:3306"
@@ -13,7 +13,7 @@ services:
       MARIADB_DATABASE: "klass"
   postgresql:
     image: postgres:17.4
-    profiles: [migration-testing, migrate-data]
+    profiles: [ migration-testing, migrate-data, frontend, api ]
     container_name: klass_postgres
     ports:
       - "5432:5432"
@@ -26,9 +26,9 @@ services:
     build:
       context: ../klass-api
       dockerfile: ../klass-api/Dockerfile
-    command: ["java", "-jar", "app.war", "--spring.profiles.active=api, postgres-local, skip-indexing, embedded-solr"]
+    command: [ "java", "-jar", "app.war", "--spring.profiles.active=api, postgres-local, skip-indexing, embedded-solr" ]
     container_name: klass-api
-    profiles: [migration-testing]
+    profiles: [ migration-testing, api ]
     depends_on:
       - postgresql
     ports:
@@ -39,21 +39,21 @@ services:
           cpus: "1.0"
           memory: 1G
     environment:
+      SPRING_PROFILES_ACTIVE: api, postgres-local, skip-indexing, embedded-solr
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USER: "klass"
       POSTGRES_INSTANCE: ${POSTGRES_INSTANCE}
-      SPRING_PROFILES_ACTIVE: "postgres-local"
   klass-api-mariadb:
     build:
       context: ../klass-api
       dockerfile: ../klass-api/Dockerfile
-    command: ["java", "-jar", "app.war", "--spring.profiles.active=api, mariadb-local, skip-indexing, embedded-solr"]
+    command: [ "java", "-jar", "app.war", "--spring.profiles.active=api, mariadb-local, skip-indexing, embedded-solr" ]
     container_name: klass-api-mariadb
-    profiles: [migration-testing]
+    profiles: [ migration-testing ]
     depends_on:
       - mariadb
     ports:
-      - "8081:8080"
+      - "8082:8080"
     deploy:
       resources:
         limits:
@@ -73,8 +73,11 @@ services:
       context: ../klass-forvaltning
       dockerfile: ../klass-forvaltning/Dockerfile
     container_name: klass-forvaltning
-    profiles: [klass-forvaltning]
+    profiles: [ frontend ]
     ports:
-      - "8082:8081"
+      - "8081:8081"
     environment:
-      SPRING_PROFILES_ACTIVE: frontend, h2-inmemory, small-import, skip-indexing, embedded-solr
+      SPRING_PROFILES_ACTIVE: frontend, postgres-local, ad-offline, skip-indexing, embedded-solr
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: "klass"
+      POSTGRES_INSTANCE: ${POSTGRES_INSTANCE}