From b8e775aa8846c5720c8b328ecf4760b8f1237bfd Mon Sep 17 00:00:00 2001
From: Mark Vulfson <mvulfson@netflix.com>
Date: Wed, 26 Feb 2020 13:52:14 -0800
Subject: [PATCH] chore(dependencies): Manual bump korkVersion to 7.21.0 (#565)

---
 .../spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy | 5 +++--
 gradle.properties                                            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fiat-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy b/fiat-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy
index 59ea44304..0ff692aff 100644
--- a/fiat-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy
+++ b/fiat-api/src/test/groovy/com/netflix/spinnaker/fiat/shared/FiatPermissionEvaluatorSpec.groovy
@@ -24,6 +24,7 @@ import com.netflix.spinnaker.fiat.model.resources.Resource
 import com.netflix.spinnaker.fiat.model.resources.ResourceType
 import com.netflix.spinnaker.fiat.model.resources.Role
 import com.netflix.spinnaker.fiat.model.resources.ServiceAccount
+import com.netflix.spinnaker.kork.common.Header
 import com.netflix.spinnaker.security.AuthenticatedRequest
 import org.slf4j.MDC
 import org.springframework.security.core.context.SecurityContextHolder
@@ -155,8 +156,8 @@ class FiatPermissionEvaluatorSpec extends FiatSharedSpecification {
   @Unroll
   def "should support legacy fallback when fiat is unavailable"() {
     given:
-    MDC.put(AuthenticatedRequest.Header.USER.header, "fallback")
-    MDC.put(AuthenticatedRequest.Header.ACCOUNTS.header, "account1,account2")
+    MDC.put(Header.USER.header, "fallback")
+    MDC.put(Header.ACCOUNTS.header, "account1,account2")
 
     when:
     def permission = evaluator.getPermission("testUser")
diff --git a/gradle.properties b/gradle.properties
index 135030231..823b563b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 #Tue Jan 28 20:41:47 UTC 2020
 enablePublishing=false
-korkVersion=7.15.1
+korkVersion=7.21.0
 spinnakerGradleVersion=7.1.1
 includeProviders=file,github,google-groups,ldap
 org.gradle.parallel=true