Skip to content

Commit 0c6cb0b

Browse files
authored
Rename index.mapping.patterned_text.disable_templating (#135049)
* Rename index.mapping.patterned_text.disable_templating * Undo action removal
1 parent 1d17ce6 commit 0c6cb0b

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextLicenseDowngradeIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
public class PatternTextLicenseDowngradeIT extends DataStreamLicenseChangeTestCase {
2222
@Before
2323
public void checkClusterFeature() {
24-
assumeTrue("[pattern_text] must be available", clusterHasFeature("mapper.patterned_text"));
25-
assumeTrue("[pattern_text] is only available in snapshot builds", Build.current().isSnapshot());
24+
assumeTrue("[patterned_text] must be available", clusterHasFeature("mapper.patterned_text"));
25+
assumeTrue("[patterned_text] is only available in snapshot builds", Build.current().isSnapshot());
2626
}
2727

2828
private static final String patternTextMapping = """
@@ -48,7 +48,7 @@ public void testLicenseDowngrade() throws IOException {
4848

4949
String backingIndex0 = getDataStreamBackingIndex(client(), dataStreamName, 0);
5050
{
51-
assertEquals("false", getSetting(client(), backingIndex0, "index.mapping.patterned_text.disable_templating"));
51+
assertEquals("false", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating"));
5252
Map<String, Object> mapping = getMapping(client(), backingIndex0);
5353
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
5454
"pattern_field"
@@ -60,7 +60,7 @@ public void testLicenseDowngrade() throws IOException {
6060
rolloverDataStream(client(), dataStreamName);
6161

6262
{
63-
assertEquals("false", getSetting(client(), backingIndex0, "index.mapping.patterned_text.disable_templating"));
63+
assertEquals("false", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating"));
6464
Map<String, Object> mapping = getMapping(client(), backingIndex0);
6565
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
6666
"pattern_field"
@@ -70,7 +70,7 @@ public void testLicenseDowngrade() throws IOException {
7070

7171
String backingIndex1 = getDataStreamBackingIndex(client(), dataStreamName, 1);
7272
{
73-
assertEquals("true", getSetting(client(), backingIndex1, "index.mapping.patterned_text.disable_templating"));
73+
assertEquals("true", getSetting(client(), backingIndex1, "index.mapping.pattern_text.disable_templating"));
7474
Map<String, Object> mapping = getMapping(client(), backingIndex1);
7575
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
7676
"pattern_field"

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextLicenseUpgradeIT.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
public class PatternTextLicenseUpgradeIT extends DataStreamLicenseChangeTestCase {
2222
@Before
2323
public void checkClusterFeature() {
24-
assumeTrue("[pattern_text] must be available", clusterHasFeature("mapper.patterned_text"));
25-
assumeTrue("[pattern_text] is only available in snapshot builds", Build.current().isSnapshot());
24+
assumeTrue("[patterned_text] must be available", clusterHasFeature("mapper.patterned_text"));
25+
assumeTrue("[patterned_text] is only available in snapshot builds", Build.current().isSnapshot());
2626
}
2727

2828
private static final String patternTextMapping = """
@@ -47,7 +47,7 @@ public void testLicenseUpgrade() throws IOException {
4747

4848
String backingIndex0 = getDataStreamBackingIndex(client(), dataStreamName, 0);
4949
{
50-
assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.patterned_text.disable_templating"));
50+
assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating"));
5151
Map<String, Object> mapping = getMapping(client(), backingIndex0);
5252
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
5353
"pattern_field"
@@ -59,7 +59,7 @@ public void testLicenseUpgrade() throws IOException {
5959
rolloverDataStream(client(), dataStreamName);
6060

6161
{
62-
assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.patterned_text.disable_templating"));
62+
assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating"));
6363
Map<String, Object> mapping = getMapping(client(), backingIndex0);
6464
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
6565
"pattern_field"
@@ -69,7 +69,7 @@ public void testLicenseUpgrade() throws IOException {
6969

7070
String backingIndex1 = getDataStreamBackingIndex(client(), dataStreamName, 1);
7171
{
72-
assertEquals("false", getSetting(client(), backingIndex1, "index.mapping.patterned_text.disable_templating"));
72+
assertEquals("false", getSetting(client(), backingIndex1, "index.mapping.pattern_text.disable_templating"));
7373
Map<String, Object> mapping = getMapping(client(), backingIndex1);
7474
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
7575
"pattern_field"

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class PatternTextFieldMapper extends FieldMapper {
5858
* no valid enterprise license.
5959
*/
6060
public static final Setting<Boolean> DISABLE_TEMPLATING_SETTING = Setting.boolSetting(
61-
"index.mapping.patterned_text.disable_templating",
61+
"index.mapping.pattern_text.disable_templating",
6262
false,
6363
Setting.Property.IndexScope,
6464
Setting.Property.PrivateIndex

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapperTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public void testDisableTemplatingParameterWhenDisallowedByLicense() throws IOExc
274274
e.getMessage(),
275275
containsString(
276276
"value [false] for mapping parameter [disable_templating] contradicts value [true] for index "
277-
+ "setting [index.mapping.patterned_text.disable_templating]"
277+
+ "setting [index.mapping.pattern_text.disable_templating]"
278278
)
279279
);
280280
}

0 commit comments

Comments
 (0)