fixing bad merge

masseyke · masseyke · commit df56837eedfb · 2025-07-01T13:43:33.000-05:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataDataStreamsService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataDataStreamsService.java
@@ -469,7 +469,7 @@ private DataStream createDataStreamForUpdatedDataStreamSettings(
         final ComposableIndexTemplate template = lookupTemplateForDataStream(dataStreamName, projectMetadata);
         Settings templateSettings = MetadataIndexTemplateService.resolveSettings(template, projectMetadata.componentTemplates());
         Settings mergedEffectiveSettings = templateSettings.merge(mergedDataStreamSettings);
-        MetadataIndexTemplateService.validateTemplate(mergedEffectiveSettings, mergedTemplate.template().mappings(), indicesService);
+        MetadataIndexTemplateService.validateTemplate(mergedEffectiveSettings, ComposableIndexTemplate.EMPTY_MAPPINGS, indicesService);
 
         return dataStream.copy().setSettings(mergedDataStreamSettings).build();
     }

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ private DataStream createDataStreamForUpdatedDataStreamSettings(`
`469`	`469`	`final ComposableIndexTemplate template = lookupTemplateForDataStream(dataStreamName, projectMetadata);`
`470`	`470`	`Settings templateSettings = MetadataIndexTemplateService.resolveSettings(template, projectMetadata.componentTemplates());`
`471`	`471`	`Settings mergedEffectiveSettings = templateSettings.merge(mergedDataStreamSettings);`
`472`		`- MetadataIndexTemplateService.validateTemplate(mergedEffectiveSettings, mergedTemplate.template().mappings(), indicesService);`
	`472`	`+ MetadataIndexTemplateService.validateTemplate(mergedEffectiveSettings, ComposableIndexTemplate.EMPTY_MAPPINGS, indicesService);`
`473`	`473`
`474`	`474`	`return dataStream.copy().setSettings(mergedDataStreamSettings).build();`
`475`	`475`	`}`