Merge pull request #712 from navikt/dev/unleash-next

Dev/unleash next

.github/workflows/deploy.yml

@@ -98,3 +98,23 @@ jobs:
 #          tag_name: release/prod@${{ env.TAG }}
 #          name: Release to prod
 #          prerelease: false
+
+  apply-apitoken-unleash:
+    name: Legger til ApiToken for Unleash
+    runs-on: ubuntu-latest
+    needs: [test-build-and-push]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: deploy to dev
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: dev-gcp
+          RESOURCE: nais/unleash-apitoken-dev.yaml
+      - name: deploy to prod
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: prod-gcp
+          RESOURCE: nais/unleash-apitoken-prod.yaml

nais/nais-dev-gcp.yaml

@@ -17,6 +17,7 @@ spec:
     enabled: true
   envFrom:
     - secret: veilarbregistrering
+    - secret: veilarbregistrering-unleash-api-token
   image: {{image}}
   ingresses:
     - https://veilarbregistrering.intern.dev.nav.no
@@ -65,6 +66,8 @@ spec:
       value: https://ereg-services-q1.dev-fss-pub.nais.io/ereg
     - name: SPRING_PROFILES_ACTIVE
       value: gcp
+    - name: UNLEASH_SERVER_API_URL
+      value: https://paw-unleash-api.nav.cloud.nais.io/api
   leaderElection: true
   kafka:
     pool: nav-dev
@@ -137,6 +140,7 @@ spec:
         - host: norg2.dev-fss-pub.nais.io
         - host: oppgave-q1.dev-fss-pub.nais.io
         - host: ereg-services-q1.dev-fss-pub.nais.io
+        - host: paw-unleash-api.nav.cloud.nais.io
       rules:
         - application: aareg-services-nais-q1
           namespace: arbeidsforhold

nais/nais-prod-gcp.yaml

@@ -17,6 +17,7 @@ spec:
     enabled: true
   envFrom:
     - secret: veilarbregistrering
+    - secret: veilarbregistrering-unleash-api-token
   image: {{image}}
   ingresses:
     - https://veilarbregistrering.intern.nav.no
@@ -65,6 +66,8 @@ spec:
       value: https://ereg-services.prod-fss-pub.nais.io/ereg
     - name: SPRING_PROFILES_ACTIVE
       value: gcp
+    - name: UNLEASH_SERVER_API_URL
+      value: https://paw-unleash-api.nav.cloud.nais.io/api
   leaderElection: true
   kafka:
     pool: nav-prod
@@ -133,6 +136,7 @@ spec:
         - host: norg2.prod-fss-pub.nais.io
         - host: oppgave.prod-fss-pub.nais.io
         - host: ereg-services.prod-fss-pub.nais.io
+        - host: paw-unleash-api.nav.cloud.nais.io
       rules:
         - application: aareg-services-nais
           namespace: arbeidsforhold

nais/unleash-apitoken-dev.yaml

@@ -0,0 +1,14 @@
+apiVersion: unleash.nais.io/v1
+kind: ApiToken
+metadata:
+  name: veilarbregistrering-unleash
+  namespace: paw
+  labels:
+    "team": "paw"
+spec:
+  unleashInstance:
+    apiVersion: unleash.nais.io/v1
+    kind: RemoteUnleash
+    name: paw
+  secretName: veilarbregistrering-unleash-api-token
+  environment: development

nais/unleash-apitoken-prod.yaml

@@ -0,0 +1,14 @@
+apiVersion: unleash.nais.io/v1
+kind: ApiToken
+metadata:
+  name: veilarbregistrering-unleash
+  namespace: paw
+  labels:
+    "team": "paw"
+spec:
+  unleashInstance:
+    apiVersion: unleash.nais.io/v1
+    kind: RemoteUnleash
+    name: paw
+  secretName: veilarbregistrering-unleash-api-token
+  environment: production

pom.xml

@@ -76,11 +76,6 @@
             <artifactId>job</artifactId>
             <version>${common.version}</version>
         </dependency>
-        <dependency>
-            <groupId>no.nav.common</groupId>
-            <artifactId>feature-toggle</artifactId>
-            <version>${common.version}</version>
-        </dependency>
         <dependency>
             <groupId>no.nav.common</groupId>
             <artifactId>token-client</artifactId>
