-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
#deploy-tenor-search-service #3365
Changes from 70 commits
7e3afd1
337ad76
f78d4d1
2e75148
83e87e4
3b6b694
97b11c8
b13d8f5
6c49a39
28afc35
0400033
194577a
8614bdb
9ced6b1
f9f41c4
b9b3504
691fd56
e60bbe3
e803ff5
86fb188
1d70426
f519505
ef4fd63
bc72dff
0a28eda
cbd87f7
65d1bda
c381784
04d0552
25f9230
4180805
9087f84
fa9dbd6
251f768
442b739
87dc369
3428ff4
95c0b18
a35d815
dee2068
26feb91
80e69f3
bf64193
965cd52
7a78c70
0aa060c
d744bfa
b03b174
da7d7ed
dcff419
c018086
2863000
f686a6b
892d2ed
e05e64d
97e77d7
608bf13
1f1de4d
4b5bf25
c5675b4
48108b7
5f017b1
dd6a863
034c1b1
204f900
667a61c
cd7fd4c
f840cdd
403435e
3c5591b
a584704
73d37fc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
name: tenor-search-service | ||
|
||
on: | ||
push: | ||
paths: | ||
- libs/integration-test | ||
- libs/reactive-core | ||
- 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: | ||
working-directory: "apps/tenor-search-service" | ||
deploy-tag: "#deploy-tenor-search-service" | ||
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 }} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
plugins { | ||
id 'java' | ||
id "org.sonarqube" version "4.0.0.2929" | ||
id 'org.springframework.boot' version "3.1.4" | ||
id 'io.spring.dependency-management' version "1.1.3" | ||
id "jacoco" | ||
} | ||
|
||
test { | ||
useJUnitPlatform() | ||
} | ||
def test = tasks.named("test") { | ||
useJUnitPlatform { | ||
excludeTags "integration" | ||
} | ||
} | ||
def iTest = tasks.register("iTest", Test) { | ||
useJUnitPlatform { | ||
includeTags "integration" | ||
} | ||
shouldRunAfter test | ||
} | ||
|
||
jacocoTestReport { | ||
reports { | ||
xml.required = true | ||
} | ||
} | ||
|
||
sonarqube { | ||
properties { | ||
property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/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.login", System.getenv("SONAR_TOKEN") | ||
property "sonar.organization", "navikt" | ||
property "sonar.project.monorepo.enabled", true | ||
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 { | ||
mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Denne også 😄 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ja |
||
} | ||
} | ||
|
||
repositories { | ||
mavenCentral() | ||
mavenLocal() | ||
} | ||
|
||
dependencies { | ||
implementation 'no.nav.testnav.libs:reactive-core' | ||
implementation 'no.nav.testnav.libs:reactive-security' | ||
implementation 'no.nav.testnav.libs:security-core' | ||
|
||
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 'io.micrometer:micrometer-registry-prometheus' | ||
|
||
implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
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' | ||
testImplementation 'no.nav.testnav.libs:integration-test' | ||
|
||
implementation 'org.projectlombok:lombok' | ||
annotationProcessor 'org.projectlombok:lombok' | ||
testAnnotationProcessor 'org.projectlombok:lombok' | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
apiVersion: "nais.io/v1alpha1" | ||
kind: "Application" | ||
metadata: | ||
name: testnav-tenor-search-service | ||
namespace: dolly | ||
labels: | ||
team: dolly | ||
spec: | ||
image: "{{image}}" | ||
port: 8080 | ||
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: testnav-oversikt-frontend | ||
- application: dolly-frontend | ||
- application: dolly-frontend-dev | ||
- application: dolly-idporten | ||
- application: team-dolly-lokal-app | ||
- application: app-1 | ||
namespace: plattformsikkerhet | ||
outbound: | ||
external: | ||
- host: testdata.api.skatteetaten.no | ||
liveness: | ||
path: /internal/isAlive | ||
initialDelay: 4 | ||
periodSeconds: 5 | ||
failureThreshold: 500 | ||
readiness: | ||
path: /internal/isReady | ||
initialDelay: 4 | ||
periodSeconds: 5 | ||
failureThreshold: 500 | ||
prometheus: | ||
enabled: true | ||
path: /internal/metrics | ||
replicas: | ||
min: 1 | ||
max: 1 | ||
resources: | ||
requests: | ||
cpu: 200m | ||
memory: 1024Mi | ||
limits: | ||
memory: 2048Mi | ||
ingresses: | ||
- "https://testnav-tenor-search-service.intern.dev.nav.no" | ||
env: | ||
- name: SPRING_PROFILES_ACTIVE | ||
value: prod |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oppdaterer du disse i samme slengen? 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Absolutt