Skip to content

Commit 8ccba08

Browse files
stigusstigus
authored
Merge branch 'master' into feature/statisk-data-forvalter-kodeverk-proxy
2 parents b94f92f + 2bcd566 commit 8ccba08

File tree

289 files changed

+3072
-836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+3072
-836
lines changed

‎.github/workflows/app.altinn3-tilgang-service-prod.yml

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

‎.github/workflows/app.altinn3-tilgang-service.yml

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

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
3+
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
4+
5+
spring:
6+
config:
7+
import: "sm://"

‎apps/adresse-service/src/main/resources/application.yaml ‎apps/adresse-service/src/main/resources/application.yml

File renamed without changes.

‎apps/altinn3-tilgang-service/99-dolly-convert-to-pk8.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Converts NAIS provided key.pem to PKCS#8 PEM format, which can be used by R2dbc.
5+
#
6+
openssl pkey -in /var/run/secrets/nais.io/sqlcertificate/key.pem -out /tmp/pk8.pem

‎apps/altinn3-tilgang-service/Dockerfile

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM ghcr.io/navikt/baseimages/temurin:21
2+
LABEL maintainer="Team Dolly"
3+
4+
ENV JAVA_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED"
5+
6+
COPY 99-dolly-convert-to-pk8.sh /init-scripts/
7+
COPY /build/libs/app.jar /app/
8+
9+
EXPOSE 8080

