Merge branch 'master' into feature/opprett-mal-fra-person

apps/adresse-service/config.yml

@@ -39,31 +39,20 @@ spec:
   accessPolicy:
     inbound:
       rules:
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
+        - application: dolly-frontend
+        - application: dolly-frontend-dev
+        - application: dolly-frontend-dev-unstable
+        - application: dolly-idporten
         - application: team-dolly-lokal-app
-          cluster: dev-gcp
+        - application: testnav-endringsmelding-service
         - application: testnav-organisasjon-forvalter
-          cluster: dev-gcp
+        - application: testnav-oversikt-frontend
         - application: testnav-pdl-forvalter
-          cluster: dev-gcp
         - application: testnav-pdl-forvalter-dev
-          cluster: dev-gcp
-        - application: tps-forvalteren-dev
-          cluster: dev-fss
         - application: tps-forvalteren
           cluster: dev-fss
-        - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-frontend
-          cluster: dev-gcp
-        - application: dolly-idporten
-          cluster: dev-gcp
-        - application: app-1
-          namespace: plattformsikkerhet
-          cluster: dev-gcp
-        - application: testnav-endringsmelding-service
-          cluster: dev-gcp
+        - application: tps-forvalteren-dev
+          cluster: dev-fss
     outbound:
       external:
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io

apps/amelding-service/config.yml

@@ -11,23 +11,13 @@ spec:
   accessPolicy:
     inbound:
       rules:
-        - application: team-dolly-lokal-app
-          cluster: dev-gcp
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
-        - application: dolly-backend-dev
-          cluster: dev-gcp
         - application: dolly-backend
-          cluster: dev-gcp
-        - application: dolly-frontend-dev
-          cluster: dev-gcp
+        - application: dolly-backend-dev
         - application: dolly-frontend
-          cluster: dev-gcp
+        - application: dolly-frontend-dev
         - application: dolly-idporten
-          cluster: dev-gcp
-        - application: app-1
-          namespace: plattformsikkerhet
-          cluster: dev-gcp
+        - application: team-dolly-lokal-app
+        - application: testnav-oversikt-frontend
     outbound:
       rules:
         - application: testnav-oppsummeringsdokument-service

apps/app-tilgang-analyse-service/config.yml

@@ -19,12 +19,7 @@ spec:
     inbound:
       rules:
         - application: team-dolly-lokal-app
-          cluster: dev-gcp
         - application: testnav-oversikt-frontend
-          cluster: dev-gcp
-        - application: app-1
-          cluster: dev-gcp
-          namespace: plattformsikkerhet
     outbound:
       external:
         - host: api.github.com

apps/batch-bestilling-service/config.yml

@@ -15,12 +15,11 @@ spec:
     inbound:
       rules:
         - application: team-dolly-lokal-app
-          cluster: dev-gcp
         - application: testnav-oversikt-frontend
-          cluster: dev-gcp
     outbound:
       rules:
         - application: dolly-backend
+        - application: dolly-backend-dev
   azure:
     application:
       allowAllUsers: true

apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/DevConfig.java

@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.lang.NonNull;
 import org.springframework.vault.annotation.VaultPropertySource;
 import org.springframework.vault.authentication.ClientAuthentication;
 import org.springframework.vault.authentication.TokenAuthentication;
@@ -13,17 +14,18 @@
 @Configuration
 @Profile("dev")
 @VaultPropertySource(value = "secret/dolly/lokal", ignoreSecretNotFound = false)
