self-review

Author: szybia

modules/data-streams/src/test/java/org/elasticsearch/datastreams/MetadataIndexTemplateServiceTests.java

@@ -34,7 +34,6 @@
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -217,8 +216,7 @@ private MetadataIndexTemplateService getMetadataIndexTemplateService() {
             xContentRegistry(),
             EmptySystemIndices.INSTANCE,
             indexSettingProviders,
-            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings()),
-            Instant::now
+            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings())
         );
     }
 

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.component_template/20_tracking.yml

@@ -19,7 +19,7 @@ setup:
               number_of_shards: 1
           created_date: "2025-07-04T12:50:48.415Z"
   - match: { status: 400 }
-  - match: { error.reason: "Validation Failed: 1: Provided a pipeline property which is managed by the system: created_date.;" }
+  - match: { error.reason: "Validation Failed: 1: Provided a template property which is managed by the system: created_date;" }
 
 ---
 "Test PUT setting modified_date":
@@ -33,7 +33,7 @@ setup:
               number_of_shards: 1
           modified_date: "2025-07-04T12:50:48.415Z"
   - match: { status: 400 }
-  - match: { error.reason: "Validation Failed: 1: Provided a pipeline property which is managed by the system: modified_date.;" }
+  - match: { error.reason: "Validation Failed: 1: Provided a template property which is managed by the system: modified_date;" }
 
 ---
 "Test update preserves created_date but updates modified_date":
@@ -53,6 +53,7 @@ setup:
   - set: { component_templates.0.component_template.modified_date: first_modified }
   - match: { $first_created: "/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z$/" }
   - match: { $first_modified: "/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z$/" }
+  - match: { $first_created: $first_modified }
 
   - do:
       cluster.put_component_template:
@@ -66,7 +67,5 @@ setup:
       cluster.get_component_template:
         name: test_tracking
   - set: { component_templates.0.component_template.created_date: second_created }
-  - set: { component_templates.0.component_template.modified_date: second_modified }
   - match: { $second_created: $first_created }
-  - gt: { $second_modified: $first_modified }
 

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/PutComponentTemplateAction.java

@@ -81,13 +81,13 @@ public ActionRequestValidationException validate() {
             }
             if (componentTemplate.createdDateMillis().isPresent()) {
                 validationException = addValidationError(
-                    "Provided a pipeline property which is managed by the system: created_date.",
+                    "Provided a template property which is managed by the system: created_date",
                     validationException
                 );
             }
             if (componentTemplate.modifiedDateMillis().isPresent()) {
                 validationException = addValidationError(
-                    "Provided a pipeline property which is managed by the system: modified_date.",
+                    "Provided a template property which is managed by the system: modified_date",
                     validationException
                 );
             }

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java

@@ -57,6 +57,7 @@
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 
 import java.io.IOException;
+import java.time.Instant;
 import java.time.InstantSource;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -187,6 +188,30 @@ public void onFailure(Exception e) {
 
     @Inject
     public MetadataIndexTemplateService(
+        ClusterService clusterService,
+        MetadataCreateIndexService metadataCreateIndexService,
+        IndicesService indicesService,
+        IndexScopedSettings indexScopedSettings,
+        NamedXContentRegistry xContentRegistry,
+        SystemIndices systemIndices,
+        IndexSettingProviders indexSettingProviders,
+        DataStreamGlobalRetentionSettings globalRetentionSettings
+    ) {
+        this(
+            clusterService,
+            metadataCreateIndexService,
+            indicesService,
+            indexScopedSettings,
+            xContentRegistry,
+            systemIndices,
+            indexSettingProviders,
+            globalRetentionSettings,
+            Instant::now
+        );
+    }
+
+    //  constructor allowing for injection of InstantSource/time for testing
+    MetadataIndexTemplateService(
         ClusterService clusterService,
         MetadataCreateIndexService metadataCreateIndexService,
         IndicesService indicesService,

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

@@ -228,8 +228,6 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.time.Instant;
-import java.time.InstantSource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1302,7 +1300,6 @@ public Map<String, String> queryFields() {
             b.bind(ShutdownPrepareService.class).toInstance(shutdownPrepareService);
             b.bind(OnlinePrewarmingService.class).toInstance(onlinePrewarmingService);
             b.bind(MergeMetrics.class).toInstance(mergeMetrics);
-            b.bind(InstantSource.class).toInstance(Instant::now);
         });
 
         if (ReadinessService.enabled(environment)) {
@@ -1658,8 +1655,7 @@ private List<ReservedProjectStateHandler<?>> buildReservedProjectStateHandlers(
             xContentRegistry,
             systemIndices,
             indexSettingProviders,
-            globalRetentionSettings,
-            Instant::now
+            globalRetentionSettings
         );
         reservedStateHandlers.add(new ReservedComposableIndexTemplateAction(templateService, settingsModule.getIndexScopedSettings()));
 

server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java

@@ -54,7 +54,6 @@
 import org.junit.Before;
 
 import java.io.IOException;
-import java.time.Instant;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -106,8 +105,7 @@ public void setup() throws IOException {
             mock(NamedXContentRegistry.class),
             mock(SystemIndices.class),
             new IndexSettingProviders(Set.of()),
-            globalRetentionSettings,
-            Instant::now
+            globalRetentionSettings
         );
     }
 
@@ -898,8 +896,7 @@ public void testTemplatesWithReservedPrefix() throws Exception {
             mock(NamedXContentRegistry.class),
             mock(SystemIndices.class),
             new IndexSettingProviders(Set.of()),
-            globalRetentionSettings,
-            Instant::now
+            globalRetentionSettings
         );
 
         ClusterState state = ClusterState.builder(new ClusterName("elasticsearch"))

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java

@@ -2852,8 +2852,7 @@ private static List<Throwable> putTemplate(NamedXContentRegistry xContentRegistr
             xContentRegistry,
             EmptySystemIndices.INSTANCE,
             new IndexSettingProviders(Set.of()),
-            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings()),
-            Instant::now
+            DataStreamGlobalRetentionSettings.create(ClusterSettings.createBuiltInClusterSettings())
         );
 
         final List<Throwable> throwables = new ArrayList<>();