Merge pull request #128 from navikt/oppdatere-emottak-utils-til-0.2.0

Oppdatert emottak-utils til utgave 0.2.0

Author: terjenilssen

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/App.kt

@@ -28,7 +28,7 @@ import no.nav.emottak.cpa.persistence.cpaDbConfig
 import no.nav.emottak.cpa.persistence.cpaMigrationConfig
 import no.nav.emottak.cpa.persistence.gammel.PartnerRepository
 import no.nav.emottak.cpa.persistence.oracleConfig
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.tokenValidationSupport
 import org.oasis_open.committees.ebxml_cppa.schema.cpp_cpa_2_0.CollaborationProtocolAgreement
 import org.slf4j.LoggerFactory

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/HttpClientUtil.kt

@@ -3,7 +3,7 @@ package no.nav.emottak.cpa
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.HttpRequestRetry
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URL

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/Routes.kt

@@ -37,7 +37,7 @@ import no.nav.emottak.message.model.ValidationRequest
 import no.nav.emottak.message.model.ValidationResult
 import no.nav.emottak.util.createX509Certificate
 import no.nav.emottak.util.marker
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.TokenValidationContextPrincipal
 import org.oasis_open.committees.ebxml_cppa.schema.cpp_cpa_2_0.CollaborationProtocolAgreement
 import java.util.Date

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/auth/AuthConfig.kt

@@ -1,6 +1,6 @@
 package no.nav.emottak.cpa.auth
 
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.IssuerConfig
 import no.nav.security.token.support.v3.TokenSupportConfig
 

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/cert/CRLList.kt