-@VaultPropertySource(value = "secret/.common/tokenx/dev/app-1", ignoreSecretNotFound = false)
 public class DevConfig extends AbstractVaultConfiguration {
 
-       private static final String VAULT_TOKEN = "spring.cloud.vault.token";
+    private static final String VAULT_TOKEN = "spring.cloud.vault.token";
 
     @Override
+    @NonNull
     public VaultEndpoint vaultEndpoint() {
         return VaultEndpoint.create("vault.adeo.no", 443);
     }
 
     @Override
+    @NonNull
     public ClientAuthentication clientAuthentication() {
         if (System.getenv().containsKey("VAULT_TOKEN")) {
             System.setProperty(VAULT_TOKEN, System.getenv("VAULT_TOKEN"));

apps/bruker-service/config.test.yml

@@ -20,19 +20,11 @@ spec:
   accessPolicy:
     inbound:
       rules:
-        - application: team-dolly-lokal-app
-          cluster: dev-gcp
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
         - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-idporten
-          cluster: dev-gcp
         - application: dolly-frontend-dev-unstable
-          cluster: dev-gcp
-        - application: app-1
-          namespace: plattformsikkerhet
-          cluster: dev-gcp
+        - application: dolly-idporten
+        - application: team-dolly-lokal-app
+        - application: testnav-oversikt-frontend
     outbound:
       rules:
         - application: testnav-person-organisasjon-tilgang-service-dev

apps/dolly-backend/config.test.yml

@@ -16,23 +16,16 @@ spec:
   accessPolicy:
     inbound:
       rules:
-        - application: testnav-oversikt-frontend
-          cluster: dev-gcp
         - application: dolly-frontend-dev
-          cluster: dev-gcp
-        - application: dolly-idporten
-          cluster: dev-gcp
         - application: dolly-frontend-dev-unstable
-          cluster: dev-gcp
-        - application: testnav-batch-bestilling-service
-          cluster: dev-gcp
+        - application: dolly-idporten
         - application: team-dolly-lokal-app
-          cluster: dev-gcp
-        - application: app-1
-          namespace: plattformsikkerhet
-          cluster: dev-gcp
+        - application: testnav-batch-bestilling-service
+        - application: testnav-dollystatus
+        - application: testnav-oversikt-frontend
     outbound:
       rules:
+        - application: generer-navn-service
         - application: testnav-amelding-service
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy

apps/dolly-backend/config.yml

@@ -16,30 +16,18 @@ spec:
     inbound:
       rules:
         - application: dolly-frontend
-          cluster: dev-gcp
         - application: dolly-idporten
-          cluster: dev-gcp
+        - application: testnav-batch-bestilling-service
         - application: testnav-dollystatus
-          cluster: dev-gcp
+        - application: testnav-helsepersonell-service
         - application: testnav-oversikt-frontend
-          cluster: dev-gcp
-        - application: testnav-batch-bestilling-service
-          cluster: dev-gcp
         - application: etterlatte-testdata
-          cluster: dev-gcp
           namespace: etterlatte
-        - application: devtools
-          cluster: dev-gcp
-          namespace: aap
-        - application: bot
-          cluster: dev-gcp
-          namespace: aap
-        - application: testnav-helsepersonell-service
-          cluster: dev-gcp
         - application: statuspoll
           namespace: navdig
     outbound:
       rules:
+        - application: generer-navn-service
         - application: testnav-amelding-service
         - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
@@ -50,6 +38,7 @@ spec:
         - application: testnav-organisasjon-service
         - application: testnav-pdl-forvalter
         - application: testnav-person-service
+        - application: testnav-skattekort-service
         - application: testnav-sykemelding-api
         - application: testnav-synt-sykemelding-api
         - application: testnav-tps-messaging-service

apps/dolly-frontend/config.idporten.yml

@@ -24,29 +24,38 @@ spec:
   accessPolicy:
     outbound:
       rules:
-        - application: testnorge-tilbakemelding-api
+        - application: dolly-backend
+        - application: dolly-backend-dev
+        - application: dolly-redis-session
+        - application: generer-navn-service
         - application: testnav-adresse-service
+        - application: testnav-amelding-service
         - application: testnav-arbeidsplassencv-proxy
+        - application: testnav-bruker-service
+        - application: testnav-bruker-service-dev
+        - application: testnav-generer-synt-amelding-service
+        - application: testnav-helsepersonell-service
+        - application: testnav-joark-dokument-service
+        - application: testnav-kodeverk-service
         - application: testnav-miljoer-service
-        - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-forvalter
         - application: testnav-oppsummeringsdokument-service
-        - application: testnorge-profil-api
-        - application: testnav-organisasjon-tilgang-service
-        - application: testnav-joark-dokument-service
         - application: testnav-organisasjon-faste-data-service
-        - application: testnav-tps-messaging-service
-        - application: testnav-varslinger-service
-        - application: dolly-redis-session
-        - application: testnav-person-organisasjon-tilgang-service
+        - application: testnav-organisasjon-forvalter
+        - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter
-        - application: testnav-bruker-service
+        - application: testnav-person-faste-data-service
+        - application: testnav-person-organisasjon-tilgang-service
+        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
-        - application: testnav-helsepersonell-service
-        - application: dolly-backend
         - application: testnav-person-service
-        - application: generer-navn-service
-        - application: testnav-kodeverk-service
+        - application: testnav-skattekort-service
+        - application: testnav-sykemelding-api
+        - application: testnav-tenor-search-service
+        - application: testnav-tps-messaging-service
+        - application: testnav-varslinger-service
+        - application: testnorge-profil-api
+        - application: testnorge-tilbakemelding-api
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io

apps/dolly-frontend/config.test.yml

@@ -18,6 +18,7 @@ spec:
       autoLoginIgnorePaths:
         - /login
         - /assets/*
+        - /
     application:
       allowAllUsers: true
       enabled: true
@@ -29,29 +30,35 @@ spec:
   accessPolicy:
     outbound:
       rules:
+        - application: dolly-backend-dev
+        - application: dolly-dev-redis-session
+        - application: generer-navn-service
         - application: testnav-adresse-service
+        - application: testnav-amelding-service
         - application: testnav-arbeidsplassencv-proxy
+        - application: testnav-bruker-service-dev
+        - application: testnav-generer-synt-amelding-service
+        - application: testnav-helsepersonell-service
+        - application: testnav-joark-dokument-service
+        - application: testnav-kodeverk-service
         - application: testnav-miljoer-service
-        - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-forvalter
-        - application: testnorge-profil-api-dev
-        - application: testnav-organisasjon-tilgang-service
         - application: testnav-oppsummeringsdokument-service
-        - application: testnav-joark-dokument-service
         - application: testnav-organisasjon-faste-data-service
-        - application: testnav-tps-messaging-service
-        - application: testnav-varslinger-service-dev
-        - application: dolly-dev-redis-session
-        - application: testnav-person-organisasjon-tilgang-service-dev
+        - application: testnav-organisasjon-forvalter
+        - application: testnav-organisasjon-service
+        - application: testnav-organisasjon-tilgang-service
         - application: testnav-pdl-forvalter-dev
-        - application: testnav-bruker-service-dev
+        - application: testnav-person-faste-data-service
+        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: testnav-person-search-service
-        - application: testnav-helsepersonell-service
-        - application: testnorge-tilbakemelding-api
-        - application: dolly-backend-dev
         - application: testnav-person-service
-        - application: generer-navn-service
-        - application: testnav-kodeverk-service
+        - application: testnav-sykemelding-api
+        - application: testnav-tenor-search-service
+        - application: testnav-tps-messaging-service
+        - application: testnav-varslinger-service
+        - application: testnav-varslinger-service-dev
+        - application: testnorge-profil-api-dev
+        - application: testnorge-tilbakemelding-api
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io

apps/dolly-frontend/config.unstable.yml

@@ -18,6 +18,7 @@ spec:
       autoLoginIgnorePaths:
         - /login
         - /assets/*
+        - /
     application:
       allowAllUsers: true
       enabled: true
@@ -29,29 +30,30 @@ spec:
   accessPolicy:
     outbound:
       rules:
-        - application: testnav-arbeidsplassencv-proxy
-        - application: generer-navn-service
-        - application: testnav-person-service
         - application: dolly-backend-dev
-        - application: testnav-helsepersonell-service
-        - application: testnav-person-search-service
-        - application: testnav-bruker-service-dev
-        - application: testnav-pdl-forvalter-dev
-        - application: testnav-person-organisasjon-tilgang-service-dev
         - application: dolly-dev-redis-session
-        - application: testnav-varslinger-service-dev
-        - application: testnav-tps-messaging-service
-        - application: testnav-organisasjon-faste-data-service
+        - application: generer-navn-service
+        - application: testnav-adresse-service
+        - application: testnav-arbeidsplassencv-proxy
+        - application: testnav-bruker-service-dev
+        - application: testnav-helsepersonell-service
         - application: testnav-joark-dokument-service
+        - application: testnav-kodeverk-service
+        - application: testnav-miljoer-service
         - application: testnav-oppsummeringsdokument-service
-        - application: testnav-organisasjon-tilgang-service
-        - application: testnorge-profil-api-dev
+        - application: testnav-organisasjon-faste-data-service
         - application: testnav-organisasjon-forvalter
         - application: testnav-organisasjon-service
-        - application: testnav-miljoer-service
-        - application: testnav-adresse-service
+        - application: testnav-organisasjon-tilgang-service
+        - application: testnav-pdl-forvalter-dev
+        - application: testnav-person-organisasjon-tilgang-service-dev
+        - application: testnav-person-search-service
+        - application: testnav-person-service
+        - application: testnav-tenor-search-service
+        - application: testnav-tps-messaging-service
+        - application: testnav-varslinger-service-dev
+        - application: testnorge-profil-api-dev
         - application: testnorge-tilbakemelding-api
-        - application: testnav-kodeverk-service
       external:
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io