Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bruker GCP-databaser uten NAIS for "lokal" kjøring #3652

Merged
merged 15 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions .github/workflows/db.dolly-backend.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/db.organisasjon-forvalter.yml

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/db.pdl-forvalter.yml

This file was deleted.

1 change: 1 addition & 0 deletions apps/dolly-backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
11 changes: 9 additions & 2 deletions apps/dolly-backend/src/main/resources/application-local.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions apps/dolly-backend/src/test/resources/application-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ sts:

spring:
cloud:
gcp:
secretmanager:
enabled: false
vault:
enabled: false
datasource:
Expand Down
37 changes: 0 additions & 37 deletions apps/dolly-db/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions apps/dolly-db/Dockerfile

This file was deleted.

7 changes: 0 additions & 7 deletions apps/dolly-db/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions apps/dolly-db/build.gradle

This file was deleted.

31 changes: 0 additions & 31 deletions apps/dolly-db/db.dolly-backend.yml

This file was deleted.

29 changes: 0 additions & 29 deletions apps/dolly-db/db.organisasjon-forvalter.yml

This file was deleted.

29 changes: 0 additions & 29 deletions apps/dolly-db/db.pdl-forvalter.yml

This file was deleted.

Binary file removed apps/dolly-db/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions apps/dolly-db/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading