Rename the Template DEFAULT to DATA_DEFAULT

gmarouli · gmarouli · commit 4c6c41ee0311 · 2025-04-08T15:32:41.000+03:00
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java
@@ -146,7 +146,7 @@ public void cleanup() {
 
     public void testRolloverLifecycle() throws Exception {
         // empty lifecycle contains the default rollover
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         putComposableIndexTemplate("id1", null, List.of("metrics-foo*"), null, null, lifecycle, false);
         String dataStreamName = "metrics-foo";
@@ -353,7 +353,7 @@ public void testOriginationDate() throws Exception {
     }
 
     public void testUpdatingLifecycleAppliesToAllBackingIndices() throws Exception {
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         putComposableIndexTemplate("id1", null, List.of("metrics-foo*"), null, null, lifecycle, false);
 
@@ -384,7 +384,7 @@ public void testAutomaticForceMerge() throws Exception {
          * because all necessary merging has already happened automatically. So in order to detect whether forcemerge has been called, we
          * use a SendRequestBehavior in the MockTransportService to detect it.
          */
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         disableDataStreamLifecycle();
         String dataStreamName = "metrics-foo";
         putComposableIndexTemplate(
@@ -477,7 +477,7 @@ private static void disableDataStreamLifecycle() {
 
     public void testErrorRecordingOnRollover() throws Exception {
         // empty lifecycle contains the default rollover
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         /*
          * We set index.auto_expand_replicas to 0-1 so that if we get a single-node cluster it is not yellow. The cluster being yellow
          * could result in data stream lifecycle's automatic forcemerge failing, which would result in an unexpected error in the error
@@ -613,7 +613,7 @@ public void testErrorRecordingOnRollover() throws Exception {
     public void testErrorRecordingOnRetention() throws Exception {
         // starting with a lifecycle without retention so we can rollover the data stream and manipulate the second generation index such
         // that its retention execution fails
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         /*
          * We set index.auto_expand_replicas to 0-1 so that if we get a single-node cluster it is not yellow. The cluster being yellow
@@ -750,7 +750,7 @@ public void testErrorRecordingOnRetention() throws Exception {
     }
 
     public void testDataLifecycleServiceConfiguresTheMergePolicy() throws Exception {
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         putComposableIndexTemplate(
             "id1",
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/ExplainDataStreamLifecycleIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/ExplainDataStreamLifecycleIT.java
@@ -92,7 +92,7 @@ public void cleanup() {
 
     public void testExplainLifecycle() throws Exception {
         // empty lifecycle contains the default rollover
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         putComposableIndexTemplate("id1", null, List.of("metrics-foo*"), null, null, lifecycle);
         String dataStreamName = "metrics-foo";
@@ -264,7 +264,7 @@ public void testExplainFailuresLifecycle() throws Exception {
             List.of("metrics-foo*"),
             null,
             null,
-            DataStreamLifecycle.Template.DEFAULT,
+            DataStreamLifecycle.Template.DATA_DEFAULT,
             new DataStreamOptions.Template(new DataStreamFailureStore.Template(true))
         );
         String dataStreamName = "metrics-foo";
@@ -381,7 +381,7 @@ public void testExplainFailuresLifecycle() throws Exception {
 
     public void testExplainLifecycleForIndicesWithErrors() throws Exception {
         // empty lifecycle contains the default rollover
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         putComposableIndexTemplate(
             "id1",
diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java
@@ -156,7 +156,7 @@ public void testLifecycleComposition() {
         // Enabled is always true unless it's explicitly set to false
         {
             DataStreamLifecycle.Template lifecycle = new DataStreamLifecycle.Template(false, randomPositiveTimeValue(), randomRounds());
-            List<DataStreamLifecycle.Template> lifecycles = List.of(lifecycle, DataStreamLifecycle.Template.DEFAULT);
+            List<DataStreamLifecycle.Template> lifecycles = List.of(lifecycle, DataStreamLifecycle.Template.DATA_DEFAULT);
             DataStreamLifecycle result = composeDataLifecycles(lifecycles).build();
             assertThat(result.enabled(), equalTo(true));
             assertThat(result.dataRetention(), equalTo(lifecycle.dataRetention().get()));
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java
@@ -348,7 +348,7 @@ public static Template resolveTemplate(
         DataStreamLifecycle.Builder lifecycleBuilder = resolveLifecycle(simulatedProject, matchingTemplate);
         DataStreamLifecycle.Template lifecycle = lifecycleBuilder == null ? null : lifecycleBuilder.buildTemplate();
         if (template.getDataStreamTemplate() != null && lifecycle == null && isDslOnlyMode) {
-            lifecycle = DataStreamLifecycle.Template.DEFAULT;
+            lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         }
         DataStreamOptions.Builder optionsBuilder = resolveDataStreamOptions(simulatedProject, matchingTemplate);
         return new Template(
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
@@ -562,7 +562,7 @@ public Template(boolean enabled, TimeValue dataRetention, List<DataStreamLifecyc
             }
         }
 
-        public static final DataStreamLifecycle.Template DEFAULT = new DataStreamLifecycle.Template(
+        public static final DataStreamLifecycle.Template DATA_DEFAULT = new DataStreamLifecycle.Template(
             true,
             ResettableValue.undefined(),
             ResettableValue.undefined()
diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/get/GetComponentTemplateResponseTests.java
@@ -39,7 +39,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
         Settings settings = null;
         CompressedXContent mappings = null;
         Map<String, AliasMetadata> aliases = null;
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         ResettableValue<DataStreamOptions.Template> dataStreamOptions = ResettableValue.undefined();
         if (randomBoolean()) {
             settings = randomSettings();
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java
@@ -286,7 +286,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
         if (randomBoolean()) {
             dataStreamOptions = randomDataStreamOptionsTemplate();
         }
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         ComponentTemplate template = new ComponentTemplate(
             new Template(settings, mappings, aliases, lifecycle, dataStreamOptions),
             randomNonNegativeLong(),
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java
@@ -236,7 +236,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
             dataStreamOptions = ComponentTemplateTests.randomDataStreamOptionsTemplate();
         }
         // We use the empty lifecycle so the global retention can be in effect
-        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
         Template template = new Template(settings, mappings, aliases, lifecycle, dataStreamOptions);
         ComposableIndexTemplate.builder()
             .indexPatterns(List.of(randomAlphaOfLength(4)))
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleWithRetentionWarningsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamLifecycleWithRetentionWarningsTests.java
@@ -173,7 +173,7 @@ public void testValidateLifecycleIndexTemplateWithWarning() {
             ProjectMetadata.builder(randomProjectIdOrDefault()).build(),
             randomAlphaOfLength(10),
             ComposableIndexTemplate.builder()
-                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DEFAULT))
+                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DATA_DEFAULT))
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate())
                 .indexPatterns(List.of(randomAlphaOfLength(10)))
                 .build(),
@@ -199,7 +199,7 @@ public void testValidateInternalDataStreamRetentionWithoutWarning() {
             ProjectMetadata.builder(randomProjectIdOrDefault()).build(),
             randomAlphaOfLength(10),
             ComposableIndexTemplate.builder()
-                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DEFAULT))
+                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DATA_DEFAULT))
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate())
                 .indexPatterns(List.of("." + randomAlphaOfLength(10)))
                 .build(),
@@ -233,7 +233,7 @@ public void testValidateLifecycleComponentTemplateWithWarning() {
                 .build(),
             randomAlphaOfLength(10),
             ComposableIndexTemplate.builder()
-                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DEFAULT))
+                .template(Template.builder().lifecycle(DataStreamLifecycle.Template.DATA_DEFAULT))
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate())
                 .indexPatterns(List.of(randomAlphaOfLength(10)))
                 .componentTemplates(List.of("component-template"))
@@ -286,7 +286,7 @@ public void testValidateLifecycleInComponentTemplate() throws Exception {
         Template template = Template.builder()
             .settings(ComponentTemplateTests.randomSettings())
             .aliases(ComponentTemplateTests.randomAliases())
-            .lifecycle(DataStreamLifecycle.Template.DEFAULT)
+            .lifecycle(DataStreamLifecycle.Template.DATA_DEFAULT)
             .build();
         ComponentTemplate componentTemplate = new ComponentTemplate(template, 1L, new HashMap<>());
         project = metadataIndexTemplateService.addComponentTemplate(project, false, "foo", componentTemplate);
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java
@@ -1488,7 +1488,7 @@ public void testResolveLifecycle() throws Exception {
         MetadataIndexTemplateService service = getMetadataIndexTemplateService();
         ProjectMetadata project = ProjectMetadata.builder(randomProjectIdOrDefault()).build();
 
-        DataStreamLifecycle.Template emptyLifecycle = DataStreamLifecycle.Template.DEFAULT;
+        DataStreamLifecycle.Template emptyLifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;
 
         DataStreamLifecycle.Template lifecycle30d = DataStreamLifecycle.builder()
             .dataRetention(TimeValue.timeValueDays(30))
@@ -1565,7 +1565,7 @@ public void testResolveLifecycle() throws Exception {
         // Composable Z: -
         // Result: "lifecycle": {"enabled": true}, here the result of the composition is with retention explicitly
         // nullified, but effectively this is equivalent to infinite retention.
-        assertLifecycleResolution(service, project, List.of(ct30d, ctNullRetention), null, DataStreamLifecycle.Template.DEFAULT);
+        assertLifecycleResolution(service, project, List.of(ct30d, ctNullRetention), null, DataStreamLifecycle.Template.DATA_DEFAULT);
 
         // Component A: "lifecycle": {"enabled": true}
         // Component B: "lifecycle": {"retention": "45d", "downsampling": [{"after": "30d", "fixed_interval": "3h"}]}
diff --git a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/DataStreamAndIndexLifecycleMixingTests.java b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/DataStreamAndIndexLifecycleMixingTests.java
@@ -337,7 +337,7 @@ public void testUpdateIndexTemplateFromILMtoBothILMAndDataStreamLifecycle() thro
             List.of(dataStreamName + "*"),
             Settings.builder().put(LifecycleSettings.LIFECYCLE_NAME, policy).build(),
             null,
-            DataStreamLifecycle.Template.DEFAULT
+            DataStreamLifecycle.Template.DATA_DEFAULT
         );
 
         indexDocs(dataStreamName, 2);
@@ -385,7 +385,7 @@ public void testUpdateIndexTemplateFromILMtoBothILMAndDataStreamLifecycle() thro
             List.of(dataStreamName + "*"),
             Settings.builder().put(IndexSettings.PREFER_ILM, false).put(LifecycleSettings.LIFECYCLE_NAME, policy).build(),
             null,
-            DataStreamLifecycle.Template.DEFAULT
+            DataStreamLifecycle.Template.DATA_DEFAULT
         );
 
         // note that all indices now are still managed by ILM, so we index 2 documents. the new write index will be managed by the data
@@ -660,7 +660,7 @@ public void testUpdateIndexTemplateToMigrateFromDataStreamLifecycleToIlm() throw
             List.of(dataStreamName + "*"),
             null,
             null,
-            DataStreamLifecycle.Template.DEFAULT
+            DataStreamLifecycle.Template.DATA_DEFAULT
         );
 
         // this will create the data stream and trigger a rollover so we will end up with a data stream with 2 backing indices
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DataStreamLifecycleServiceRuntimeSecurityIT.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DataStreamLifecycleServiceRuntimeSecurityIT.java
@@ -95,7 +95,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
     public void testRolloverLifecycleAndForceMergeAuthorized() throws Exception {
         String dataStreamName = randomDataStreamName();
         // empty lifecycle contains the default rollover
-        prepareDataStreamAndIndex(dataStreamName, DataStreamLifecycle.Template.DEFAULT);
+        prepareDataStreamAndIndex(dataStreamName, DataStreamLifecycle.Template.DATA_DEFAULT);
 
         List<String> backingIndices = waitForDataStreamBackingIndices(dataStreamName, 2);
         String backingIndex = backingIndices.get(0);
@@ -130,7 +130,7 @@ public void testRolloverAndRetentionAuthorized() throws Exception {
     public void testUnauthorized() throws Exception {
         // this is an example index pattern for a system index that the data stream lifecycle does not have access for. Data stream
         // lifecycle will therefore fail at runtime with an authz exception
-        prepareDataStreamAndIndex(SECURITY_MAIN_ALIAS, DataStreamLifecycle.Template.DEFAULT);
+        prepareDataStreamAndIndex(SECURITY_MAIN_ALIAS, DataStreamLifecycle.Template.DATA_DEFAULT);
 
         assertBusy(() -> {
             Map<String, String> indicesAndErrors = collectErrorsFromStoreAsMap();

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void testLifecycleComposition() {`
`156`	`156`	`// Enabled is always true unless it's explicitly set to false`
`157`	`157`	`{`
`158`	`158`	`DataStreamLifecycle.Template lifecycle = new DataStreamLifecycle.Template(false, randomPositiveTimeValue(), randomRounds());`
`159`		`- List<DataStreamLifecycle.Template> lifecycles = List.of(lifecycle, DataStreamLifecycle.Template.DEFAULT);`
	`159`	`+ List<DataStreamLifecycle.Template> lifecycles = List.of(lifecycle, DataStreamLifecycle.Template.DATA_DEFAULT);`
`160`	`160`	`DataStreamLifecycle result = composeDataLifecycles(lifecycles).build();`
`161`	`161`	`assertThat(result.enabled(), equalTo(true));`
`162`	`162`	`assertThat(result.dataRetention(), equalTo(lifecycle.dataRetention().get()));`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ public static Template resolveTemplate(`
`348`	`348`	`DataStreamLifecycle.Builder lifecycleBuilder = resolveLifecycle(simulatedProject, matchingTemplate);`
`349`	`349`	`DataStreamLifecycle.Template lifecycle = lifecycleBuilder == null ? null : lifecycleBuilder.buildTemplate();`
`350`	`350`	`if (template.getDataStreamTemplate() != null && lifecycle == null && isDslOnlyMode) {`
`351`		`- lifecycle = DataStreamLifecycle.Template.DEFAULT;`
	`351`	`+ lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;`
`352`	`352`	`}`
`353`	`353`	`DataStreamOptions.Builder optionsBuilder = resolveDataStreamOptions(simulatedProject, matchingTemplate);`
`354`	`354`	`return new Template(`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ public Template(boolean enabled, TimeValue dataRetention, List<DataStreamLifecyc`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
`565`		`- public static final DataStreamLifecycle.Template DEFAULT = new DataStreamLifecycle.Template(`
	`565`	`+ public static final DataStreamLifecycle.Template DATA_DEFAULT = new DataStreamLifecycle.Template(`
`566`	`566`	`true,`
`567`	`567`	`ResettableValue.undefined(),`
`568`	`568`	`ResettableValue.undefined()`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws`
`286`	`286`	`if (randomBoolean()) {`
`287`	`287`	`dataStreamOptions = randomDataStreamOptionsTemplate();`
`288`	`288`	`}`
`289`		`- DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;`
	`289`	`+ DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;`
`290`	`290`	`ComponentTemplate template = new ComponentTemplate(`
`291`	`291`	`new Template(settings, mappings, aliases, lifecycle, dataStreamOptions),`
`292`	`292`	`randomNonNegativeLong(),`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws`
`236`	`236`	`dataStreamOptions = ComponentTemplateTests.randomDataStreamOptionsTemplate();`
`237`	`237`	`}`
`238`	`238`	`// We use the empty lifecycle so the global retention can be in effect`
`239`		`- DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;`
	`239`	`+ DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DATA_DEFAULT;`
`240`	`240`	`Template template = new Template(settings, mappings, aliases, lifecycle, dataStreamOptions);`
`241`	`241`	`ComposableIndexTemplate.builder()`
`242`	`242`	`.indexPatterns(List.of(randomAlphaOfLength(4)))`