Merge branch 'master' of https://github.com/navikt/testnorge into fea…

…ture/yrkesskade-frontend
navikt · Oct 16, 2024 · 42c9118 · 42c9118
2 parents 38cb1fd + 6fde837
commit 42c9118
Show file tree

Hide file tree

Showing 42 changed files with 69 additions and 742 deletions.
diff --git a/.github/workflows/db.dolly-backend.yml b/.github/workflows/db.dolly-backend.yml
diff --git a/.github/workflows/db.organisasjon-forvalter.yml b/.github/workflows/db.organisasjon-forvalter.yml
diff --git a/.github/workflows/db.pdl-forvalter.yml b/.github/workflows/db.pdl-forvalter.yml
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -10,6 +10,7 @@ sonarqube {
 }
 
 dependencies {
+    implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"
 
     implementation 'no.nav.testnav.libs:servlet-core'
     implementation 'no.nav.testnav.libs:servlet-security'

diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yaml
@@ -1,9 +1,16 @@
 spring:
   cache:
     type: none
+  cloud:
+    gcp:
+      secretmanager:
+        project-id: dolly-dev-ff83
+  config:
+    import: "sm://"
   datasource:
-    url: jdbc:postgresql://localhost:5432/db-dolly-backend
-    username: ${NAV_USERNAME}
+    url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
+    username: testnav-dolly-backend-local
+    password: ${sm://testnav-dolly-backend-local}
 
 management:
   endpoints:

diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -87,6 +87,9 @@ sts:
 
 spring:
   cloud:
+    gcp:
+      secretmanager:
+        enabled: false
     vault:
       enabled: false
   datasource:

diff --git a/apps/dolly-db/.gitignore b/apps/dolly-db/.gitignore
diff --git a/apps/dolly-db/Dockerfile b/apps/dolly-db/Dockerfile
diff --git a/apps/dolly-db/README.md b/apps/dolly-db/README.md
diff --git a/apps/dolly-db/build.gradle b/apps/dolly-db/build.gradle
diff --git a/apps/dolly-db/db.dolly-backend.yml b/apps/dolly-db/db.dolly-backend.yml
diff --git a/apps/dolly-db/db.organisasjon-forvalter.yml b/apps/dolly-db/db.organisasjon-forvalter.yml
diff --git a/apps/dolly-db/db.pdl-forvalter.yml b/apps/dolly-db/db.pdl-forvalter.yml
diff --git a/apps/dolly-db/gradle/wrapper/gradle-wrapper.jar b/apps/dolly-db/gradle/wrapper/gradle-wrapper.jar
diff --git a/apps/dolly-db/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-db/gradle/wrapper/gradle-wrapper.properties