‎apps/altinn3-tilgang-service/README.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## altinn3-tilgang-service
2+
3+
Service som godkjenner tilganger for en spesifisert organisasjoner mot Dolly ved bruk av bankid.
4+
5+
## Swagger
6+
7+
Swagger finnes under [/swagger-ui.html](https://testnav-altinn3-tilgang-service.intern.dev.nav.no/swagger-ui.html)
8+
-endepunktet til applikasjonen.
9+
10+
## Lokal kjøring
11+
12+
Ha naisdevice kjørende og kjør Altinn3TilgangServiceApplicationStarter med følgende argumenter:
13+
14+
```
15+
-Dspring.profiles.active=local
16+
-Dspring.cloud.vault.token=[vault-token]
17+
```

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

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
plugins {
2+
id "dolly-apps"
3+
}
4+
5+
sonarqube {
6+
properties {
7+
property "sonar.projectKey", "testnav-altinn3-tilgang-service"
8+
property "sonar.projectName", "testnav-altinn3-tilgang-service"
9+
}
10+
}
11+
12+
dependencies {
13+
implementation "com.google.cloud:spring-cloud-gcp-starter-secretmanager:$versions.gcpSecretManager"
14+
15+
implementation "no.nav.testnav.libs:reactive-core"
16+
implementation "no.nav.testnav.libs:reactive-security"
17+
implementation "no.nav.testnav.libs:vault"
18+
19+
implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
20+
implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
21+
implementation "org.springframework.boot:spring-boot-starter-security"
22+
23+
implementation "org.flywaydb:flyway-core"
24+
implementation "org.flywaydb:flyway-database-postgresql"
25+
26+
runtimeOnly "org.postgresql:postgresql"
27+
runtimeOnly "org.postgresql:r2dbc-postgresql"
28+
29+
implementation "ma.glasnost.orika:orika-core:$versions.orika"
30+
31+
implementation "io.micrometer:micrometer-registry-prometheus"
32+
implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
33+
implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
34+
35+
implementation "io.r2dbc:r2dbc-h2"
36+
testRuntimeOnly "com.h2database:h2"
37+
}
38+

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

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
apiVersion: "nais.io/v1alpha1"
2+
kind: "Application"
3+
metadata:
4+
name: testnav-altinn3-tilgang-service
5+
namespace: dolly
6+
labels:
7+
team: dolly
8+
spec:
9+
tokenx:
10+
enabled: true
11+
image: "{{image}}"
12+
port: 8080
13+
azure:
14+
application:
15+
enabled: true
16+
tenant: nav.no
17+
claims:
18+
groups:
19+
- id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
20+
maskinporten:
21+
enabled: true
22+
scopes:
23+
consumes:
24+
- name: altinn:resourceregistry/accesslist.read
25+
- name: altinn:resourceregistry/accesslist.write
26+
accessPolicy:
27+
inbound:
28+
rules:
29+
- application: dolly-frontend
30+
- application: dolly-frontend-dev
31+
- application: dolly-frontend-dev-unstable
32+
- application: dolly-idporten
33+
- application: team-dolly-lokal-app
34+
- application: testnav-oversikt-frontend
35+
outbound:
36+
external:
37+
- host: platform.tt02.altinn.no
38+
- host: data.brreg.no
39+
liveness:
40+
path: /internal/isAlive
41+
initialDelay: 10
42+
periodSeconds: 5
43+
failureThreshold: 500
44+
observability:
45+
logging:
46+
destinations:
47+
- id: elastic
48+
autoInstrumentation:
49+
enabled: true
50+
runtime: java
51+
readiness:
52+
path: /internal/isReady
53+
initialDelay: 10
54+
periodSeconds: 5
55+
failureThreshold: 500
56+
prometheus:
57+
enabled: true
58+
path: /internal/metrics
59+
replicas:
60+
min: 1
61+
max: 1
62+
resources:
63+
requests:
64+
cpu: 200m
65+
memory: 1024Mi
66+
limits:
67+
memory: 2048Mi
68+
env:
69+
- name: SPRING_PROFILES_ACTIVE
70+
value: dev
71+
ingresses:
72+
- "https://testnav-altinn3-tilgang-service.intern.dev.nav.no"
73+
gcp:
74+
sqlInstances:
75+
- type: POSTGRES_16
76+
tier: db-custom-1-3840
77+
name: testnav-altinn3-tilgang
78+
databases:
79+
- name: testnav-altinn3-tilgang
80+
autoBackupHour: 2

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

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
apiVersion: "nais.io/v1alpha1"
2+
kind: "Application"
3+
metadata:
4+
name: testnav-altinn3-tilgang-service-prod
5+
namespace: dolly
6+
labels:
7+
team: dolly
8+
spec:
9+
tokenx:
10+
enabled: true
11+
image: "{{image}}"
12+
port: 8080
13+
azure:
14+
application:
15+
enabled: true
16+
tenant: nav.no
17+
claims:
18+
groups:
19+
- id: 9c7efec1-1599-4216-a67e-6fd53a6a951c
20+
maskinporten:
21+
enabled: true
22+
scopes:
23+
consumes:
24+
- name: altinn:resourceregistry/accesslist.read
25+
- name: altinn:resourceregistry/accesslist.write
26+
accessPolicy:
27+
inbound:
28+
rules:
29+
- application: dolly-frontend
30+
cluster: dev-gcp
31+
- application: dolly-frontend-dev
32+
cluster: dev-gcp
33+
- application: dolly-frontend-dev-unstable
34+
cluster: dev-gcp
35+
- application: dolly-idporten
36+
cluster: dev-gcp
37+
- application: team-dolly-lokal-app
38+
cluster: dev-gcp
39+
- application: testnav-oversikt-frontend
40+
cluster: dev-gcp
41+
outbound:
42+
external:
43+
- host: platform.altinn.no
44+
- host: data.brreg.no
45+
liveness:
46+
path: /internal/isAlive
47+
initialDelay: 10
48+
periodSeconds: 5
49+
failureThreshold: 500
50+
observability:
51+
logging:
52+
destinations:
53+
- id: elastic
54+
autoInstrumentation:
55+
enabled: true
56+
runtime: java
57+
readiness:
58+
path: /internal/isReady
59+
initialDelay: 10
60+
periodSeconds: 5
61+
failureThreshold: 500
62+
prometheus:
63+
enabled: true
64+
path: /internal/metrics
65+
replicas:
66+
min: 1
67+
max: 1
68+
resources:
69+
requests:
70+
cpu: 200m
71+
memory: 1024Mi
72+
limits:
73+
memory: 2048Mi
74+
env:
75+
- name: SPRING_PROFILES_ACTIVE
76+
value: prod
77+
ingresses:
78+
- "https://testnav-altinn3-tilgang-service.nav.no"
79+
gcp:
80+
sqlInstances:
81+
- type: POSTGRES_16
82+
tier: db-custom-1-3840
83+
name: testnav-altinn3-tilgang
84+
databases:
85+
- name: testnav-altinn3-tilgang
86+
autoBackupHour: 2

‎apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.jar

58.1 KB
Binary file not shown.

‎apps/altinn3-tilgang-service/gradle/wrapper/gradle-wrapper.properties

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)