Skip to content

Commit b3f615d

Browse files
krharumkrharum
committed
Merge branch 'master' into feature/diverse-teknisk-gjeld
2 parents 9455dea + 4f2a31d commit b3f615d

163 files changed

Lines changed: 2142 additions & 318 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/proxy.texas-proxy.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: texas-proxy
2+
3+
on:
4+
push:
5+
paths:
6+
- "plugins/**"
7+
- "libs/testing/**"
8+
- "proxies/texas-proxy/**"
9+
- ".github/workflows/proxy.texas-proxy.yml"
10+
11+
jobs:
12+
workflow:
13+
uses: ./.github/workflows/common.workflow.backend.yml
14+
with:
15+
working-directory: "proxies/texas-proxy"
16+
deploy-tag: "#deploy-texas-proxy"
17+
permissions:
18+
contents: read
19+
id-token: write
20+
secrets: inherit

‎apps/adresse-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ LABEL maintainer="Team Dolly"
33

44
ENV JAVA_OPTS="-Dspring.profiles.active=prod --add-opens java.base/java.lang=ALL-UNNAMED"
55

6-
ADD build/libs/app.jar /app/app.jar
6+
COPY build/libs/app.jar /app/app.jar
77

88
EXPOSE 8080

‎apps/app-tilgang-analyse-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ LABEL maintainer="Team Dolly"
33

44
ENV JAVA_OPTS="-Dspring.profiles.active=prod"
55

6-
ADD build/libs/app.jar /app/app.jar
6+
COPY build/libs/app.jar /app/app.jar
77

88
EXPOSE 8080

‎apps/batch-bestilling-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ LABEL maintainer="Team Dolly"
33

44
ENV JAVA_OPTS="-Dspring.profiles.active=prod"
55

6-
ADD /build/libs/app.jar /app/app.jar
6+
COPY /build/libs/app.jar /app/app.jar
77

88
EXPOSE 8080

‎apps/bruker-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ghcr.io/navikt/baseimages/temurin:21
22
LABEL maintainer="Team Dolly"
33

4-
ADD build/libs/app.jar /app/app.jar
4+
COPY build/libs/app.jar /app/app.jar
55

66
EXPOSE 8080

