budpro

.github/workflows/all.workflows.yml

@@ -37,6 +37,10 @@ on:
         description: "Deploy to test? Make sure the effective working directory contains a config.test.yml! Note: For dolly-frontend, this will also deploy with config.unstable.yml."
         default: false
 
+permissions:
+  contents: read
+  id-token: write
+
 jobs:
 
   start:

.github/workflows/app.budpro-service.yml

@@ -0,0 +1,29 @@
+name: budpro-service
+
+on:
+  push:
+    paths:
+      - libs/commands
+      - libs/data-transfer-objects
+      - libs/reactive-core
+      - libs/security-core
+      - libs/servlet-core
+      - libs/servlet-insecure-security
+      - libs/servlet-security
+      - apps/budpro-service/**
+      - .github/workflows/app.budpro-service.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/budpro-service"
+      deploy-tag: "#deploy-budpro-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 }}

.github/workflows/common.workflow.backend.yml

@@ -83,6 +83,9 @@ jobs:
     needs: start
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - name: "Checkout"
         uses: actions/checkout@v3

apps/budpro-service/.gitignore

@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

apps/budpro-service/Dockerfile

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

apps/budpro-service/README.md

@@ -0,0 +1,10 @@
+**Kilder:**
+
+*Kommuner:*
+> https://www.ssb.no/klass/klassifikasjoner/131
+
+*Stillinger:
+> https://www.ssb.no/arbeid-og-lonn/sysselsetting/artikler/yrkeskatalogen
+
+*Organisasjonsenhet:*
+> https://confluence.adeo.no/display/PK/PK-6917?preview=%2F68215567%2F101614076%2FHR+ORGANISASJONSSTRUKTUR2.xls

apps/budpro-service/build.gradle

@@ -0,0 +1,103 @@
+plugins {
+    id 'java'
+    id 'org.springframework.boot' version '3.1.2'
+    id 'io.spring.dependency-management' version '1.1.2'
+    id "jacoco"
+    id "org.sonarqube" version "4.0.0.2929"
+}
+
+java {
+    sourceCompatibility = '17'
+}
+
+bootJar {
+    archiveFileName = "app.jar"
+    mainClass = 'no.nav.dolly.budpro.BudproServiceApplication'
+}
+
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+    maven {
+        name = "GitHubPackages"
+        url = uri('https://maven.pkg.github.com/navikt/maven-release')
+        credentials(PasswordCredentials) {
+            username 'token'
+            password System.getenv("NAV_TOKEN")
+        }
+    }
+}
+
+dependencyManagement {
+    applyMavenExclusions = false
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.4"
+    }
+}
+
+dependencies {
+    annotationProcessor 'org.projectlombok:lombok'
+    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
+
+    compileOnly 'org.projectlombok:lombok'
+
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation 'no.nav.testnav.libs:commands'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:reactive-core'
+    implementation 'no.nav.testnav.libs:security-core'
+    implementation 'no.nav.testnav.libs:servlet-core'
+    implementation 'no.nav.testnav.libs:servlet-insecure-security'
+    implementation 'no.nav.testnav.libs:servlet-security'
+    implementation 'org.projectlombok:lombok'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
+
+    runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
+
+    testAnnotationProcessor 'org.projectlombok:lombok'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.testcontainers:junit-jupiter'
+}
+
+test {
+    useJUnitPlatform()
+    jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
+}
+
+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.token", System.getenv("SONAR_TOKEN")
+        property "sonar.organization", "navikt"
+        property "sonar.project.monorepo.enabled", true
+        property "sonar.projectKey", "testnav-budpro-service"
+        property "sonar.projectName", "testnav-budpro-service"
+        property "sonar.sourceEncoding", "UTF-8"
+    }
+}

apps/budpro-service/config.yml

@@ -0,0 +1,36 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  name: "testnav-budpro-service"
+  namespace: "dolly"
+  labels:
+    "team": "dolly"
+spec:
+  accessPolicy:
+    inbound:
+      rules:
+        - application: team-dolly-lokal-app
+        - application: testnav-dollystatus
+    outbound:
+      rules:
+        - application: generer-navn-service
+  azure:
+    application:
+      allowAllUsers: true
+      enabled: true
+      tenant: nav.no
+  image: {{image}}
+  ingresses:
+    - "https://testnav-budpro-service.intern.dev.nav.no"
+  liveness:
+    initialDelay: 45
+    path: "/internal/health/liveness"
+  prometheus:
+    enabled: true
+    path: "/internal/prometheus"
+  readiness:
+    initialDelay: 45
+    path: "/internal/health/readiness"
+  replicas:
+    min: 1
+    max: 1

apps/budpro-service/gradle/wrapper/gradle-wrapper.properties

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