Merge branch 'master' into feature/dolly-frontend-react-hook-form-mig…

…ration
navikt · Jan 24, 2024 · 7003e43 · 7003e43
2 parents e41d25b + 5811a12
commit 7003e43
Show file tree

Hide file tree

Showing 63 changed files with 2,392 additions and 454 deletions.
diff --git a/.github/workflows/proxy.kodeverk-proxy.yml → ...ub/workflows/app.tenor-search-service.yml b/.github/workflows/proxy.kodeverk-proxy.yml → ...ub/workflows/app.tenor-search-service.yml
@@ -1,21 +1,21 @@
-name: kodeverk-proxy
+name: tenor-search-service
 
 on:
   push:
     paths:
+      - libs/integration-test
       - libs/reactive-core
-      - libs/reactive-proxy
-      - proxies/kodeverk-proxy/**
-      - .github/workflows/proxy.kodeverk-proxy.yml
-      - .github/workflows/common.workflow.backend.yml
+      - libs/reactive-security
+      - libs/security-core
+      - apps/tenor-search-service/**
+      - .github/workflows/app.tenor-search-service.yml
 
 jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
-      cluster: "dev-fss"
-      working-directory: "proxies/kodeverk-proxy"
-      deploy-tag: "#deploy-proxy"
+      working-directory: "apps/tenor-search-service"
+      deploy-tag: "#deploy-tenor-search-service"
     permissions:
       contents: read
       id-token: write

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -54,14 +54,14 @@ spec:
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
   webproxy: true

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -61,9 +61,9 @@ spec:
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java
@@ -34,7 +34,7 @@ public class Consumers {
     private ServerProperties testnavInntektsmeldingService;
     private ServerProperties testnavInntektstubProxy;
     private ServerProperties testnavInstProxy;
-    private ServerProperties testnavKodeverkProxy;
+    private ServerProperties kodeverkApi;
     private ServerProperties testnavKontoregisterPersonProxy;
     private ServerProperties testnavKrrstubProxy;
     private ServerProperties testnavMedlProxy;

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/consumer/kodeverk/KodeverkConsumer.java
@@ -48,7 +48,7 @@ public KodeverkConsumer(
             WebClient.Builder webClientBuilder
     ) {
         this.tokenService = tokenService;
-        serverProperties = consumers.getTestnavKodeverkProxy();
+        serverProperties = consumers.getKodeverkApi();
         this.webClient = webClientBuilder
                 .exchangeStrategies(
                         ExchangeStrategies

diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml
@@ -123,11 +123,11 @@ consumers:
     namespace: dolly
     url: http://testnav-person-service.dolly.svc.cluster.local
     cluster: dev-gcp
-  testnav-kodeverk-proxy:
-    name: testnav-kodeverk-proxy
-    namespace: dolly
-    url: https://testnav-kodeverk-proxy.dev-fss-pub.nais.io
-    cluster: dev-fss
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
+    url: https://kodeverk-api.nav.no
+    cluster: prod-gcp
   testnav-dokarkiv-proxy:
     name: testnav-dokarkiv-proxy
     namespace: dolly

diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -23,11 +23,11 @@ open:
     index: dummy
 
 consumers:
-  testnav-kodeverk-proxy:
-    name: kodeverk-mock
-    namespace: dolly
+  kodeverk-api:
+    name: kodeverk-api
+    namespace: team-rocket
     url: http://localhost:${wiremock.server.port:0}/kodeverk
-    cluster: dev-fss
+    cluster: prod-gcp
   testnav-tps-messaging-service:
     name: tps-messaging-mock
     namespace: dolly

diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
@@ -50,12 +50,12 @@ spec:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
@@ -56,11 +56,11 @@ spec:
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io

diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
@@ -65,8 +65,8 @@ spec:
         - host: testnav-aareg-proxy.dev-fss-pub.nais.io
         - host: testnav-medl-proxy.dev-fss-pub.nais.io
         - host: testnav-histark-proxy.dev-fss-pub.nais.io
-        - host: testnav-kodeverk-proxy.dev-fss-pub.nais.io
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
+        - host: kodeverk-api.nav.no
         - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-inntektstub-proxy.dev-fss-pub.nais.io
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io

diff --git a/apps/tenor-search-service/Dockerfile b/apps/tenor-search-service/Dockerfile
@@ -0,0 +1,6 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+ADD build/libs/app.jar /app/app.jar
+
+EXPOSE 8080
diff --git a/apps/tenor-search-service/README.md b/apps/tenor-search-service/README.md
@@ -0,0 +1,9 @@
+# Tenor Search Service
+
+Service som formidler søk til Tenor testdata hos Skatteetaten.
+
+## Swagger
+
+Swagger finnes
+under [/swagger-ui.html](https://testnav-tenor-search-service.intern.dev.nav.no/swagger-ui.html)
+-endepunktet til applikasjonen.
diff --git a/proxies/kodeverk-proxy/build.gradle → apps/tenor-search-service/build.gradle b/proxies/kodeverk-proxy/build.gradle → apps/tenor-search-service/build.gradle
@@ -23,19 +23,24 @@ sonarqube {
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.language", "java"
-        property "sonar.token", System.getenv("SONAR_TOKEN")
+        property "sonar.login", System.getenv("SONAR_TOKEN")
         property "sonar.organization", "navikt"
         property "sonar.project.monorepo.enabled", true
-        property "sonar.projectKey", "testnav-kodeverk-proxy"
-        property "sonar.projectName", "testnav-kodeverk-proxy"
+        property "sonar.projectKey", "testnav-tenor-search-service"
+        property "sonar.projectName", "testnav-tenor-search-service"
         property "sonar.sourceEncoding", "UTF-8"
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 bootJar {
     archiveFileName = "app.jar"
 }
-
 dependencyManagement {
     applyMavenExclusions = false
     imports {
@@ -49,29 +54,25 @@ repositories {
 }
 
 dependencies {
-
     implementation 'no.nav.testnav.libs:reactive-core'
-    implementation 'no.nav.testnav.libs:reactive-proxy'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
-    implementation 'no.nav.testnav.libs:security-core'
     implementation 'no.nav.testnav.libs:reactive-security'
+    implementation 'no.nav.testnav.libs:security-core'
 
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
-    implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
-
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
-    implementation 'org.hibernate.validator:hibernate-validator'
 
-    annotationProcessor 'org.projectlombok:lombok'
-    implementation 'org.projectlombok:lombok'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-}
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+    testImplementation 'no.nav.testnav.libs:integration-test'
+
+    implementation 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
diff --git a/proxies/kodeverk-proxy/config.yml → apps/tenor-search-service/config.yml b/proxies/kodeverk-proxy/config.yml → apps/tenor-search-service/config.yml
@@ -1,46 +1,38 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: testnav-kodeverk-proxy
+  name: testnav-tenor-search-service
   namespace: dolly
   labels:
     team: dolly
 spec:
   image: "{{image}}"
   port: 8080
-  webproxy: true
-  tokenx:
-    enabled: true
   azure:
     application:
       allowAllUsers: true
       enabled: true
       tenant: nav.no
+  tokenx:
+    enabled: true
+  maskinporten:
+    enabled: true
+    scopes:
+      consumes:
+        - name: "skatteetaten:testnorge/testdata.read"
   accessPolicy:
     inbound:
       rules:
-        - application: team-dolly-lokal-app
-          cluster: dev-gcp
+        - application: testnav-oversikt-frontend
         - application: dolly-frontend
-          cluster: dev-gcp
-        - application: dolly-idporten
-          cluster: dev-gcp
         - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-backend
-          cluster: dev-gcp
-        - application: dolly-backend-dev
-          cluster: dev-gcp
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
+        - application: dolly-idporten
+        - application: team-dolly-lokal-app
         - application: app-1
           namespace: plattformsikkerhet
-          cluster: dev-gcp
     outbound:
-      rules:
-        - application: kodeverk-dev
-          cluster: dev-fss
-          namespace: team-rocket
+      external:
+        - host: testdata.api.skatteetaten.no
   liveness:
     path: /internal/isAlive
     initialDelay: 4
@@ -51,6 +43,9 @@ spec:
     initialDelay: 4
     periodSeconds: 5
     failureThreshold: 500
+  prometheus:
+    enabled: true
+    path: /internal/metrics
   replicas:
     min: 1
     max: 1
@@ -61,4 +56,7 @@ spec:
     limits:
       memory: 2048Mi
   ingresses:
-    - "https://testnav-kodeverk-proxy.dev-fss-pub.nais.io"
+    - "https://testnav-tenor-search-service.intern.dev.nav.no"
+  env:
+    - name: SPRING_PROFILES_ACTIVE
+      value: prod
diff --git a/...k-proxy/gradle/wrapper/gradle-wrapper.jar → ...service/gradle/wrapper/gradle-wrapper.jar b/...k-proxy/gradle/wrapper/gradle-wrapper.jar → ...service/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 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.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ public static void main(String[] args) { @@
             SpringApplication.run(DollyBackendApplicationStarter.class, args);
         }
-    }
+    }