@@ -1,6 +1,6 @@
 package no.nav.emottak.cpa.cert
 
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 
 private val prodCRLLists = mapOf(
     "CN=Buypass Class 3 CA 3,O=Buypass AS-983163327,C=NO" to "http://crl.buypass.no/crl/BPClass3CA3.crl",

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/persistence/CPARepository.kt

@@ -9,7 +9,7 @@ import no.nav.emottak.message.ebxml.EbXMLConstants.EBMS_SERVICE_URI
 import no.nav.emottak.message.ebxml.EbXMLConstants.MESSAGE_ERROR_ACTION
 import no.nav.emottak.message.ebxml.PartyTypeEnum
 import no.nav.emottak.message.model.ProcessConfig
-import no.nav.emottak.utils.isProdEnv
+import no.nav.emottak.utils.environment.isProdEnv
 import org.jetbrains.exposed.sql.SortOrder
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.and

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/persistence/DBConfiguration.kt

@@ -3,8 +3,8 @@ package no.nav.emottak.cpa.persistence
 import com.bettercloud.vault.response.LogicalResponse
 import com.zaxxer.hikari.HikariConfig
 import no.nav.emottak.cpa.log
-import no.nav.emottak.utils.fromEnv
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.fromEnv
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.vault.jdbc.hikaricp.HikariCPVaultUtil
 import no.nav.vault.jdbc.hikaricp.VaultUtil
 

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/persistence/Database.kt

@@ -2,7 +2,7 @@ package no.nav.emottak.cpa.persistence
 
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.flywaydb.core.Flyway
 import org.jetbrains.exposed.sql.Database
 

cpa-repo/src/main/kotlin/no/nav/emottak/cpa/validation/SertifikatValidering.kt

@@ -7,7 +7,7 @@ import no.nav.emottak.cpa.cert.CertificateValidationException
 import no.nav.emottak.crypto.FileKeyStoreConfig
 import no.nav.emottak.crypto.KeyStoreManager
 import no.nav.emottak.util.isSelfSigned
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.bouncycastle.asn1.x509.CRLDistPoint
 import org.bouncycastle.asn1.x509.Extension
 import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils

cpa-repo/src/test/kotlin/no/nav/emottak/cpa/CPARepoIntegrationTest.kt

@@ -36,7 +36,7 @@ import no.nav.emottak.message.model.SignatureDetails
 import no.nav.emottak.message.model.SignatureDetailsRequest
 import no.nav.emottak.message.model.ValidationRequest
 import no.nav.emottak.message.model.ValidationResult
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.mock.oauth2.MockOAuth2Server
 import org.apache.commons.lang3.StringUtils
 import org.junit.jupiter.api.Test

ebms-async/src/main/kotlin/no/nav/emottak/ebms/async/AuthConfig.kt

@@ -1,6 +1,6 @@
 package no.nav.emottak.ebms.async
 
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.IssuerConfig
 import no.nav.security.token.support.v3.TokenSupportConfig
 

ebms-async/src/main/kotlin/no/nav/emottak/ebms/async/persistence/Database.kt

@@ -2,7 +2,7 @@ package no.nav.emottak.ebms.async.persistence
 
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.flywaydb.core.Flyway
 import org.jetbrains.exposed.sql.Database
 

ebms-async/src/main/kotlin/no/nav/emottak/ebms/async/persistence/DatabaseConfig.kt

@@ -3,7 +3,7 @@ package no.nav.emottak.ebms.async.persistence
 import com.bettercloud.vault.response.LogicalResponse
 import com.zaxxer.hikari.HikariConfig
 import no.nav.emottak.ebms.async.log
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.vault.jdbc.hikaricp.HikariCPVaultUtil
 import no.nav.vault.jdbc.hikaricp.VaultUtil
 

ebms-payload/src/main/kotlin/no/nav/emottak/payload/App.kt

@@ -15,7 +15,7 @@ import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.routing.routing
 import io.micrometer.prometheusmetrics.PrometheusConfig
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.tokenValidationSupport
 import org.slf4j.LoggerFactory
 import java.net.InetSocketAddress

ebms-payload/src/main/kotlin/no/nav/emottak/payload/AuthConfig.kt

@@ -1,6 +1,6 @@
 package no.nav.emottak.payload
 
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import no.nav.security.token.support.v3.IssuerConfig
 import no.nav.security.token.support.v3.TokenSupportConfig
 

ebms-payload/src/main/kotlin/no/nav/emottak/payload/Configurator.kt

@@ -5,7 +5,7 @@ import com.sksamuel.hoplite.ExperimentalHoplite
 import com.sksamuel.hoplite.addEnvironmentSource
 import com.sksamuel.hoplite.addResourceSource
 import no.nav.emottak.payload.configuration.Config
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 
 @OptIn(ExperimentalHoplite::class)
 fun config() = ConfigLoader.builder()

ebms-payload/src/main/kotlin/no/nav/emottak/payload/crypto/Dekryptering.kt

@@ -5,7 +5,7 @@ import no.nav.emottak.crypto.KeyStoreManager
 import no.nav.emottak.crypto.VaultKeyStoreConfig
 import no.nav.emottak.crypto.parseVaultJsonObject
 import no.nav.emottak.util.decodeBase64
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cms.CMSEnvelopedData
 import org.bouncycastle.cms.KeyTransRecipientId

ebms-payload/src/main/kotlin/no/nav/emottak/payload/crypto/PayloadSignering.kt

@@ -7,7 +7,7 @@ import no.nav.emottak.crypto.parseVaultJsonObject
 import no.nav.emottak.message.model.SignatureDetails
 import no.nav.emottak.util.createX509Certificate
 import no.nav.emottak.util.signatur.SignatureException
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.w3c.dom.Document
 import java.io.FileReader
 import java.security.Key

ebms-payload/src/main/kotlin/no/nav/emottak/payload/juridisklogg/JuridiskLoggService.kt

@@ -18,7 +18,7 @@ import no.nav.emottak.message.model.PartyId
 import no.nav.emottak.message.model.PayloadRequest
 import no.nav.emottak.payload.log
 import no.nav.emottak.util.marker
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 
 class JuridiskLoggService() {
     private val juridiskLoggUrl = getEnvVar("APP_JURIDISKLOGG_URI", "https://app-q1.adeo.no/juridisklogg") + "/api/rest/logg"

ebms-payload/src/main/kotlin/no/nav/emottak/payload/ocspstatus/OCSPConfig.kt

@@ -2,7 +2,7 @@ package no.nav.emottak.payload.ocspstatus
 
 import no.nav.emottak.crypto.FileKeyStoreConfig
 import no.nav.emottak.crypto.parseVaultJsonObject
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import java.io.FileReader
 
 internal fun trustStoreConfig() = FileKeyStoreConfig(

ebms-payload/src/main/kotlin/no/nav/emottak/payload/ocspstatus/OcspStatusService.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.withContext
 import no.nav.emottak.crypto.KeyStoreManager
 import no.nav.emottak.payload.config
 import no.nav.emottak.payload.log
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers
 import org.bouncycastle.asn1.ocsp.OCSPResponseStatus
 import org.bouncycastle.asn1.x500.X500Name

ebms-provider/src/main/kotlin/no/nav/emottak/ebms/HttpClients.kt

@@ -26,7 +26,7 @@ import no.nav.emottak.message.model.SendInRequest
 import no.nav.emottak.message.model.SendInResponse
 import no.nav.emottak.message.model.ValidationRequest
 import no.nav.emottak.message.model.ValidationResult
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import java.net.InetSocketAddress
 import java.net.Proxy
 import java.net.URI

ebms-provider/src/main/kotlin/no/nav/emottak/ebms/xml/EbMSSigning.kt

@@ -13,7 +13,7 @@ import no.nav.emottak.message.model.SignatureDetails
 import no.nav.emottak.util.createX509Certificate
 import no.nav.emottak.util.getFirstChildElement
 import no.nav.emottak.util.signatur.SignatureException
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.apache.xml.security.exceptions.XMLSecurityException
 import org.apache.xml.security.signature.XMLSignature
 import org.apache.xml.security.transforms.Transforms

ebms-provider/src/test/kotlin/no/nav/emottak/ebms/EbmsRoutFellesIT.kt

@@ -26,7 +26,7 @@ import no.nav.emottak.message.model.SignatureDetails
 import no.nav.emottak.message.model.ValidationResult
 import no.nav.emottak.message.xml.xmlMarshaller
 import no.nav.emottak.util.decodeBase64
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.apache.xml.security.algorithms.MessageDigestAlgorithm
 import org.apache.xml.security.signature.XMLSignature
 import org.junit.jupiter.api.Assertions

ebms-provider/src/test/kotlin/no/nav/emottak/ebms/EbmsRouteSyncIT.kt

@@ -35,7 +35,7 @@ import no.nav.emottak.message.model.SendInResponse
 import no.nav.emottak.message.model.SignatureDetails
 import no.nav.emottak.message.model.ValidationResult
 import no.nav.emottak.util.decodeBase64
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.apache.xml.security.algorithms.MessageDigestAlgorithm
 import org.apache.xml.security.signature.XMLSignature
 import org.junit.jupiter.api.Test

felles/build.gradle.kts

@@ -28,7 +28,7 @@ tasks {
 
 dependencies {
     implementation(project(":ebxml-processing-model"))
-    implementation("no.nav.emottak:emottak-utils:0.1.0")
+    implementation(libs.emottak.utils)
     implementation(libs.ebxml.protokoll)
     implementation(libs.emottak.payload.xsd)
     implementation(libs.guava)

felles/src/main/kotlin/no/nav/emottak/crypto/FileKeyStoreConfig.kt

@@ -1,6 +1,6 @@
 package no.nav.emottak.crypto
 
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.io.FileInputStream

felles/src/main/kotlin/no/nav/emottak/vault/VaultUtil.kt

@@ -6,7 +6,7 @@ import com.bettercloud.vault.VaultConfig
 import com.bettercloud.vault.VaultException
 import com.bettercloud.vault.response.AuthResponse
 import com.bettercloud.vault.response.LookupResponse
-import no.nav.emottak.utils.getEnvVar
+import no.nav.emottak.utils.environment.getEnvVar
 import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Paths

settings.gradle.kts

@@ -21,7 +21,7 @@ dependencyResolutionManagement {
             version("hoplite", "2.8.2")
             version("logback", "1.5.17")
             version("logstash", "8.0")
-            version("emottak-utils", "0.1.0")
+            version("emottak-utils", "0.2.0")
 
             library("bcpkix-jdk18on", "org.bouncycastle", "bcpkix-jdk18on").versionRef("bouncycastle")
             library("bcprov-jdk18on", "org.bouncycastle", "bcprov-jdk18on").versionRef("bouncycastle")