4 oppsett database

.github/workflows/app.levende-arbeidsforhold-ansettelse.yml

@@ -0,0 +1,23 @@
+name: levende-arbeidsforhold-ansettelse
+
+on:
+  push:
+    paths:
+      - libs/commands/**
+      - libs/data-transfer-objects/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-security/**
+      - apps/levende-arbeidsforhold-service/**
+      - .github/workflows/app.levende-arbeidsforhold-ansettelse.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/levende-arbeidsforhold-ansettelse"
+      deploy-tag: "#deploy-levende-arbeidsforhold-ansettelse"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

.github/workflows/app.levende-arbeidsforhold-service.yml

@@ -0,0 +1,23 @@
+name: levende-arbeidsforhold-service
+
+on:
+  push:
+    paths:
+      - libs/commands/**
+      - libs/data-transfer-objects/**
+      - libs/security-core/**
+      - libs/servlet-core/**
+      - libs/servlet-security/**
+      - apps/levende-arbeidsforhold-service/**
+      - .github/workflows/app.levende-arbeidsforhold-service.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/levende-arbeidsforhold-service"
+      deploy-tag: "#deploy-levende-arbeidsforhold-service"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

apps/arbeidsforhold-service/src/main/resources/application.yml

@@ -27,7 +27,10 @@ consumers:
     namespace: dolly
     url: https://testnav-aareg-proxy.dev-fss-pub.nais.io
     cluster: dev-fss
-
+spec:
+  azure:
+    application:
+      enabled: true
 management:
   endpoints:
     enabled-by-default: true

apps/levende-arbeidsforhold-ansettelse/Dockerfile

@@ -0,0 +1,8 @@
+FROM ghcr.io/navikt/baseimages/temurin:21
+LABEL maintainer="Team Dolly"
+
+ENV JAVA_OPTS="-Dspring.profiles.active=prod"
+
+ADD /build/libs/app.jar /app/app.jar
+
+EXPOSE 8080

apps/levende-arbeidsforhold-ansettelse/README.md

@@ -0,0 +1,26 @@
+# Levende arbeidsforhold-service
+
+Fyll inn:
+
+## Swagger
+
+Swagger finnes under [/swagger](https://levende-arbeidsforhold-service.intern.dev.nav.no/swagger) -endepunktet til
+applikasjonen.
+
+## Lokal kjøring
+
+Ha naisdevice kjørende og kjør GenererNavnServiceApplicationStarter med følgende argumenter:
+
+```
+-Dspring.cloud.vault.token=[vault-token]
+-Dspring.profiles.active=dev
+```
+
+### Utviklerimage
+
+I utviklerimage brukes ikke naisdevice og du må legge til følgende ekstra argumenter:
+
+```
+-Djavax.net.ssl.trustStore=[path til lokal truststore]
+-Djavax.net.ssl.trustStorePassword=[passord til lokal truststore]
+```

apps/levende-arbeidsforhold-ansettelse/build.gradle

@@ -0,0 +1,94 @@
+plugins {
+    id 'java'
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.6"
+    id 'io.spring.dependency-management' version "1.1.5"
+    id "jacoco"
+}
+
+test {
+    useJUnitPlatform()
+}
+
+sonarqube {
+    properties {
+        property "sonar.dynamicAnalysis", "reuseReports"
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.java.coveragePlugin", "jacoco"
+        property "sonar.language", "java"
+        property "sonar.token", System.getenv("SONAR_TOKEN")
+        property "sonar.organization", "navikt"
+        property "sonar.project.monorepo.enabled", true
+        property "sonar.projectKey", "testnav-levende-arbeidsforhold-ansettelse"
+        property "sonar.projectName", "testnav-levende-arbeidsforhold-ansettelse"
+        property "sonar.sourceEncoding", "UTF-8"
+    }
+}
+bootJar {
+    archiveFileName = "app.jar"
+}
+
+dependencyManagement {
+    applyMavenExclusions = false
+    imports {
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
+    }
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url = uri('https://packages.confluent.io/maven/')
+    }
+}
+
+dependencies {
+    implementation "no.nav.testnav.libs:kafka-config"
+    implementation 'no.nav.testnav.libs:security-core'
+    implementation 'no.nav.testnav.libs:reactive-core'
+    implementation 'no.nav.testnav.libs:servlet-core'
+    implementation 'no.nav.testnav.libs:commands'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:servlet-security'
+
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+
+    implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
+
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation 'org.hibernate.validator:hibernate-validator'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+
+    implementation 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+
+    implementation 'no.nav.testnav.libs:kafka-config'
+    implementation 'org.apache.kafka:kafka-clients:3.7.0'
+    implementation 'io.confluent:kafka-avro-serializer:7.6.0'
+    implementation 'org.springframework.kafka:spring-kafka'
+
+    implementation 'no.nav.testnav.libs:avro-schema'
+    implementation 'no.nav.testnav.libs:commands'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:kafka-config'
+    implementation 'no.nav.testnav.libs:security-core'
+    implementation 'no.nav.testnav.libs:servlet-insecure-security'
+    implementation 'no.nav.testnav.libs:servlet-core'
+}
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(22)
+    }
+}

apps/levende-arbeidsforhold-ansettelse/config.yml

@@ -0,0 +1,65 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: testnav-levende-arbeidsforhold-ansettelse
+  namespace: dolly
+  labels:
+    team: dolly
+spec:
+  image: "{{image}}"
+  port: 8080
+  accessPolicy:
+    inbound:
+      rules:
+        - application: team-dolly-lokal-app
+          cluster: dev-gcp
+        - application: testnav-oversikt-frontend
+          cluster: dev-gcp
+    outbound:
+      external:
+        - host: testnav-aareg-proxy.dev-fss-pub.nais.io
+      rules:
+        - application: testnav-levende-arbeidsforhold-ansettelse
+          cluster: dev-gcp
+  azure:
+    application:
+      allowAllUsers: true
+      enabled: true
+      tenant: nav.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
+  kafka:
+    pool: nav-dev
+  ingresses:
+    - "https://testnav-levende-arbeidsforhold-ansettelse.intern.dev.nav.no"
+  gcp:
+    sqlInstances:
+      - type: POSTGRES_14
+        name: testnav-levende-arbeidsforhold-ansettelse
+        databases:
+          - name: ansettelse-jobber
+        autoBackupHour: 3 #Lager backup av hele SQL instancen hver dag kl 03:00
+        tier: db-f1-micro
+        diskAutoresize: true #Kanskje ikke nødvendig?
+        #collation: DESC
+

apps/levende-arbeidsforhold-ansettelse/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists