Går mot oms-infot i gcp (#472)

* Går mot oms-infot i prod-gcp, java 21 + gradle bump

* Java 21 all teh places

Author: albrektsson

.github/workflows/pull-request.yaml

@@ -15,4 +15,4 @@ jobs:
       contents: read
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21

.github/workflows/test-build-deploy.yaml

@@ -19,7 +19,7 @@ jobs:
       pull-requests: read
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21
 
   codeql:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-codeql.yml@main
@@ -30,7 +30,7 @@ jobs:
       security-events: write
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21
       package-command: './gradlew clean build -x test'
       branch: master
 
@@ -40,7 +40,7 @@ jobs:
       contents: read
     secrets: inherit
     with:
-      readertoken: false
+      javaversion: 21
 
   build:
     uses: navikt/sif-gha-workflows/.github/workflows/gradle-build.yml@main
@@ -50,8 +50,7 @@ jobs:
     secrets: inherit
     with:
       team: omsorgspenger
-      dockercontext: .
-      readertoken: false
+      javaversion: 21
 
   trivy:
     needs: [ build ]

Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/java17-debian11:latest
+FROM gcr.io/distroless/java21-debian12:latest
 LABEL org.opencontainers.image.source=https://github.com/navikt/omsorgspenger-rammemeldinger
 
 COPY build/libs/app.jar /app/app.jar

build.gradle.kts

@@ -31,7 +31,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
 
@@ -110,7 +110,7 @@ tasks {
     }
 
     withType<Wrapper> {
-        gradleVersion = "8.5"
+        gradleVersion = "8.6"
     }
 
     withType<JacocoReport> {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

nais/dev-gcp.json

@@ -3,9 +3,6 @@
   "ingresses": [
     "https://omsorgspenger-rammemeldinger.intern.dev.nav.no"
   ],
-  "externalHosts": [
-    "omsorgspenger-infotrygd-rammevedtak.dev-fss-pub.nais.io"
-  ],
   "azureTenant": "trygdeetaten.no",
   "kafkaPool": "nav-dev",
   "clusterFss": "dev-fss",
@@ -15,8 +12,7 @@
     "highAvailability": "false"
   },
   "env": {
-    "HENT_RAMMEVEDTAK_FRA_INFOTRYGD_SCOPES": "6e6bc617-20d4-4a1a-bbca-bb0b46f59b0d/.default",
-    "OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_BASE_URL": "https://omsorgspenger-infotrygd-rammevedtak.dev-fss-pub.nais.io",
+    "OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_SCOPES": "api://dev-gcp.omsorgspenger.omsorgspenger-infotrygd-rammevedtak/.default",
     "TILGANGSSTYRING_SCOPES": "api://dev-gcp.omsorgspenger.omsorgspenger-tilgangsstyring/.default"
   }
 }

nais/naiserator.yaml

@@ -18,10 +18,7 @@ spec:
     outbound:
       rules:
         - application: omsorgspenger-tilgangsstyring
-      external:
-      {{#each externalHosts as |host|}}
-        - host: {{host}}
-      {{/each}}
+        - application: omsorgspenger-infotrygd-rammevedtak
     inbound:
       rules:
         - application: omsorgsdager
@@ -77,6 +74,8 @@ spec:
   {{/each}}
     - name: TILGANGSSTYRING_URL
       value: http://omsorgspenger-tilgangsstyring.omsorgspenger.svc.cluster.local
+    - name: OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_BASE_URL
+      value: http://omsorgspenger-infotrygd-rammevedtak.omsorgspenger.svc.cluster.local
     - name: KAFKA_RAPID_TOPIC
       value: omsorgspenger.k9-rapid-v2
     - name: KAFKA_CONSUMER_GROUP_ID

nais/prod-gcp.json

@@ -3,9 +3,6 @@
   "ingresses": [
     "https://omsorgspenger-rammemeldinger.intern.nav.no"
   ],
-  "externalHosts": [
-    "omsorgspenger-infotrygd-rammevedtak.prod-fss-pub.nais.io"
-  ],
   "azureTenant": "nav.no",
   "kafkaPool": "nav-prod",
   "clusterFss": "prod-fss",
@@ -15,8 +12,7 @@
     "highAvailability": "true"
   },
   "env": {
-    "HENT_RAMMEVEDTAK_FRA_INFOTRYGD_SCOPES": "eadadb81-a814-4402-b820-a3fab240f8ee/.default",
-    "OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_BASE_URL": "https://omsorgspenger-infotrygd-rammevedtak.prod-fss-pub.nais.io",
+    "OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_SCOPES": "api://prod-gcp.omsorgspenger.omsorgspenger-infotrygd-rammevedtak/.default",
     "TILGANGSSTYRING_SCOPES": "api://prod-gcp.omsorgspenger.omsorgspenger-tilgangsstyring/.default"
   }
 }

src/main/kotlin/no/nav/omsorgspenger/ApplicationContext.kt

@@ -96,7 +96,7 @@ internal class ApplicationContext(
             val benyttetOmsorgspengerInfotrygdRammevedtakGateway =
                 omsorgspengerInfotrygdRammevedtakGateway ?: OmsorgspengerInfotrygdRammevedtakGateway(
                     accessTokenClient = benyttetAccessTokenClient,
-                    hentRammevedtakFraInfotrygdScopes = benyttetEnv.hentRequiredEnv("HENT_RAMMEVEDTAK_FRA_INFOTRYGD_SCOPES")
+                    hentRammevedtakFraInfotrygdScopes = benyttetEnv.hentRequiredEnv("OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_SCOPES")
                         .csvTilSet(),
                     omsorgspengerInfotrygdRammevedtakBaseUrl = URI(benyttetEnv.hentRequiredEnv("OMSORGSPENGER_INFOTRYGD_RAMMEVEDTAK_BASE_URL"))
                 )