Java 21 + fjerner deploy til q1 (#906)

* Java 21 * fjerner deploy til q1 * azure mot kodeverk
navikt · Nov 30, 2023 · d35ad27 · d35ad27
1 parent 3f8e30c
commit d35ad27
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 154 deletions.
diff --git a/.github/workflows/deploy-preprod-q1.yml b/.github/workflows/deploy-preprod-q1.yml
diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
@@ -20,7 +20,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven

diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -22,7 +22,7 @@ jobs:
           if ! [[ $(git branch -r --contains "$commit" | grep -E '(^|\s)origin/main') ]]; then exit 1; fi
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Bygg med maven

diff --git a/.github/workflows/integrasjonsTest.yml b/.github/workflows/integrasjonsTest.yml
@@ -13,7 +13,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17-appdynamics
+FROM ghcr.io/navikt/baseimages/temurin:21-appdynamics
 
 ENV APPD_ENABLED=true
 ENV APP_NAME=familie-integrasjoner

diff --git a/app-preprod.teamfamilie.q1.yaml b/app-preprod.teamfamilie.q1.yaml
diff --git a/app-preprod.teamfamilie.yaml b/app-preprod.teamfamilie.yaml
@@ -28,6 +28,7 @@ spec:
     enabled: true
   azure:
     application:
+      tenant: "trygdeetaten.no"
       enabled: true
       claims:
         groups:

diff --git a/pom.xml b/pom.xml
@@ -19,12 +19,12 @@
         <revision>1</revision>
         <sha1></sha1>
         <changelist>-SNAPSHOT</changelist>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <kotlin.version>1.9.20</kotlin.version>
         <springdoc.version>2.2.0</springdoc.version>
-        <felles.version>2.20231023162434_fa320ce</felles.version>
+        <felles.version>2.20231123085409_33fb768</felles.version>
         <kontrakt.version>3.0_20231114145122_eb1ce78</kontrakt.version>
-        <token-validation-spring.version>3.1.3</token-validation-spring.version>
+        <token-validation-spring.version>3.1.5</token-validation-spring.version>
 
         <mock-server.version>5.15.0</mock-server.version>
 

diff --git a/src/main/java/no/nav/familie/integrasjoner/client/rest/KodeverkClient.kt b/src/main/java/no/nav/familie/integrasjoner/client/rest/KodeverkClient.kt
@@ -12,7 +12,7 @@ import java.net.URI
 @Component
 class KodeverkClient(
     @Value("\${KODEVERK_URL}") private val kodeverkUri: URI,
-    @Qualifier("sts") private val restTemplate: RestOperations,
+    @Qualifier("jwtBearer") private val restTemplate: RestOperations,
 ) :
     AbstractPingableRestClient(restTemplate, "kodeverk") {
 

diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml
@@ -77,6 +77,15 @@ no.nav.security.jwt:
           client-id: ${AZURE_APP_CLIENT_ID}
           client-secret: ${AZURE_APP_CLIENT_SECRET}
           client-auth-method: client_secret_basic
+      kodeverk:
+        resource-url: ${KODEVERK_URL}
+        token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
+        grant-type: client_credentials
+        scope: ${KODEVERK_SCOPE}
+        authentication:
+          client-id: ${AZURE_APP_CLIENT_ID}
+          client-secret: ${AZURE_APP_CLIENT_SECRET}
+          client-auth-method: client_secret_basic
       medl2:
         resource-url: ${MEDL2_URL}
         token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
@@ -136,7 +145,7 @@ ORGANISASJON_URL: #Denne er ikke i bruk da OrganisasjonV5 mockes ut lokalt
 DOKARKIV_V1_URL: http://localhost:18321
 DOKDIST_URL: http://localhost:18321
 EGEN_ANSATT_URL: #Mockes ut lokalt
-KODEVERK_URL: #Mockes lokalt
+KODEVERK_URL: #Mockes ut lokalt
 FORSTESIDEGENERATOR_URL: #Mockes lokal
 AAREG_URL: #Mockes lokalt
 SKYGGE_SAK_URL: #Mocker lokalt

diff --git a/src/main/resources/application-integrasjonstest.yaml b/src/main/resources/application-integrasjonstest.yaml
@@ -77,6 +77,15 @@ no.nav.security.jwt:
           client-id: ${AZURE_APP_CLIENT_ID}
           client-secret: ${AZURE_APP_CLIENT_SECRET}
           client-auth-method: client_secret_basic
+      kodeverk:
+        resource-url: ${KODEVERK_URL}
+        token-endpoint-url: https://#.microsoftonline.com/navq.onmicrosoft.com/oauth2/v2.0/token
+        grant-type: client_credentials
+        scope: ${KODEVERK_SCOPE}
+        authentication:
+          client-id: ${AZURE_APP_CLIENT_ID}
+          client-secret: ${AZURE_APP_CLIENT_SECRET}
+          client-auth-method: client_secret_basic
       medl2:
         resource-url: ${MEDL2_URL}
         token-endpoint-url: https://#.microsoftonline.com/navq.onmicrosoft.com/oauth2/v2.0/token
@@ -143,7 +152,7 @@ DOKDIST_URL: http://localhost:18321
 DOKDISTKANAL_URL: http://localhost:18321
 INFOTRYGD_URL: http://localhost:18321
 EGEN_ANSATT_URL: #Mockes ut lokalt
-KODEVERK_URL: #Mockes lokalt
+KODEVERK_URL: http://kodeverk.team-rocket
 FORSTESIDEGENERATOR_URL: #Mockes lokalt
 AAREG_URL: #Mockes lokalt
 SKYGGE_SAK_URL: #Mocker lokalt

diff --git a/src/main/resources/application-preprod.yaml b/src/main/resources/application-preprod.yaml
@@ -78,6 +78,15 @@ no.nav.security.jwt:
           client-id: ${AZURE_APP_CLIENT_ID}
           client-secret: ${AZURE_APP_CLIENT_SECRET}
           client-auth-method: client_secret_basic
+      kodeverk:
+        resource-url: ${KODEVERK_URL}
+        token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
+        grant-type: client_credentials
+        scope: ${KODEVERK_SCOPE}
+        authentication:
+          client-id: ${AZURE_APP_CLIENT_ID}
+          client-secret: ${AZURE_APP_CLIENT_SECRET}
+          client-auth-method: client_secret_basic
       medl2:
         resource-url: ${MEDL2_URL}
         token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
@@ -135,6 +144,7 @@ tilgang:
 INTEGRASJONER_CLIENT_ID: ${AZURE_APP_CLIENT_ID}
 CLIENT_SECRET: ${AZURE_APP_CLIENT_SECRET}
 INFOTRYGD_KS_SCOPE: ${INFOTRYGD_KS_SCOPE}
+KODEVERK_SCOPE: api://dev-fss.team-rocket.kodeverk/.default
 DOKARKIV_SCOPE: api://dev-fss.teamdokumenthandtering.dokarkiv/.default
 PDL_SCOPE: api://dev-fss.pdl.pdl-api/.default
 DOKDISTKANAL_SCOPE: api://dev-fss.teamdokumenthandtering.dokdistkanal/.default
@@ -145,6 +155,7 @@ DOKARKIV_V1_URL: https://dokarkiv-q2.dev.intern.nav.no
 MEDL2_URL: https://medlemskap-medl-api.dev.intern.nav.no
 SAF_URL: https://saf-q2.dev.intern.nav.no
 OPPGAVE_URL: https://oppgave.dev.adeo.no
+KODEVERK_URL: http://kodeverk.team-rocket
 FORSTESIDEGENERATOR_URL: https://foerstesidegenerator-q2.dev.intern.nav.no
 EGEN_ANSATT_URL: https://skjermede-personer-pip.nais.preprod.local
 DOKDIST_URL: https://dokdistfordeling-q2.dev.intern.nav.no

diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml
@@ -78,6 +78,15 @@ no.nav.security.jwt:
           client-id: ${AZURE_APP_CLIENT_ID}
           client-secret: ${AZURE_APP_CLIENT_SECRET}
           client-auth-method: client_secret_basic
+      kodeverk:
+        resource-url: ${KODEVERK_URL}
+        token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
+        grant-type: client_credentials
+        scope: ${KODEVERK_SCOPE}
+        authentication:
+          client-id: ${AZURE_APP_CLIENT_ID}
+          client-secret: ${AZURE_APP_CLIENT_SECRET}
+          client-auth-method: client_secret_basic
       medl2:
         resource-url: ${MEDL2_URL}
         token-endpoint-url: ${AZURE_OPENID_CONFIG_TOKEN_ENDPOINT}
@@ -127,6 +136,7 @@ no.nav.security.jwt:
 INTEGRASJONER_CLIENT_ID: ${AZURE_APP_CLIENT_ID}
 CLIENT_SECRET: ${AZURE_APP_CLIENT_SECRET}
 INFOTRYGD_KS_SCOPE: ${INFOTRYGD_KS_SCOPE}
+KODEVERK_SCOPE: api://prod-fss.team-rocket.kodeverk/.default
 DOKARKIV_SCOPE: api://prod-fss.teamdokumenthandtering.dokarkiv/.default
 PDL_SCOPE: api://prod-fss.pdl.pdl-api/.default
 DOKDISTKANAL_SCOPE: api://prod-fss.teamdokumenthandtering.dokdistkanal/.default
@@ -138,6 +148,7 @@ DOKARKIV_V1_URL: https://dokarkiv.intern.nav.no
 SAF_URL: https://saf.intern.nav.no
 FORSTESIDEGENERATOR_URL: https://foerstesidegenerator.intern.nav.no
 EGEN_ANSATT_URL: https://skjermede-personer-pip.nais.adeo.no
+KODEVERK_URL: http://kodeverk.team-rocket
 DOKDIST_URL: https://dokdistfordeling.intern.nav.no
 DOKDISTKANAL_URL: https://dokdistkanal.intern.nav.no
 AAREG_URL: https://aareg-services.intern.nav.no/api

diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -52,6 +52,7 @@ management:
 AZURE_APP_CLIENT_ID: "dummy-klient-id"
 AZURE_APP_CLIENT_SECRET: "dummy-klient-secret"
 INFOTRYGD_KS_SCOPE: "dummy-scope"
+KODEVERK_SCOPE: "dummy-scope"
 SAF_SCOPE: "dummy-scope"
 OPPGAVE_SCOPE: "dummy-scope"
 DOKARKIV_SCOPE: "dummy-scope"

diff --git a/src/test/java/no/nav/familie/integrasjoner/kodeverk/KodeverkControllerTest.kt b/src/test/java/no/nav/familie/integrasjoner/kodeverk/KodeverkControllerTest.kt
@@ -21,7 +21,7 @@ import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.context.TestPropertySource
 import java.time.LocalDate
 
-@ActiveProfiles("integrasjonstest", "mock-sts")
+@ActiveProfiles("integrasjonstest", "mock-oauth")
 @TestPropertySource(properties = ["KODEVERK_URL=http://localhost:28085"])
 @AutoConfigureWireMock(port = 28085)
 class KodeverkControllerTest : OppslagSpringRunnerTest() {