test fixes

Author: szybia

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

@@ -88,7 +88,8 @@ public void testRequireRoutingPath() throws Exception {
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
                 .build();
             project = service.addIndexTemplateV2(project, false, "1", indexTemplate);
-            assertThat(project.templatesV2().get("1"), equalTo(indexTemplate));
+            var actualTemplate = project.templatesV2().get("1");
+            assertTemplateActualIsExpected(actualTemplate, indexTemplate);
         }
         {
             // Routing path defined in component template
@@ -106,7 +107,8 @@ public void testRequireRoutingPath() throws Exception {
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
                 .build();
             project = service.addIndexTemplateV2(project, false, "1", indexTemplate);
-            assertThat(project.templatesV2().get("1"), equalTo(indexTemplate));
+            var actualTemplate = project.templatesV2().get("1");
+            assertTemplateActualIsExpected(actualTemplate, indexTemplate);
         }
         {
             // Routing path defined in index template
@@ -118,7 +120,8 @@ public void testRequireRoutingPath() throws Exception {
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
                 .build();
             var project = service.addIndexTemplateV2(initialProject, false, "1", indexTemplate);
-            assertThat(project.templatesV2().get("1"), equalTo(indexTemplate));
+            var actualTemplate = project.templatesV2().get("1");
+            assertTemplateActualIsExpected(actualTemplate, indexTemplate);
         }
         {
             // Routing fetched from mapping in index template
@@ -132,7 +135,8 @@ public void testRequireRoutingPath() throws Exception {
                 .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
                 .build();
             var project = service.addIndexTemplateV2(initialProject, false, "1", indexTemplate);
-            assertThat(project.templatesV2().get("1"), equalTo(indexTemplate));
+            var actualTemplate = project.templatesV2().get("1");
+            assertTemplateActualIsExpected(actualTemplate, indexTemplate);
         }
     }
 
@@ -190,6 +194,21 @@ public void testLifecycleComposition() {
         }
     }
 
+    private void assertTemplateActualIsExpected(final ComposableIndexTemplate actual, final ComposableIndexTemplate expected) {
+        // make sure arguments passed in right order
+        assertTrue(actual.createdDateMillis().isPresent());
+        assertTrue(actual.modifiedDateMillis().isPresent());
+        assertTrue(expected.createdDateMillis().isEmpty());
+        assertTrue(expected.modifiedDateMillis().isEmpty());
+
+        var expectedWithDates = expected.toBuilder()
+            // can't inject timing into creation so carrying over the dates from created template
+            .createdDate(actual.createdDateMillis().orElse(null))
+            .modifiedDate(actual.modifiedDateMillis().orElse(null))
+            .build();
+        assertThat(actual, equalTo(expectedWithDates));
+    }
+
     private MetadataIndexTemplateService getMetadataIndexTemplateService() {
         var indicesService = getInstanceFromNode(IndicesService.class);
         var clusterService = getInstanceFromNode(ClusterService.class);

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.put_index_template/20_tracking.yml

@@ -71,7 +71,6 @@ setup:
 "Test update preserves created_date but updates modified_date":
   - do:
       indices.put_index_template:
-        human: true
         name: test_tracking
         body:
           index_patterns: ["test-*"]