From 2b40d38815dc2a64d9e71bed19f6a53f09481f35 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Thu, 25 Oct 2018 09:32:26 -0600
Subject: [PATCH 1/2] Enhance deprecation message when index name contains ':'

The message was a little unclear in that we will still support indices that have
a ':' in the name in 7.0, we will only prevent index creation containing a ':'

Relates to https://github.com/elastic/elasticsearch/issues/23892#issuecomment-432917004
---
 .../cluster/metadata/MetaDataCreateIndexService.java           | 3 ++-
 .../cluster/metadata/MetaDataCreateIndexServiceTests.java      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index ceff3af430eab..87ff84e860464 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -169,7 +169,8 @@ public static void validateIndexOrAliasName(String index, BiFunction<String, Str
         }
         if (index.contains(":")) {
             deprecationLogger.deprecated("index or alias name [" + index +
-                            "] containing ':' is deprecated and will not be supported in Elasticsearch 7.0+");
+                            "] containing ':' is deprecated. Elasticsearch 7.0+ will read, " +
+                            "but not allow creation of new indices containing ':'");
         }
         if (index.charAt(0) == '_' || index.charAt(0) == '-' || index.charAt(0) == '+') {
             throw exceptionCtor.apply(index, "must not start with '_', '-', or '+'");
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
index 336075f23bbb2..a1fac172d210a 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
@@ -415,7 +415,8 @@ public void testValidateIndexName() throws Exception {
 
         MetaDataCreateIndexService.validateIndexName("foo:bar", ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING
                         .getDefault(Settings.EMPTY)).build());
-        assertWarnings("index or alias name [foo:bar] containing ':' is deprecated and will not be supported in Elasticsearch 7.0+");
+        assertWarnings("index or alias name [foo:bar] containing ':' is deprecated. Elasticsearch 7.0+ will read, " +
+                        "but not allow creation of new indices containing ':'");
     }
 
     private void validateIndexName(String indexName, String errorMessage) {

From fb9e0d850f52d952b847b7bad8d56a9a5af83f71 Mon Sep 17 00:00:00 2001
From: Lee Hinman <lee@writequit.org>
Date: Thu, 1 Nov 2018 09:58:59 -0600
Subject: [PATCH 2/2] 7.0+ -> 7.x

---
 .../cluster/metadata/MetaDataCreateIndexService.java            | 2 +-
 .../cluster/metadata/MetaDataCreateIndexServiceTests.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index 87ff84e860464..2a7c1240cffde 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -169,7 +169,7 @@ public static void validateIndexOrAliasName(String index, BiFunction<String, Str
         }
         if (index.contains(":")) {
             deprecationLogger.deprecated("index or alias name [" + index +
-                            "] containing ':' is deprecated. Elasticsearch 7.0+ will read, " +
+                            "] containing ':' is deprecated. Elasticsearch 7.x will read, " +
                             "but not allow creation of new indices containing ':'");
         }
         if (index.charAt(0) == '_' || index.charAt(0) == '-' || index.charAt(0) == '+') {
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
index a1fac172d210a..ffe6848b9fa65 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java
@@ -415,7 +415,7 @@ public void testValidateIndexName() throws Exception {
 
         MetaDataCreateIndexService.validateIndexName("foo:bar", ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING
                         .getDefault(Settings.EMPTY)).build());
-        assertWarnings("index or alias name [foo:bar] containing ':' is deprecated. Elasticsearch 7.0+ will read, " +
+        assertWarnings("index or alias name [foo:bar] containing ':' is deprecated. Elasticsearch 7.x will read, " +
                         "but not allow creation of new indices containing ':'");
     }