@@ -188,6 +183,11 @@
             <scope>runtime</scope>
             <version>1</version>
         </dependency>
+        <dependency>
+            <groupId>io.getunleash</groupId>
+            <artifactId>unleash-client-java</artifactId>
+            <version>9.1.1</version>
+        </dependency>
 
 
         <!-- Test dependencies -->

src/main/kotlin/no/nav/fo/veilarbregistrering/arbeidssoker/formidlingsgruppe/kafka/FormidlingsgruppeKafkaConsumer.kt

@@ -1,6 +1,7 @@
 package no.nav.fo.veilarbregistrering.arbeidssoker.formidlingsgruppe.kafka
 
-import no.nav.common.featuretoggle.UnleashClient
+import io.getunleash.DefaultUnleash
+import io.getunleash.Unleash
 import no.nav.common.log.MDCConstants
 import no.nav.fo.veilarbregistrering.arbeidssoker.formidlingsgruppe.FormidlingsgruppeMottakService
 import no.nav.fo.veilarbregistrering.arbeidssoker.formidlingsgruppe.kafka.FormidlingsgruppeMapper.Companion.map
@@ -25,7 +26,7 @@ class FormidlingsgruppeKafkaConsumer internal constructor(
     private val kafkaConsumerProperties: Properties,
     private val topic: String,
     private val formidlingsgruppeMottakService: FormidlingsgruppeMottakService,
-    private val unleashClient: UnleashClient
+    private val unleashClient: Unleash
 ) : Runnable {
     init {
         val forsinkelseIMinutterVedOppstart = 5
@@ -96,4 +97,4 @@ class FormidlingsgruppeKafkaConsumer internal constructor(
         private const val mdcTopicKey = "topic"
         private const val KILL_SWITCH_TOGGLE_NAME = "veilarbregistrering.stopKonsumeringAvFormidlingsgruppe"
     }
-}
+}

src/main/kotlin/no/nav/fo/veilarbregistrering/arbeidssoker/meldekort/kafka/MeldekortKafkaConsumer.kt

@@ -1,6 +1,6 @@
 package no.nav.fo.veilarbregistrering.arbeidssoker.meldekort.kafka
 
-import no.nav.common.featuretoggle.UnleashClient
+import io.getunleash.Unleash
 import no.nav.common.log.MDCConstants
 import no.nav.fo.veilarbregistrering.arbeidssoker.meldekort.MeldekortMottakService
 import no.nav.fo.veilarbregistrering.config.objectMapper
@@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit
 class MeldekortKafkaConsumer internal constructor(
     private val kafkaConsumerProperties: Properties,
     private val topic: String,
-    private val unleashClient: UnleashClient,
+    private val unleashClient: Unleash,
     private val meldekortMottakService: MeldekortMottakService
 ) : Runnable {
     init {
@@ -93,4 +93,4 @@ class MeldekortKafkaConsumer internal constructor(
         private const val KILL_SWITCH_TOGGLE_NAME = "veilarbregistrering.stopKonsumeringAvMeldekort"
     }
 
-}
+}

src/main/kotlin/no/nav/fo/veilarbregistrering/config/ServiceBeansConfig.kt

@@ -1,7 +1,7 @@
 package no.nav.fo.veilarbregistrering.config
 
+import io.getunleash.Unleash
 import no.nav.common.auth.context.AuthContextHolder
-import no.nav.common.featuretoggle.UnleashClient
 import no.nav.common.health.selftest.SelfTestChecks
 import no.nav.common.job.leader_election.LeaderElectionClient
 import no.nav.fo.veilarbregistrering.aktorIdCache.AktorIdCacheService
