Skip to content

Commit 4a5621f

Browse files
rfc3092rfc3092
committed
Merge branch 'master' into change/opensearch_config_cleanup
2 parents 0df8b95 + 40028ab commit 4a5621f

File tree

35 files changed

+708
-74
lines changed

35 files changed

+708
-74
lines changed

‎.github/workflows/proxy.altinn3-tilgang-proxy.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: altinn3-tilgang-proxy
2+
3+
on:
4+
push:
5+
paths:
6+
- "plugins/**"
7+
- "libs/reactive-core/**"
8+
- "libs/reactive-proxy/**"
9+
- "libs/security-core/**"
10+
- "libs/servlet-insecure-security/**"
11+
- "proxies/altinn3-tilgang-proxy/**"
12+
- ".github/workflows/proxy.altinn3-tilgang-proxy.yml"
13+
14+
jobs:
15+
workflow:
16+
uses: ./.github/workflows/common.workflow.backend.yml
17+
with:
18+
working-directory: "proxies/altinn3-tilgang-proxy"
19+
deploy-tag: "#deploy-proxy-altinn3-tilgang"
20+
permissions:
21+
contents: read
22+
id-token: write
23+
secrets: inherit

‎apps/altinn3-tilgang-service/build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ sonarqube {
1010
}
1111