‎apps/budpro-service/.env‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Copy this file to `.env` to have it automatically loaded in your dev environment
2+
3+
APPLICATION_PORT=8000
4+
LOGIN_INGRESS=http://localhost:4000
5+
NAIS_TOKEN_ENDPOINT=http://localhost:3000/api/v1/token
6+
NAIS_TOKEN_EXCHANGE_ENDPOINT=http://localhost:3000/api/v1/token/exchange
7+
NAIS_TOKEN_INTROSPECTION_ENDPOINT=http://localhost:3000/api/v1/introspect
8+
OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
9+
10+
# --- Wonderwall config ---
11+
WONDERWALL_OPENID_WELL_KNOWN_URL=http://localhost:7070/default/.well-known/openid-configuration
12+
13+
# --- Texas config ---
14+
IDPORTEN_ENABLED=true
15+
# expected audience for user token from wonderwall
16+
IDPORTEN_AUDIENCE=default
17+
IDPORTEN_ISSUER=http://localhost:7070/default
18+
IDPORTEN_JWKS_URI=http://localhost:7070/default/jwks
19+
20+
TOKEN_X_ENABLED=true
21+
TOKEN_X_CLIENT_ID=client-id
22+
# this key is useless in production; disregard security notices
23+
TOKEN_X_PRIVATE_JWK='{"p":"_LNnIjBshCrFuxtjUC2KKzg_NTVv26UZh5j12_9r5mYTxb8yW047jOYFEGvIdMkTRLGOBig6fLWzgd62lnLainzV35J6K6zr4jQfTldLondlkldMR6nQrp1KfnNUuRbKvzpNKkhl12-f1l91l0tCx3s4blztvWgdzN2xBfvWV68","kty":"RSA","q":"9MIWsbIA3WjiR_Ful5FM8NCgb6JdS2D6ySHVepoNI-iAPilcltF_J2orjfLqAxeztTskPi45wtF_-eV4GIYSzvMo-gFiXLMrvEa7WaWizMi_7Bu9tEk3m_f3IDLN9lwULYoebkDbiXx6GOiuj0VkuKz8ckYFNKLCMP9QRLFff-0","d":"J6UX848X8tNz-09PFvcFDUVqak32GXzoPjnuDjBsxNUvG7LxenLmM_i8tvYl0EW9Ztn4AiCqJUoHw5cX3jz_mSqGl7ciaDedpKm_AetcZwHiEuT1EpSKRPMmOMQSqcJqXrdbbWB8gdUrnTKZIlJCfj7yqgT16ypC43TnwjA0UwxhG5pHaYjKI3pPdoHg2BzA-iubHjVn15Sz7-pnjBmeGDbEFa7ADY-1yPHCmqqvPKTNhoCNW6RpG34Id9hXslPa3X-7pAhJrDBd0_NPlktSA2rUkifYiZURhHR5ijhe0v3uw6kYP8f_foVm_C8O1ExkxXh9Dg8KDZ89dbsSOtBc0Q","e":"AQAB","use":"sig","kid":"l7C_WJgbZ_6e59vPrFETAehX7Dsp7fIyvSV4XhotsGs","qi":"cQFN5q5WhYkzgd1RS0rGqvpX1AkmZMrLv2MW04gSfu0dDwpbsSAu8EUCQW9oA4pr6V7R9CBSu9kdN2iY5SR-hZvEad5nDKPV1F3TMQYv5KpRiS_0XhfV5PcolUJVO_4p3h8d-mo2hh1Sw2fairAKOzvnwJCQ6DFkiY7H1cqwA54","dp":"YTql9AGtvyy158gh7jeXcgmySEbHQzvDFulDr-IXIg8kjHGEbp0rTIs0Z50RA95aC5RFkRjpaBKBfvaySjDm5WIi6GLzntpp6B8l7H6qG1jVO_la4Df2kzjx8LVvY8fhOrKz_hDdHodUeKdCF3RdvWMr00ruLnJhBPJHqoW7cwE","alg":"RS256","dq":"IZA4AngRbEtEtG7kJn6zWVaSmZxfRMXwvgIYvy4-3Qy2AVA0tS3XTPVfMaD8_B2U9CY_CxPVseR-sysHc_12uNBZbycfcOzU84WTjXCMSZ7BysPnGMDtkkLHra-p1L29upz1HVNhh5H9QEswHM98R2LZX2ZAsn4bORLZ1AGqweU","n":"8ZqUp5Cs90XpNn8tJBdUUxdGH4bjqKjFj8lyB3x50RpTuECuwzX1NpVqyFENDiEtMja5fdmJl6SErjnhj6kbhcmfmFibANuG-0WlV5yMysdSbocd75C1JQbiPdpHdXrijmVFMfDnoZTQ-ErNsqqngTNkn5SXBcPenli6Cf9MTSchZuh_qFj_B7Fp3CWKehTiyBcLlNOIjYsXX8WQjZkWKGpQ23AWjZulngWRektLcRWuEKTWaRBtbAr3XAfSmcqTICrebaD3IMWKHDtvzHAt_pt4wnZ06clgeO2Wbc980usnpsF7g8k9p81RcbS4JEZmuuA9NCmOmbyADXwgA9_-Aw"}'
24+
TOKEN_X_ISSUER=http://localhost:7070/default
25+
TOKEN_X_TOKEN_ENDPOINT=http://localhost:7070/default/token
26+
TOKEN_X_JWKS_URI=http://localhost:7070/default/jwks
27+
28+
AZURE_ENABLED=true
29+
# expected audience for user token from wonderwall
30+
AZURE_APP_CLIENT_ID=default
31+
# this key is useless in production; disregard security notices
32+
AZURE_APP_JWK='{"p":"_LNnIjBshCrFuxtjUC2KKzg_NTVv26UZh5j12_9r5mYTxb8yW047jOYFEGvIdMkTRLGOBig6fLWzgd62lnLainzV35J6K6zr4jQfTldLondlkldMR6nQrp1KfnNUuRbKvzpNKkhl12-f1l91l0tCx3s4blztvWgdzN2xBfvWV68","kty":"RSA","q":"9MIWsbIA3WjiR_Ful5FM8NCgb6JdS2D6ySHVepoNI-iAPilcltF_J2orjfLqAxeztTskPi45wtF_-eV4GIYSzvMo-gFiXLMrvEa7WaWizMi_7Bu9tEk3m_f3IDLN9lwULYoebkDbiXx6GOiuj0VkuKz8ckYFNKLCMP9QRLFff-0","d":"J6UX848X8tNz-09PFvcFDUVqak32GXzoPjnuDjBsxNUvG7LxenLmM_i8tvYl0EW9Ztn4AiCqJUoHw5cX3jz_mSqGl7ciaDedpKm_AetcZwHiEuT1EpSKRPMmOMQSqcJqXrdbbWB8gdUrnTKZIlJCfj7yqgT16ypC43TnwjA0UwxhG5pHaYjKI3pPdoHg2BzA-iubHjVn15Sz7-pnjBmeGDbEFa7ADY-1yPHCmqqvPKTNhoCNW6RpG34Id9hXslPa3X-7pAhJrDBd0_NPlktSA2rUkifYiZURhHR5ijhe0v3uw6kYP8f_foVm_C8O1ExkxXh9Dg8KDZ89dbsSOtBc0Q","e":"AQAB","use":"sig","kid":"l7C_WJgbZ_6e59vPrFETAehX7Dsp7fIyvSV4XhotsGs","qi":"cQFN5q5WhYkzgd1RS0rGqvpX1AkmZMrLv2MW04gSfu0dDwpbsSAu8EUCQW9oA4pr6V7R9CBSu9kdN2iY5SR-hZvEad5nDKPV1F3TMQYv5KpRiS_0XhfV5PcolUJVO_4p3h8d-mo2hh1Sw2fairAKOzvnwJCQ6DFkiY7H1cqwA54","dp":"YTql9AGtvyy158gh7jeXcgmySEbHQzvDFulDr-IXIg8kjHGEbp0rTIs0Z50RA95aC5RFkRjpaBKBfvaySjDm5WIi6GLzntpp6B8l7H6qG1jVO_la4Df2kzjx8LVvY8fhOrKz_hDdHodUeKdCF3RdvWMr00ruLnJhBPJHqoW7cwE","alg":"RS256","dq":"IZA4AngRbEtEtG7kJn6zWVaSmZxfRMXwvgIYvy4-3Qy2AVA0tS3XTPVfMaD8_B2U9CY_CxPVseR-sysHc_12uNBZbycfcOzU84WTjXCMSZ7BysPnGMDtkkLHra-p1L29upz1HVNhh5H9QEswHM98R2LZX2ZAsn4bORLZ1AGqweU","n":"8ZqUp5Cs90XpNn8tJBdUUxdGH4bjqKjFj8lyB3x50RpTuECuwzX1NpVqyFENDiEtMja5fdmJl6SErjnhj6kbhcmfmFibANuG-0WlV5yMysdSbocd75C1JQbiPdpHdXrijmVFMfDnoZTQ-ErNsqqngTNkn5SXBcPenli6Cf9MTSchZuh_qFj_B7Fp3CWKehTiyBcLlNOIjYsXX8WQjZkWKGpQ23AWjZulngWRektLcRWuEKTWaRBtbAr3XAfSmcqTICrebaD3IMWKHDtvzHAt_pt4wnZ06clgeO2Wbc980usnpsF7g8k9p81RcbS4JEZmuuA9NCmOmbyADXwgA9_-Aw"}'
33+
AZURE_OPENID_CONFIG_ISSUER=http://localhost:7070/default
34+
AZURE_OPENID_CONFIG_TOKEN_ENDPOINT=http://localhost:7070/default/token
35+
AZURE_OPENID_CONFIG_JWKS_URI=http://localhost:7070/default/jwks
36+
37+
MASKINPORTEN_ENABLED=true
38+
MASKINPORTEN_CLIENT_ID=client-id
39+
# this key is useless in production; disregard security notices
40+
MASKINPORTEN_CLIENT_JWK='{"p":"_LNnIjBshCrFuxtjUC2KKzg_NTVv26UZh5j12_9r5mYTxb8yW047jOYFEGvIdMkTRLGOBig6fLWzgd62lnLainzV35J6K6zr4jQfTldLondlkldMR6nQrp1KfnNUuRbKvzpNKkhl12-f1l91l0tCx3s4blztvWgdzN2xBfvWV68","kty":"RSA","q":"9MIWsbIA3WjiR_Ful5FM8NCgb6JdS2D6ySHVepoNI-iAPilcltF_J2orjfLqAxeztTskPi45wtF_-eV4GIYSzvMo-gFiXLMrvEa7WaWizMi_7Bu9tEk3m_f3IDLN9lwULYoebkDbiXx6GOiuj0VkuKz8ckYFNKLCMP9QRLFff-0","d":"J6UX848X8tNz-09PFvcFDUVqak32GXzoPjnuDjBsxNUvG7LxenLmM_i8tvYl0EW9Ztn4AiCqJUoHw5cX3jz_mSqGl7ciaDedpKm_AetcZwHiEuT1EpSKRPMmOMQSqcJqXrdbbWB8gdUrnTKZIlJCfj7yqgT16ypC43TnwjA0UwxhG5pHaYjKI3pPdoHg2BzA-iubHjVn15Sz7-pnjBmeGDbEFa7ADY-1yPHCmqqvPKTNhoCNW6RpG34Id9hXslPa3X-7pAhJrDBd0_NPlktSA2rUkifYiZURhHR5ijhe0v3uw6kYP8f_foVm_C8O1ExkxXh9Dg8KDZ89dbsSOtBc0Q","e":"AQAB","use":"sig","kid":"l7C_WJgbZ_6e59vPrFETAehX7Dsp7fIyvSV4XhotsGs","qi":"cQFN5q5WhYkzgd1RS0rGqvpX1AkmZMrLv2MW04gSfu0dDwpbsSAu8EUCQW9oA4pr6V7R9CBSu9kdN2iY5SR-hZvEad5nDKPV1F3TMQYv5KpRiS_0XhfV5PcolUJVO_4p3h8d-mo2hh1Sw2fairAKOzvnwJCQ6DFkiY7H1cqwA54","dp":"YTql9AGtvyy158gh7jeXcgmySEbHQzvDFulDr-IXIg8kjHGEbp0rTIs0Z50RA95aC5RFkRjpaBKBfvaySjDm5WIi6GLzntpp6B8l7H6qG1jVO_la4Df2kzjx8LVvY8fhOrKz_hDdHodUeKdCF3RdvWMr00ruLnJhBPJHqoW7cwE","alg":"RS256","dq":"IZA4AngRbEtEtG7kJn6zWVaSmZxfRMXwvgIYvy4-3Qy2AVA0tS3XTPVfMaD8_B2U9CY_CxPVseR-sysHc_12uNBZbycfcOzU84WTjXCMSZ7BysPnGMDtkkLHra-p1L29upz1HVNhh5H9QEswHM98R2LZX2ZAsn4bORLZ1AGqweU","n":"8ZqUp5Cs90XpNn8tJBdUUxdGH4bjqKjFj8lyB3x50RpTuECuwzX1NpVqyFENDiEtMja5fdmJl6SErjnhj6kbhcmfmFibANuG-0WlV5yMysdSbocd75C1JQbiPdpHdXrijmVFMfDnoZTQ-ErNsqqngTNkn5SXBcPenli6Cf9MTSchZuh_qFj_B7Fp3CWKehTiyBcLlNOIjYsXX8WQjZkWKGpQ23AWjZulngWRektLcRWuEKTWaRBtbAr3XAfSmcqTICrebaD3IMWKHDtvzHAt_pt4wnZ06clgeO2Wbc980usnpsF7g8k9p81RcbS4JEZmuuA9NCmOmbyADXwgA9_-Aw"}'
41+
MASKINPORTEN_ISSUER=http://localhost:7070/default
42+
MASKINPORTEN_TOKEN_ENDPOINT=http://localhost:7070/default/token
43+
MASKINPORTEN_JWKS_URI=http://localhost:7070/default/jwks

