Skip to content

cleanup/vault_vs_sm #3696

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Dec 13, 2024
Merged

cleanup/vault_vs_sm #3696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
706c821
Fjerner Vault.
rfc3092 Dec 12, 2024
e43f22b
Endrer formattering for å tydeliggjøre at dette er en environment var…
rfc3092 Dec 12, 2024
4069c65
Lagt til AZURE_APP_CLIENT_[ID|SECRET] fra Secret Manager.
rfc3092 Dec 12, 2024
5206a1c
Typo.
rfc3092 Dec 12, 2024
eda86f3
Fjerner unødvendig config nå som Vault er borte.
rfc3092 Dec 12, 2024
0bd9c33
Fjerner eksplisitte dependencies som legges til gjennom plugin dolly-…
rfc3092 Dec 12, 2024
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
4 changes: 0 additions & 4 deletions apps/altinn3-tilgang-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ sonarqube {
}

dependencies {
implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"

implementation "no.nav.testnav.libs:reactive-core"
implementation "no.nav.testnav.libs:reactive-security"
implementation "no.nav.testnav.libs:vault"

implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
Expand All @@ -28,7 +25,6 @@ dependencies {

implementation "ma.glasnost.orika:orika-core:$versions.orika"

implementation "io.micrometer:micrometer-registry-prometheus"
implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"

Expand Down
10 changes: 0 additions & 10 deletions ...g-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions apps/altinn3-tilgang-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
TOKEN_X_ISSUER: dummy

ALTINN_URL: https://tt02.altinn.no

AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
MASKINPORTEN_CLIENT_ID: dummy
MASKINPORTEN_CLIENT_JWK: dummy
MASKINPORTEN_SCOPES: dummy
MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
TOKEN_X_ISSUER: dummy

spring:
cache:
Expand Down
7 changes: 2 additions & 5 deletions apps/altinn3-tilgang-service/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,21 @@ spring:
application:
version: application.version.todo
name: testnav-altinn3-tilgang-service
desciption: Tjeneste for å hente og sette tilganger for orgnisasjoner
description: Tjeneste for å hente og sette tilganger for orgnisasjoner
security:
oauth2:
resourceserver:
aad:
issuer-uri: ${AAD_ISSUER_URI}/v2.0
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
tokenx:
issuer-uri: ${TOKEN_X_ISSUER}
jwk-set-uri: ${TOKEN_X_JWKS_URI}
accepted-audience: ${TOKEN_X_CLIENT_ID}
jackson:
serialization:
write_dates_as_timestamps: false
cloud:
vault:
enabled: false

springdoc:
swagger-ui:
Expand Down
Loading