@@ -189,7 +189,7 @@ class ServiceBeansConfig {
     fun sykmeldtResource(
         tilgangskontrollService: TilgangskontrollService,
         userService: UserService,
-        unleashClient: UnleashClient,
+        unleashClient: Unleash,
         sykmeldtRegistreringService: SykmeldtRegistreringService,
         navVeilederService: NavVeilederService,
     ): SykmeldtResource {
@@ -201,7 +201,7 @@ class ServiceBeansConfig {
     @Bean
     fun reaktiveringResource(
         userService: UserService,
-        unleashClient: UnleashClient,
+        unleashClient: Unleash,
         tilgangskontrollService: TilgangskontrollService,
         reaktiveringBrukerService: ReaktiveringBrukerService
     ): ReaktiveringResource {
@@ -216,7 +216,7 @@ class ServiceBeansConfig {
         userService: UserService,
         brukerRegistreringService: BrukerRegistreringService,
         navVeilederService: NavVeilederService,
-        unleashClient: UnleashClient
+        unleashClient: Unleash
     ): OrdinaerBrukerRegistreringResource {
         return OrdinaerBrukerRegistreringResource(
             tilgangskontrollService, userService, brukerRegistreringService, navVeilederService, unleashClient
@@ -259,7 +259,7 @@ class ServiceBeansConfig {
     }
 
     @Bean
-    fun featuretoggleResource(unleashClient: UnleashClient): FeaturetoggleResource {
+    fun featuretoggleResource(unleashClient: Unleash): FeaturetoggleResource {
         return FeaturetoggleResource(unleashClient)
     }
 

src/main/kotlin/no/nav/fo/veilarbregistrering/featuretoggle/UnleashConfig.kt

@@ -1,9 +1,8 @@
 package no.nav.fo.veilarbregistrering.featuretoggle
 
-import no.nav.common.auth.context.AuthContextHolder
-import no.nav.common.featuretoggle.UnleashClient
-import no.nav.common.featuretoggle.UnleashClientImpl
-import no.nav.fo.veilarbregistrering.config.requireApplicationName
+import io.getunleash.DefaultUnleash
+import io.getunleash.Unleash
+import io.getunleash.util.UnleashConfig
 import no.nav.fo.veilarbregistrering.config.requireProperty
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
@@ -12,15 +11,20 @@ import org.springframework.context.annotation.Configuration
 class UnleashConfig {
 
     @Bean
-    fun unleashClient(authContextHolder: AuthContextHolder): UnleashClient {
-        return UnleashClientImpl(
-            requireProperty(UNLEASH_API_URL_PROPERTY),
-            requireApplicationName(),
-            listOf(ByUserIdStrategy(authContextHolder))
-        )
+    fun unleashClient(): Unleash {
+        val config = UnleashConfig.builder()
+            .appName(APP_NAME)
+            .instanceId(APP_NAME)
+            .unleashAPI(requireProperty(UNLEASH_SERVER_API_URL))
+            .apiKey(requireProperty(UNLEASH_SERVER_API_TOKEN))
+            .build()
+
+        return DefaultUnleash(config)
     }
 
     companion object {
-        const val UNLEASH_API_URL_PROPERTY = "UNLEASH_API_URL"
+        const val UNLEASH_SERVER_API_URL = "UNLEASH_SERVER_API_URL"
+        const val UNLEASH_SERVER_API_TOKEN = "UNLEASH_SERVER_API_TOKEN"
+        const val APP_NAME = "veilarbregistrering"
     }
-}
+}

src/main/kotlin/no/nav/fo/veilarbregistrering/featuretoggle/resources/FeaturetoggleResource.kt

@@ -1,15 +1,15 @@
 package no.nav.fo.veilarbregistrering.featuretoggle.resources
 
-import no.nav.common.featuretoggle.UnleashClient
+import io.getunleash.Unleash
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
-class FeaturetoggleResource(private val unleashClient: UnleashClient) {
+class FeaturetoggleResource(private val unleashClient: Unleash) {
 
     @GetMapping("/api/featuretoggle")
     fun hentFeatureToggles(@RequestParam("feature") vararg featureName: String): Map<String, Boolean> {
         return featureName.associateWith { unleashClient.isEnabled(it) }
     }
-}
+}

src/main/kotlin/no/nav/fo/veilarbregistrering/helsesjekk/HelsesjekkConfig.kt

@@ -1,7 +1,6 @@
 package no.nav.fo.veilarbregistrering.helsesjekk
 
 import no.nav.common.abac.Pep
-import no.nav.common.featuretoggle.UnleashClient
 import no.nav.common.health.selftest.SelfTestCheck
 import no.nav.common.health.selftest.SelfTestChecks
 import no.nav.common.health.selftest.SelfTestMeterBinder
@@ -23,7 +22,7 @@ class HelsesjekkConfig {
     fun selfTestChecks(
         dbHelsesjekk: DatabaseHelsesjekk,
         veilarbPep: Pep,
-        unleashClient: UnleashClient,
+//        unleashClient: Unleash,
         oppfolgingClient: OppfolgingClient,
         krrClient: DigDirKrrProxyClient,
         aaregRestClient: AaregRestClient,
@@ -35,7 +34,7 @@ class HelsesjekkConfig {
         val selfTestChecks = listOf(
             SelfTestCheck("Ping (sporring) mot Databasen til veilarregistrering.", true, dbHelsesjekk),
             SelfTestCheck("Ping mot ABAC tilgangskontroll", true, veilarbPep.abacClient),
-            SelfTestCheck("Ping mot Unleash (tilbyr feature-toggles)", false, unleashClient),
+//            SelfTestCheck("Ping mot Unleash (tilbyr feature-toggles)", false, unleashClient),
             SelfTestCheck("Ping Oppfolging", false, oppfolgingClient),
             SelfTestCheck("Ping Kontakt og reservasjonsregisteret (KRR)", false, krrClient),
             SelfTestCheck("Ping Arbeid og arbeidstager registeret (Aareg)", false, aaregRestClient),

src/main/kotlin/no/nav/fo/veilarbregistrering/kafka/KafkaConfig.kt

@@ -4,9 +4,9 @@ import io.confluent.kafka.schemaregistry.client.SchemaRegistryClientConfig
 import io.confluent.kafka.serializers.KafkaAvroDeserializerConfig
 import io.confluent.kafka.serializers.KafkaAvroSerializer
 import io.confluent.kafka.serializers.KafkaAvroSerializerConfig
+import io.getunleash.Unleash
 import no.nav.arbeid.soker.profilering.ArbeidssokerProfilertEvent
 import no.nav.arbeid.soker.registrering.ArbeidssokerRegistrertEvent
-import no.nav.common.featuretoggle.UnleashClient
 import no.nav.fo.veilarbregistrering.arbeidssoker.formidlingsgruppe.FormidlingsgruppeMottakService
 import no.nav.fo.veilarbregistrering.arbeidssoker.formidlingsgruppe.kafka.FormidlingsgruppeKafkaConsumer
 import no.nav.fo.veilarbregistrering.arbeidssoker.meldekort.MeldekortMottakService
@@ -82,7 +82,7 @@ class KafkaConfig {
 
     @Bean
     fun formidlingsgruppeKafkaConsumer(
-        unleashClient: UnleashClient,
+        unleashClient: Unleash,
         formidlingsgruppeMottakService: FormidlingsgruppeMottakService
     ): FormidlingsgruppeKafkaConsumer {
         val envSuffix = if (isProduction()) "p" else "q"
@@ -100,7 +100,7 @@ class KafkaConfig {
 
     @Bean
     fun meldekortKafkaConsumer(
-        unleashClient: UnleashClient,
+        unleashClient: Unleash,
         meldekortMottakService: MeldekortMottakService
     ): MeldekortKafkaConsumer {
         val envSuffix = if (isProduction()) "p" else "q1"

src/main/kotlin/no/nav/fo/veilarbregistrering/registrering/ordinaer/resources/OrdinaerBrukerRegistreringResource.kt

@@ -1,6 +1,6 @@
 package no.nav.fo.veilarbregistrering.registrering.ordinaer.resources
 
-import no.nav.common.featuretoggle.UnleashClient
+import io.getunleash.Unleash
 import no.nav.fo.veilarbregistrering.autorisasjon.TilgangskontrollService
 import no.nav.fo.veilarbregistrering.bruker.UserService
 import no.nav.fo.veilarbregistrering.registrering.ordinaer.BrukerRegistreringService
@@ -18,7 +18,7 @@ class OrdinaerBrukerRegistreringResource(
     private val userService: UserService,
     private val brukerRegistreringService: BrukerRegistreringService,
     private val navVeilederService: NavVeilederService,
-    private val unleashClient: UnleashClient
+    private val unleashClient: Unleash
 ) : OrdinaerBrukerRegistreringApi {
 
     @PostMapping("/fullfoerordinaerregistrering")
@@ -38,4 +38,4 @@ class OrdinaerBrukerRegistreringResource(
     }
 
     private fun tjenesteErNede(): Boolean = unleashClient.isEnabled("arbeidssokerregistrering.nedetid")
-}
+}