Change the min supported version to 6.7.0 for API keys (#38481)

This commit changes the minimum supported version to 6.7.0 for API keys, the change for the API keys has been backported to 6.7.0 version #38399
elastic · Feb 6, 2019 · 5261673 · 5261673
1 parent e73c9c9
commit 5261673
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java
@@ -60,7 +60,7 @@ public Authentication(StreamInput in) throws IOException {
             this.lookedUpBy = null;
         }
         this.version = in.getVersion();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) { // TODO change to V6_6 after backport
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             type = AuthenticationType.values()[in.readVInt()];
             metadata = in.readMap();
         } else {
@@ -165,7 +165,7 @@ public void writeTo(StreamOutput out) throws IOException {
         } else {
             out.writeBoolean(false);
         }
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) { // TODO change to V6_6 after backport
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeVInt(type.ordinal());
             out.writeMap(metadata);
         }

diff --git a/...k/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java b/...k/plugin/security/src/main/java/org/elasticsearch/xpack/security/authc/ApiKeyService.java
@@ -194,11 +194,11 @@ public void createApiKey(Authentication authentication, CreateApiKeyRequest requ
                     final Instant expiration = getApiKeyExpiration(created, request);
                     final SecureString apiKey = UUIDs.randomBase64UUIDSecureString();
                     final Version version = clusterService.state().nodes().getMinNodeVersion();
-                    if (version.before(Version.V_7_0_0)) { // TODO(jaymode) change to V6_6_0 on backport!
+                    if (version.before(Version.V_6_7_0)) {
                         logger.warn(
                                 "nodes prior to the minimum supported version for api keys {} exist in the cluster;"
                                         + " these nodes will not be able to use api keys",
-                                Version.V_7_0_0);
+                                Version.V_6_7_0);
                     }
 
                     final char[] keyHash = hasher.hash(apiKey);