‎apps/budpro-service/build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ dependencies {
1010
implementation "no.nav.testnav.libs:servlet-core"
1111
implementation "no.nav.testnav.libs:servlet-insecure-security"
1212
implementation "no.nav.testnav.libs:servlet-security"
13+
implementation "no.nav.testnav.libs:testing"
14+
implementation "no.nav.testnav.libs:texas"
1315

1416
implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
1517
implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
1618
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
1719
implementation "org.springframework.boot:spring-boot-starter-security"
1820
implementation "org.springframework.boot:spring-boot-starter-web"
21+
implementation "org.springframework.boot:spring-boot-starter-webflux"
1922

2023
testImplementation "org.testcontainers:junit-jupiter"
2124
}

‎apps/budpro-service/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ spec:
1616
outbound:
1717
rules:
1818
- application: generer-navn-service
19+
- application: dolly-texas-proxy
1920
azure:
2021
application:
2122
allowAllUsers: true

‎apps/budpro-service/settings.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ includeBuild "../../libs/servlet-core"
1414
includeBuild "../../libs/servlet-insecure-security"
1515
includeBuild "../../libs/servlet-security"
1616
includeBuild "../../libs/testing"
17+
includeBuild "../../libs/texas"
1718

1819
develocity {
1920
buildScan {

‎apps/budpro-service/src/main/java/no/nav/dolly/budpro/Consumers.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)
⚡