1212
dependencies {
13-
implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"
14-
1513
implementation "no.nav.testnav.libs:reactive-core"
1614
implementation "no.nav.testnav.libs:reactive-security"
17-
implementation "no.nav.testnav.libs:vault"
1815

1916
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
2017
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
@@ -28,7 +25,6 @@ dependencies {
2825

2926
implementation "ma.glasnost.orika:orika-core:$versions.orika"
3027

31-
implementation "io.micrometer:micrometer-registry-prometheus"
3228
implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
3329
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
3430

‎apps/altinn3-tilgang-service/config.prod.yml

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ spec:
3838
cluster: dev-gcp
3939
- application: testnav-oversikt-frontend
4040
cluster: dev-gcp
41+
- application: testnav-altinn3-tilgang-proxy
42+
cluster: dev-gcp
4143
outbound:
4244
external:
4345
- host: platform.altinn.no

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/config/LocalVaultConfig.java

-10
This file was deleted.

‎apps/altinn3-tilgang-service/src/main/resources/application-local.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
TOKEN_X_ISSUER: dummy
2-
31
ALTINN_URL: https://tt02.altinn.no
4-
2+
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
3+
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
54
MASKINPORTEN_CLIENT_ID: dummy
65
MASKINPORTEN_CLIENT_JWK: dummy
76
MASKINPORTEN_SCOPES: dummy
87
MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
8+
TOKEN_X_ISSUER: dummy
99

1010
spring:
1111
cache:

‎apps/altinn3-tilgang-service/src/main/resources/application.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,21 @@ spring:
44
application:
55
version: application.version.todo
66
name: testnav-altinn3-tilgang-service
7-
desciption: Tjeneste for å hente og sette tilganger for orgnisasjoner
7+
description: Tjeneste for å hente og sette tilganger for orgnisasjoner
88
security:
99
oauth2:
1010
resourceserver:
1111
aad:
1212
issuer-uri: ${AAD_ISSUER_URI}/v2.0
1313
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
14-
accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
14+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
1515
tokenx:
1616
issuer-uri: ${TOKEN_X_ISSUER}
1717
jwk-set-uri: ${TOKEN_X_JWKS_URI}
1818
accepted-audience: ${TOKEN_X_CLIENT_ID}
1919
jackson:
2020
serialization:
2121
write_dates_as_timestamps: false
22-
cloud:
23-
vault:
24-
enabled: false
2522

2623
springdoc:
2724
swagger-ui:

‎apps/dolly-frontend/config.idporten.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ spec:
5757
- application: testnorge-profil-api
5858
- application: testnorge-tilbakemelding-api
5959
- application: testnav-yrkesskade-proxy
60-
- application: testnav-altinn3-tilgang-service-prod
61-
cluster: prod-gcp
60+
- application: testnav-altinn3-tilgang-proxy
6261
external:
6362
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
6463
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -75,7 +74,6 @@ spec:
7574
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
7675
- host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
7776
- host: idporten.no
78-
- host: testnav-altinn3-tilgang-service.nav.no
7977

8078
liveness:
8179
path: /internal/isAlive

‎apps/dolly-frontend/config.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ spec:
6767
- application: testnav-levende-arbeidsforhold-ansettelse
6868
- application: testnav-levende-arbeidsforhold-scheduler
6969
- application: testnav-yrkesskade-proxy
70-
- application: testnav-altinn3-tilgang-service-prod
71-
cluster: prod-gcp
70+
- application: testnav-altinn3-tilgang-proxy
7271
external:
7372
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
7473
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
@@ -84,7 +83,6 @@ spec:
8483
- host: testnav-norg2-proxy.dev-fss-pub.nais.io
8584
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
8685
- host: testnav-dokarkiv-proxy.dev-fss-pub.nais.io
87-
- host: testnav-altinn3-tilgang-service.nav.no
8886
liveness:
8987
path: /internal/isAlive
9088
initialDelay: 20

‎apps/dolly-frontend/src/main/resources/application.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ spring:
2626

2727
consumers:
2828
testnav-altinn3-tilgang-service:
29-
cluster: prod-gcp
29+
cluster: dev-gcp
3030
namespace: dolly
31-
name: testnav-altinn3-tilgang-service-prod
32-
url: https://testnav-altinn3-tilgang-service.nav.no
31+
name: testnav-altinn3-tilgang-proxy
32+
url: http://testnav-altinn3-tilgang-proxy.dolly.svc.cluster.local
3333
testnav-tps-messaging-service:
3434
cluster: dev-gcp
3535
namespace: dolly

‎apps/kodeverk-service/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spec:
2222
- application: testnav-pdl-forvalter
2323
- application: testnav-pdl-forvalter-dev
2424
- application: testnav-levende-arbeidsforhold-ansettelse
25+
- application: testnorge-statisk-data-forvalter
2526
outbound:
2627
external:
2728
- host: kodeverk-api.nav.no

‎apps/testnorge-statisk-data-forvalter/config.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ spec:
7171
- application: krr-stub
7272
- application: synthdata-aareg
7373
cluster: dev-fss
74-
- application: kodeverk
74+
- application: testnav-kodeverk-service
75+
cluster: dev-gcp
7576
- application: testnav-aareg-proxy
7677
cluster: dev-fss

‎apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/config/Consumers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class Consumers {
2626

2727
private ServerProperties testnavAaregProxy;
2828
private ServerProperties genererNavnService;
29-
private ServerProperties kodeverkApi;
29+
private ServerProperties testnavKodeverkService;
3030
private ServerProperties testnavOrganisasjonFasteDataService;
3131
private ServerProperties testnavOrganisasjonService;
3232
private ServerProperties testnavPersonFasteDataService;

‎apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/kodeverk/KodeverkConsumer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public KodeverkConsumer(
2323
.maxInMemorySize(16 * 1024 * 1024))
2424
.build())
2525
.baseUrl(consumers
26-
.getKodeverkApi()
26+
.getTestnavKodeverkService()
2727
.getUrl())
2828
.build();
2929
}

‎apps/testnorge-statisk-data-forvalter/src/main/java/no/nav/registre/sdforvalter/consumer/rs/krr/KrrConsumer.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
import no.nav.registre.sdforvalter.domain.KrrListe;
77
import org.springframework.beans.factory.annotation.Value;
88
import org.springframework.core.ParameterizedTypeReference;
9-
import org.springframework.http.*;
9+
import org.springframework.http.HttpHeaders;
10+
import org.springframework.http.HttpMethod;
11+
import org.springframework.http.HttpStatus;
12+
import org.springframework.http.RequestEntity;
13+
import org.springframework.http.ResponseEntity;
1014
import org.springframework.stereotype.Component;
1115
import org.springframework.web.client.HttpClientErrorException;
1216
import org.springframework.web.client.RestTemplate;

‎apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml

+3
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ consumers:
2525
url: https://testnav-bruker-service-dev.intern.dev.nav.no
2626
synthdata-aareg:
2727
url: https://nais-synthdata-aareg.dev.intern.nav.no
28+
testnav-kodeverk-service:
29+
url: https://testnav-kodeverk-service.intern.dev.nav.no
30+

‎apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spring:
1616
aad:
1717
issuer-uri: ${AAD_ISSUER_URI}/v2.0
1818
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
19-
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
19+
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
2020

2121
springdoc:
2222
swagger-ui:
@@ -59,11 +59,11 @@ consumers:
5959
url: https://krr-stub-%s.dev.intern.nav.no/api
6060
synthdata-aareg:
6161
url: http://nais-synthdata-aareg.dolly.svc.nais.local
62-
kodeverk-api:
63-
name: kodeverk-api
64-
namespace: team-rocket
65-
url: https://kodeverk-api.nav.no
66-
cluster: prod-gcp
62+
testnav-kodeverk-service:
63+
name: testnav-kodeverk-service
64+
namespace: dolly
65+
url: http://testnav-kodeverk-service.dolly.svc.cluster.local
66+
cluster: dev-gcp
6767
testnav-aareg-proxy:
6868
name: testnav-aareg-proxy
6969
namespace: dolly

‎apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java

+24-29
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,41 @@
4747
@AutoConfigureMockMvc
4848
class OrkestreringControllerAaregIntegrationTest {
4949

50+
private static final String FNR = "01010101010";
51+
private static final String ORGNR = "999999999";
52+
private static final String MILJOE = "test";
53+
private static String syntString;
54+
private final KodeverkResponse kodeverkResponse = new KodeverkResponse(Collections.singletonList("yrke"));
55+
private final TypeReference<List<RsAaregSyntetiseringsRequest>> syntResponse = new TypeReference<>() {
56+
};
5057
@Autowired
5158
private MockMvc mvc;
52-
5359
@MockBean
5460
private TokenExchange tokenExchange;
55-
5661
@Autowired
5762
private AaregRepository aaregRepository;
58-
5963
@Autowired
6064
private ObjectMapper objectMapper;
6165

62-
private static final String FNR = "01010101010";
63-
private static final String ORGNR = "999999999";
64-
private static final String MILJOE = "test";
65-
66-
private final KodeverkResponse kodeverkResponse = new KodeverkResponse(Collections.singletonList("yrke"));
67-
private static String syntString;
68-
private final TypeReference<List<RsAaregSyntetiseringsRequest>> syntResponse = new TypeReference<>() {
69-
};
66+
@AfterEach
67+
public void cleanUp() {
68+
reset();
69+
aaregRepository.deleteAll();
70+
}
7071

7172
@BeforeAll
7273
public static void setup() {
7374
syntString = getResourceFileContent("files/enkel_arbeidsforholdmelding.json");
7475
}
7576

76-
@Disabled("Fix verify GET on (.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
77+
private AaregModel createAaregModel() {
78+
AaregModel model = new AaregModel();
79+
model.setFnr(FNR);
80+
model.setOrgId(ORGNR);
81+
return model;
82+
}
83+
84+
@Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
7785
@Test
7886
void shouldInitiateAaregFromDatabase() throws Exception {
7987
final AaregModel aaregModel = createAaregModel();
@@ -127,7 +135,7 @@ void shouldInitiateAaregFromDatabase() throws Exception {
127135

128136
JsonWiremockHelper
129137
.builder(objectMapper)
130-
.withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
138+
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
131139
.withResponseBody(kodeverkResponse)
132140
.verifyGet();
133141

@@ -167,7 +175,7 @@ void shouldNotOppretteAaregWhenAlreadyExists() throws Exception {
167175

168176
}
169177

170-
@Disabled("Fix verify GET on (.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
178+
@Disabled("Fix verify GET on (.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
171179
@Test
172180
void shouldNotOppretteAaregIfSyntError() throws Exception {
173181
final AaregModel aaregModel = createAaregModel();
@@ -190,7 +198,7 @@ void shouldNotOppretteAaregIfSyntError() throws Exception {
190198

191199
JsonWiremockHelper
192200
.builder(objectMapper)
193-
.withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
201+
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
194202
.withResponseBody(kodeverkResponse)
195203
.stubGet();
196204

@@ -213,22 +221,9 @@ void shouldNotOppretteAaregIfSyntError() throws Exception {
213221

214222
JsonWiremockHelper
215223
.builder(objectMapper)
216-
.withUrlPathMatching("(.*)/kodeverk-api/api/v1/kodeverk/Yrker/koder")
224+
.withUrlPathMatching("(.*)/testnav-kodeverk-service/api/v1/kodeverk/Yrker/koder")
217225
.withResponseBody(kodeverkResponse)
218226
.verifyGet();
219227
}
220228

221-
private AaregModel createAaregModel() {
222-
AaregModel model = new AaregModel();
223-
model.setFnr(FNR);
224-
model.setOrgId(ORGNR);
225-
return model;
226-
}
227-
228-
@AfterEach
229-
public void cleanUp() {
230-
reset();
231-
aaregRepository.deleteAll();
232-
}
233-
234229
}

‎apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ consumers:
4646
url: http://localhost:${wiremock.server.port:0}/krr-stub/api
4747
synthdata-aareg:
4848
url: http://localhost:${wiremock.server.port:0}/synt-aareg
49-
kodeverk:
50-
url: http://localhost:${wiremock.server.port:0}/kodeverk-api
51-
name: kodeverk-api
52-
namespace: team-rocket
49+
testnav-kodeverk-service:
50+
url: http://localhost:${wiremock.server.port:0}/testnav-kodeverk-service
51+
name: testnav-kodeverk-service
52+
namespace: dolly
5353
cluster: dummy
5454
testnav-aareg-proxy:
5555
url: http://localhost:${wiremock.server.port:0}/aareg

‎proxies/altinn3-tilgang-proxy/Dockerfile

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM ghcr.io/navikt/baseimages/temurin:21
2+
LABEL maintainer="Team Dolly"
3+
4+
ENV JAVA_OPTS="-Dspring.profiles.active=prod"
5+
6+
COPY /build/libs/app.jar /app/app.jar
7+
8+
EXPOSE 8080

‎proxies/altinn3-tilgang-proxy/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Lokal kjøring
2+
* [Generelt.](../../docs/local_general.md)
3+
* [Secret Manager.](../../docs/local_secretmanager.md)

‎proxies/altinn3-tilgang-proxy/build.gradle

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
plugins {
2+
id "dolly-proxies"
3+
}
4+
5+
sonarqube {
6+
properties {
7+
property "sonar.projectKey", "testnav-altinn3-tilgang-proxy"
8+
property "sonar.projectName", "testnav-altinn3-tilgang-proxy"
9+
}
10+
}
11+
12+
dependencies {
13+
implementation "no.nav.testnav.libs:security-core"
14+
implementation "no.nav.testnav.libs:reactive-core"
15+
implementation "no.nav.testnav.libs:reactive-proxy"
16+
implementation "no.nav.testnav.libs:servlet-insecure-security"
17+
18+
implementation "org.springframework.boot:spring-boot-starter-webflux"
19+
}

0 commit comments

Comments
 (0)