Klargjort synk-jobb for kjøring av avsluttingsfil

Author: naviktthomas

jobs/arbeidssoekere-synk-jobb/nais/nais-dev.yaml

@@ -12,6 +12,9 @@ spec:
     requests:
       cpu: 200m
       memory: 256Mi
+  env:
+    - name: JOB_ENABLED
+      value: "false"
   secureLogs:
     enabled: true
   observability:

jobs/arbeidssoekere-synk-jobb/nais/nais-prod.yaml

@@ -12,6 +12,9 @@ spec:
     requests:
       cpu: 200m
       memory: 256Mi
+  env:
+    - name: JOB_ENABLED
+      value: "false"
   secureLogs:
     enabled: true
   observability:

jobs/arbeidssoekere-synk-jobb/src/main/kotlin/no/nav/paw/arbeidssoeker/synk/Job.kt

@@ -23,44 +23,48 @@ import kotlin.system.exitProcess
 fun main() {
     val logger = buildApplicationLogger
 
-    try {
-        logger.info("Initialiserer jobb")
+    val jobConfig = loadNaisOrLocalConfiguration<JobConfig>(JOB_CONFIG)
+    val databaseConfig = loadNaisOrLocalConfiguration<DatabaseConfig>(DATABASE_CONFIG)
+    val azureAdM2MConfig = loadNaisOrLocalConfiguration<AzureAdM2MConfig>(AZURE_M2M_CONFIG)
 
-        val jobConfig = loadNaisOrLocalConfiguration<JobConfig>(JOB_CONFIG)
-        val databaseConfig = loadNaisOrLocalConfiguration<DatabaseConfig>(DATABASE_CONFIG)
-        val azureAdM2MConfig = loadNaisOrLocalConfiguration<AzureAdM2MConfig>(AZURE_M2M_CONFIG)
+    with(jobConfig) {
+        if (jobEnabled) {
+            try {
+                logger.info("Initialiserer jobb")
 
-        with(jobConfig) {
-            val arbeidssoekerSynkRepository = ArbeidssoekerSynkRepository()
-            val azureAdM2MTokenClient = createAzureAdM2MTokenClient(runtimeEnvironment, azureAdM2MConfig)
-            val inngangHttpConsumer = InngangHttpConsumer(apiInngang.baseUrl) {
-                azureAdM2MTokenClient.createMachineToMachineToken(apiInngang.scope)
-            }
-            val arbeidssoekerSynkService =
-                ArbeidssoekerSynkService(jobConfig, arbeidssoekerSynkRepository, inngangHttpConsumer)
+                val arbeidssoekerSynkRepository = ArbeidssoekerSynkRepository()
+                val azureAdM2MTokenClient = createAzureAdM2MTokenClient(runtimeEnvironment, azureAdM2MConfig)
+                val inngangHttpConsumer = InngangHttpConsumer(apiInngang.baseUrl) {
+                    azureAdM2MTokenClient.createMachineToMachineToken(apiInngang.scope)
+                }
+                val arbeidssoekerSynkService =
+                    ArbeidssoekerSynkService(jobConfig, arbeidssoekerSynkRepository, inngangHttpConsumer)
 
-            logger.info("Starter jobb")
+                logger.info("Starter jobb")
 
-            val filePath = Paths.get(syncFilePath)
-            logger.info("Leser CSV-fil {} fra mappe {}", filePath.name, filePath.parent)
+                val filePath = Paths.get(syncFilePath)
+                logger.info("Leser CSV-fil {} fra mappe {}", filePath.name, filePath.parent)
 
-            val rows = ArbeidssoekerCsvReader.readValues(filePath)
-            if (rows.hasNextValue()) {
-                val dataSource = createHikariDataSource(databaseConfig)
-                dataSource.flywayMigrate()
-                Database.connect(dataSource)
+                val rows = ArbeidssoekerCsvReader.readValues(filePath)
+                if (rows.hasNextValue()) {
+                    val dataSource = createHikariDataSource(databaseConfig)
+                    dataSource.flywayMigrate()
+                    Database.connect(dataSource)
 
-                arbeidssoekerSynkService.synkArbeidssoekere(filePath.name, rows)
-            } else {
-                logger.warn("CSV-fil {} fra mappe {} er tom", filePath.name, filePath.parent)
-            }
+                    arbeidssoekerSynkService.synkArbeidssoekere(filePath.name, rows)
+                } else {
+                    logger.warn("CSV-fil {} fra mappe {} er tom", filePath.name, filePath.parent)
+                }
 
-            exitProcess(0)
+                exitProcess(0)
+            } catch (throwable: Throwable) {
+                logger.error("Kjøring feilet", throwable)
+                exitProcess(1)
+            } finally {
+                logger.info("Avslutter jobb")
+            }
+        } else {
+            logger.info("Jobb er inaktivert")
         }
-    } catch (throwable: Throwable) {
-        logger.error("Kjøring feilet", throwable)
-        exitProcess(1)
-    } finally {
-        logger.info("Avslutter jobb")
     }
 }

jobs/arbeidssoekere-synk-jobb/src/main/kotlin/no/nav/paw/arbeidssoeker/synk/config/JobConfig.kt

@@ -7,6 +7,7 @@ import no.nav.paw.config.env.currentRuntimeEnvironment
 const val JOB_CONFIG = "job_config.toml"
 
 data class JobConfig(
+    val jobEnabled: Boolean,
     val syncFilePath: String,
     val defaultVerdier: DefaultVerdier,
     val apiInngang: ApiInngangConfig,

jobs/arbeidssoekere-synk-jobb/src/main/resources/local/job_config.toml

@@ -1,7 +1,9 @@
+jobEnabled = true
+
 syncFilePath = "/tmp/v1.csv"
 
 [defaultVerdier]
-periodeTilstand = "STARTET"
+periodeTilstand = "STOPPET"
 forhaandsgodkjentAvAnsatt = false
 
 [apiInngang]

jobs/arbeidssoekere-synk-jobb/src/main/resources/nais/job_config.toml

@@ -1,8 +1,10 @@
-syncFilePath = "/var/run/secrets/paw-arbeidssoekere-synk-jobb-csv/v1.csv"
+jobEnabled = "${JOB_ENABLED}"
+
+syncFilePath = "/var/run/secrets/paw-arbeidssoekere-synk-jobb-csv/v2.csv"
 
 [defaultVerdier]
-periodeTilstand = "STARTET"
-forhaandsgodkjentAvAnsatt = true
+periodeTilstand = "STOPPET"
+forhaandsgodkjentAvAnsatt = false
 
 [apiInngang]
 baseUrl = "http://paw-arbeidssokerregisteret-api-inngang"