Skip to content
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

Merged
merged 72 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
7e3afd1
#deploy-tenor-search-service
krharum Jan 2, 2024
337ad76
Oppdatering #deploy-tenor-search-service
krharum Jan 2, 2024
f78d4d1
Oppdatering II #deploy-tenor-search-service
krharum Jan 3, 2024
2e75148
Oppdatering III #deploy-tenor-search-service
krharum Jan 3, 2024
83e87e4
Oppdatering IV #deploy-tenor-search-service
krharum Jan 3, 2024
3b6b694
Oppdatering V #deploy-tenor-search-service
krharum Jan 3, 2024
97b11c8
Update environment variables and config settings in TenorSearchServic…
krharum Jan 9, 2024
b13d8f5
Oppdatert konfig
krharum Jan 9, 2024
6c49a39
Oppdatert konfig II #deploy-tenor-search-service
krharum Jan 9, 2024
28afc35
Merge branch 'master' into feature/tenor-serch-service
krharum Jan 9, 2024
0400033
Henter nøkkelinformasjon #deploy-tenor-search-service
krharum Jan 9, 2024
194577a
Lagt til nytt endepunkt for spørring
krharum Jan 10, 2024
8614bdb
Deploy #deploy-tenor-search-service
krharum Jan 10, 2024
9ced6b1
Lagt til feilhandtering #deploy-tenor-search-service
krharum Jan 10, 2024
f9f41c4
Update HTTP headers and error handling in TenorSearchService #deploy-…
krharum Jan 10, 2024
b9b3504
Oppdatering #deploy-testnav-tenor-search
krharum Jan 10, 2024
691fd56
Deploy #deploy-testnav-tenor-search
krharum Jan 10, 2024
e60bbe3
Merge branch 'master' into feature/tenor-serch-service
krharum Jan 10, 2024
e803ff5
Deploy #deploy-tenor-search-service
krharum Jan 10, 2024
86fb188
Oppdatert konfig #deploy-tenor-search-service
krharum Jan 10, 2024
1d70426
Oppdatert konfig #deploy-tenor-search-service
krharum Jan 10, 2024
f519505
Oppdatert konfig II #deploy-tenor-search-service
krharum Jan 10, 2024
ef4fd63
Lagt til flere opplysningstyper #deploy-tenor-search-service
krharum Jan 10, 2024
bc72dff
Oppdatert for flere typer søk
krharum Jan 11, 2024
0a28eda
Oppdatert enum #deploy-tenor-search-service
krharum Jan 11, 2024
cbd87f7
Lagt til flere sokemuligheter #deploy-tenor-search-service
krharum Jan 11, 2024
65d1bda
URLEncoder igjen #deploy-tenor-search-service
krharum Jan 11, 2024
c381784
Lagt på user-agent #deploy-tenor-search-service
krharum Jan 11, 2024
04d0552
Endret enkoding #deploy-tenor-search-service
krharum Jan 12, 2024
25f9230
Endret enkoding II #deploy-tenor-search-service
krharum Jan 12, 2024
4180805
Endret enkoding III #deploy-tenor-search-service
krharum Jan 12, 2024
9087f84
Oppdatert encoding #deploy-tenor-search-service
krharum Jan 12, 2024
fa9dbd6
Oppdatert URI #deploy-tenor-search-service
krharum Jan 12, 2024
251f768
Oppdatert URI II #deploy-tenor-search-service
krharum Jan 12, 2024
442b739
Lagt på mere logging II #deploy-tenor-search-service
krharum Jan 12, 2024
87dc369
Oppdatert dekoding #deploy-tenor-search-service
krharum Jan 13, 2024
3428ff4
Oppdatert dekoding II #deploy-tenor-search-service
krharum Jan 13, 2024
95c0b18
Oppdatert dekoding III #deploy-tenor-search-service
krharum Jan 15, 2024
a35d815
Oppdatert dekoding IV #deploy-tenor-search-service
krharum Jan 15, 2024
dee2068
Oppdatert dekoding V #deploy-tenor-search-service
krharum Jan 16, 2024
26feb91
Revert "Oppdatert dekoding V #deploy-tenor-search-service"
krharum Jan 16, 2024
80e69f3
Oppdatert dekoding og lagt til flere søkemuligheter #deploy-tenor-sea…
krharum Jan 16, 2024
bf64193
Lagt til flere søk
krharum Jan 17, 2024
965cd52
Oppdatert request + dekoding #deploy-tenor-search-service
krharum Jan 17, 2024
7a78c70
Oppdatert request + dekoding II #deploy-tenor-search-service
krharum Jan 17, 2024
0aa060c
Oppdatert request + dekoding III #deploy-tenor-search-service
krharum Jan 18, 2024
d744bfa
Arbeid paagaar
krharum Jan 18, 2024
b03b174
Oppdatert med mer funksjonalitet #deploy-tenor-search-service
krharum Jan 18, 2024
da7d7ed
Sonar + rettet feil #deploy-tenor-search-service
krharum Jan 18, 2024
dcff419
Sonar + rettet feil II #deploy-tenor-search-service
krharum Jan 18, 2024
c018086
Sonar + rettet feil III #deploy-tenor-search-service
krharum Jan 18, 2024
2863000
Sonar + rettet feil IV #deploy-tenor-search-service
krharum Jan 18, 2024
f686a6b
Sonar + rettet feil V #deploy-tenor-search-service
krharum Jan 18, 2024
892d2ed
Sonar + rettet feil VI #deploy-tenor-search-service
krharum Jan 18, 2024
e05e64d
Refactor method calls in TenorEksterneRelasjonerUtility.java
krharum Jan 19, 2024
97e77d7
Sonar trivia + deploy #deploy-tenor-search-service
krharum Jan 19, 2024
608bf13
Sonar trivia + rettet feil deploy #deploy-tenor-search-service
krharum Jan 19, 2024
1f1de4d
Sonar trivia + lagt til endepunkt for oppslag #deploy-tenor-search-se…
krharum Jan 19, 2024
4b5bf25
Rettet feil #deploy-tenor-search-service
krharum Jan 19, 2024
c5675b4
Rettet feil + oppdatert personidentifikator #deploy-tenor-search-service
krharum Jan 19, 2024
48108b7
Rettet feil #deploy-tenor-search-service
krharum Jan 19, 2024
5f017b1
Rettet feil II #deploy-tenor-search-service
krharum Jan 19, 2024
dd6a863
Rettet feil III #deploy-tenor-search-service
krharum Jan 22, 2024
034c1b1
Rettet feil + lagt til funksjonalitet #deploy-tenor-search-service
krharum Jan 22, 2024
204f900
Rettet feil + lagt til nytt parameter #deploy-tenor-search-service
krharum Jan 22, 2024
667a61c
Lagt til nye parametere for soek #deploy-tenor-search-service
krharum Jan 23, 2024
cd7fd4c
Lagt til nye parametere for soek II #deploy-tenor-search-service
krharum Jan 23, 2024
f840cdd
Feilretting #deploy-tenor-search-service
krharum Jan 23, 2024
403435e
Sonar trivia #deploy-tenor-search-service
krharum Jan 23, 2024
3c5591b
Merge branch 'master' into feature/tenor-serch-service
krharum Jan 24, 2024
a584704
Rettet feil #deploy-tenor-search-service
krharum Jan 24, 2024
73d37fc
Oppdatert gradle config #deploy-tenor-search-service
krharum Jan 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/app.tenor-search-service.yml
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 }}
6 changes: 6 additions & 0 deletions apps/tenor-search-service/Dockerfile
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
9 changes: 9 additions & 0 deletions apps/tenor-search-service/README.md
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.
89 changes: 89 additions & 0 deletions apps/tenor-search-service/build.gradle
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"
Copy link
Contributor

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? 👍

    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"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutt

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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Denne også 😄 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0'

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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'
}
62 changes: 62 additions & 0 deletions apps/tenor-search-service/config.yml
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
Binary file not shown.
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
Loading