diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml
deleted file mode 100644
index 2642a71caf7..00000000000
--- a/.github/workflows/proxy.kodeverk-proxy.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: kodeverk-proxy
-
-on:
- push:
- paths:
- - libs/reactive-core
- - libs/reactive-proxy
- - proxies/kodeverk-proxy/**
- - .github/workflows/proxy.kodeverk-proxy.yml
- - .github/workflows/common.workflow.backend.yml
-
-jobs:
- workflow:
- uses: ./.github/workflows/common.workflow.backend.yml
- with:
- cluster: "dev-fss"
- working-directory: "proxies/kodeverk-proxy"
- deploy-tag: "#deploy-proxy"
- permissions:
- contents: read
- id-token: write
- secrets:
- NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
- NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
- NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
- SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
index b1baa3ccc63..30007c243aa 100644
--- a/apps/dolly-backend/config.test.yml
+++ b/apps/dolly-backend/config.test.yml
@@ -54,7 +54,6 @@ 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
@@ -62,6 +61,7 @@ spec:
- 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
index c414266f5da..ce82a9671c2 100644
--- 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
index d0743b7b81b..d023e7e2dfd 100644
--- 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);
}
-}
+}
\ No newline at end of file
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
index 8349d700206..c9204dc8cdb 100644
--- 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
index 6b362c5e8f6..81bd759e76f 100644
--- 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
index bbaad422b8f..1079899743c 100644
--- 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
index e12c19a2dc6..56f6041eedb 100644
--- 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
index 7d4df05b969..3d6423e58b6 100644
--- 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
index a6f4acf5e7a..cbbed02f8e2 100644
--- 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
index d222c47c603..c463664db78 100644
--- 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/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
index fb67f5cfb3a..31f1b7a4632 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml
@@ -63,11 +63,11 @@ consumers:
url: https://krr-stub-%s.dev.intern.nav.no/api
synthdata-aareg:
url: http://nais-synthdata-aareg.dolly.svc.nais.local
- kodeverk:
- cluster: dev-fss
- name: testnav-kodeverk-proxy
- namespace: dolly
- url: https://kodeverk.dev.intern.nav.no
+ kodeverk-api:
+ name: kodeverk-api
+ namespace: team-rocket
+ url: https://kodeverk-api.nav.no
+ cluster: prod-gcp
testnav-aareg-proxy:
name: testnav-aareg-proxy
namespace: dolly
diff --git a/proxies/kodeverk-proxy/Dockerfile b/proxies/kodeverk-proxy/Dockerfile
deleted file mode 100644
index 4a36f93546f..00000000000
--- a/proxies/kodeverk-proxy/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM ghcr.io/navikt/baseimages/temurin:21
-LABEL maintainer="Team Dolly"
-
-ENV JAVA_OPTS="-Dspring.profiles.active=prod"
-
-ADD /build/libs/app.jar /app/app.jar
-
-EXPOSE 8080
diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle
deleted file mode 100644
index 37bc27b9239..00000000000
--- a/proxies/kodeverk-proxy/build.gradle
+++ /dev/null
@@ -1,77 +0,0 @@
-plugins {
- id 'java'
- id "org.sonarqube" version "4.4.1.3373"
- id 'org.springframework.boot' version "3.2.1"
- id 'io.spring.dependency-management' version "1.1.4"
- id "jacoco"
-}
-
-test {
- useJUnitPlatform()
-}
-
-jacocoTestReport {
- reports {
- xml.required = true
- }
-}
-
-sonarqube {
- properties {
- property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml"
- property "sonar.dynamicAnalysis", "reuseReports"
- 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.organization", "navikt"
- property "sonar.project.monorepo.enabled", true
- property "sonar.projectKey", "testnav-kodeverk-proxy"
- property "sonar.projectName", "testnav-kodeverk-proxy"
- property "sonar.sourceEncoding", "UTF-8"
- }
-}
-
-bootJar {
- archiveFileName = "app.jar"
-}
-
-dependencyManagement {
- applyMavenExclusions = false
- imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
- }
-}
-
-repositories {
- mavenCentral()
- mavenLocal()
-}
-
-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 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
- implementation 'org.springframework.boot:spring-boot-starter-webflux'
- 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'
-
- testImplementation 'org.springframework.boot:spring-boot-starter-test'
- testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-}
-java {
- toolchain {
- languageVersion = JavaLanguageVersion.of(21)
- }
-}
diff --git a/proxies/kodeverk-proxy/config.yml b/proxies/kodeverk-proxy/config.yml
deleted file mode 100644
index 5e97803ef68..00000000000
--- a/proxies/kodeverk-proxy/config.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
-metadata:
- name: testnav-kodeverk-proxy
- namespace: dolly
- labels:
- team: dolly
-spec:
- image: "{{image}}"
- port: 8080
- webproxy: true
- tokenx:
- enabled: true
- azure:
- application:
- allowAllUsers: true
- enabled: true
- tenant: nav.no
- accessPolicy:
- inbound:
- rules:
- - application: team-dolly-lokal-app
- cluster: dev-gcp
- - 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: app-1
- namespace: plattformsikkerhet
- cluster: dev-gcp
- outbound:
- rules:
- - application: kodeverk-dev
- cluster: dev-fss
- namespace: team-rocket
- liveness:
- path: /internal/isAlive
- initialDelay: 4
- periodSeconds: 5
- failureThreshold: 500
- readiness:
- path: /internal/isReady
- initialDelay: 4
- periodSeconds: 5
- failureThreshold: 500
- replicas:
- min: 1
- max: 1
- resources:
- requests:
- cpu: 200m
- memory: 1024Mi
- limits:
- memory: 2048Mi
- ingresses:
- - "https://testnav-kodeverk-proxy.dev-fss-pub.nais.io"
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index e708b1c023e..00000000000
Binary files a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index a5952066425..00000000000
--- a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/proxies/kodeverk-proxy/gradlew b/proxies/kodeverk-proxy/gradlew
deleted file mode 100755
index 4f906e0c811..00000000000
--- a/proxies/kodeverk-proxy/gradlew
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
- echo "$*"
-}
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=`expr $i + 1`
- done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/proxies/kodeverk-proxy/gradlew.bat b/proxies/kodeverk-proxy/gradlew.bat
deleted file mode 100644
index 107acd32c4e..00000000000
--- a/proxies/kodeverk-proxy/gradlew.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "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.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-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.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/proxies/kodeverk-proxy/settings.gradle b/proxies/kodeverk-proxy/settings.gradle
deleted file mode 100644
index 293dee6938f..00000000000
--- a/proxies/kodeverk-proxy/settings.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-plugins {
- id "com.gradle.enterprise" version "3.12.3"
-}
-
-rootProject.name = 'kodeverk-proxy'
-
-
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-proxy'
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/security-core'
-includeBuild '../../libs/reactive-security'
-
-gradleEnterprise {
- buildScan {
- termsOfServiceUrl = "https://gradle.com/terms-of-service"
- termsOfServiceAgree = "yes"
- }
-}
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java
deleted file mode 100644
index 506a9d32909..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/Consumers.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import no.nav.testnav.libs.securitycore.domain.ServerProperties;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import static lombok.AccessLevel.PACKAGE;
-
-/**
- * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}.
- *
- * Husk at Spring Boot bruker relaxed binding
- * mellom configuration properties og field names.
- *
- * @see ServerProperties
- */
-@Configuration
-@ConfigurationProperties(prefix = "consumers")
-@NoArgsConstructor(access = PACKAGE)
-@Getter
-@Setter(PACKAGE)
-public class Consumers {
-
- private ServerProperties kodeverk;
-}
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java
deleted file mode 100644
index fac642b1d5b..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/KodeverkProxyApplicationStarter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import no.nav.testnav.libs.reactivecore.config.CoreConfig;
-import no.nav.testnav.libs.reactiveproxy.config.DevConfig;
-import no.nav.testnav.libs.reactiveproxy.config.SecurityConfig;
-import no.nav.testnav.libs.reactiveproxy.filter.AddAuthenticationRequestGatewayFilterFactory;
-import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import no.nav.testnav.libs.reactivesecurity.exchange.TokenExchange;
-import no.nav.testnav.libs.securitycore.domain.AccessToken;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.gateway.route.RouteLocator;
-import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-
-@Import({
- CoreConfig.class,
- DevConfig.class,
- SecurityConfig.class,
- SecureOAuth2ServerToServerConfiguration.class
-})
-@SpringBootApplication
-public class KodeverkProxyApplicationStarter {
- @Bean
- public RouteLocator customRouteLocator(
- RouteLocatorBuilder builder,
- TokenExchange tokenExchange,
- Consumers consumers
- ) {
- var addAuthenticationHeaderDevFilter = AddAuthenticationRequestGatewayFilterFactory
- .bearerAuthenticationHeaderFilter(
- () -> tokenExchange
- .exchange(consumers.getKodeverk())
- .map(AccessToken::getTokenValue));
- return builder
- .routes()
- .route(spec -> spec
- .path("/**")
- .filters(filterSpec -> filterSpec.filter(addAuthenticationHeaderDevFilter))
- .uri(consumers.getKodeverk().getUrl())
- )
- .build();
- }
-
- public static void main(String[] args) {
- SpringApplication.run(KodeverkProxyApplicationStarter.class, args);
- }
-}
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java b/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java
deleted file mode 100644
index 1c50d065a73..00000000000
--- a/proxies/kodeverk-proxy/src/main/java/no/nav/testnav/proxies/kodeverkproxy/StatusController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import no.nav.testnav.libs.dto.status.v1.TestnavStatusResponse;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-
-import java.util.Map;
-
-@RestController
-public class StatusController {
- private static final String TEAM = "org";
-
- @GetMapping(value = "/internal/status", produces = MediaType.APPLICATION_JSON_VALUE)
- public Map getStatus() {
- var statusWebClient = WebClient.builder().build();
-
- var pensjonStatus = checkConsumerStatus(
- "http://kodeverk.org.svc.nais.local/internal/isAlive",
- "http://kodeverk.org.svc.nais.local/internal/isReady",
- statusWebClient);
-
- return Map.of(
- "kodeverk", pensjonStatus
- );
- }
-
- public TestnavStatusResponse checkConsumerStatus(String aliveUrl, String readyUrl, WebClient webClient) {
- TestnavStatusResponse status = TestnavStatusResponse.builder().team(TEAM).build();
-
- Thread blockingThread = new Thread(() -> {
- status.setAlive(
- checkStatus(webClient, aliveUrl)
- .blockOptional()
- .orElse("Error: Empty response")
- );
- status.setReady(
- checkStatus(webClient, readyUrl)
- .blockOptional()
- .orElse("Error: Empty response")
- );
- });
- blockingThread.start();
- try {
- blockingThread.join();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
-
- return status;
- }
-
- private Mono checkStatus(WebClient webClient, String url) {
- return webClient.get().uri(url)
- .retrieve()
- .bodyToMono(String.class)
- .defaultIfEmpty("OK")
- .onErrorResume(Exception.class, error -> Mono.just("Error: " + error.getMessage()))
- .doOnSuccess(result -> Mono.just("OK"))
- .map(result -> result.startsWith("Error:") ? result : "OK");
- }
-}
diff --git a/proxies/kodeverk-proxy/src/main/resources/application.yml b/proxies/kodeverk-proxy/src/main/resources/application.yml
deleted file mode 100644
index c4d1207f2a0..00000000000
--- a/proxies/kodeverk-proxy/src/main/resources/application.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
-spring:
- application:
- name: testnav-kodeverk-proxy
- description: Proxy for kodeverk som legger på sikkerhet.
- 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}
- tokenx:
- issuer-uri: ${TOKEN_X_ISSUER}
- jwk-set-uri: ${TOKEN_X_JWKS_URI}
- accepted-audience: ${TOKEN_X_CLIENT_ID}
- cloud:
- gateway:
- httpclient:
- response-timeout: 240s
- vault:
- enabled: false
-
-consumers:
- kodeverk:
- name: kodeverk-dev
- namespace: team-rocket
- url: http://kodeverk.org.svc.nais.local
- cluster: dev-fss
diff --git a/proxies/kodeverk-proxy/src/main/resources/logback-spring.xml b/proxies/kodeverk-proxy/src/main/resources/logback-spring.xml
deleted file mode 100644
index 88192306725..00000000000
--- a/proxies/kodeverk-proxy/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
- true
- 256
- 10280
- 20
- true
- ^sun\.
- ^net\.sf\.cglib\.
- ^java\.lang\.Thread\.
- ^java\.io\.
- java\.util\.concurrent\..*
- org\.apache\.catalina\..*
- org\.apache\.coyote\..*
- org\.apache\.tomcat\..*
-
-
-
-
-
-
-
-
-
-
-
-
- %d{HH:mm:ss.SSS} | %5p | %logger{25} | %m%n
-
- utf8
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java b/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java
deleted file mode 100644
index 9697893ce69..00000000000
--- a/proxies/kodeverk-proxy/src/test/java/no/nav/testnav/proxies/kodeverkproxy/ApplicationContextTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package no.nav.testnav.proxies.kodeverkproxy;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
-import org.springframework.test.context.ActiveProfiles;
-
-@SpringBootTest
-@ActiveProfiles("test")
-class ApplicationContextTest {
-
- @MockBean
- public ReactiveJwtDecoder reactiveJwtDecoder;
-
- @Test
- @SuppressWarnings("java:S2699")
- void load_app_context() {
- }
-}
diff --git a/proxies/kodeverk-proxy/src/test/resources/application-test.properties b/proxies/kodeverk-proxy/src/test/resources/application-test.properties
deleted file mode 100644
index ee0ab3849bc..00000000000
--- a/proxies/kodeverk-proxy/src/test/resources/application-test.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-TOKEN_X_ISSUER=dummy
-proxy.url=http://localhost
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e5ae6d17c37..1a3d42dbd11 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -21,7 +21,6 @@ gradleEnterprise {
}
}
-includeBuild './proxies/kodeverk-proxy'
includeBuild './proxies/udistub-proxy'
includeBuild './proxies/skjermingsregister-proxy'
includeBuild './proxies/batch-adeo-proxy'