Fix TSDBIndexingIT

Author: felixbarny

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java

@@ -8,6 +8,7 @@
  */
 package org.elasticsearch.datastreams;
 
+import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.admin.indices.diskusage.AnalyzeIndexDiskUsageRequest;
 import org.elasticsearch.action.admin.indices.diskusage.TransportAnalyzeIndexDiskUsageAction;
@@ -31,6 +32,7 @@
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.support.WriteRequest;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.cluster.metadata.ComponentTemplate;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -709,17 +711,22 @@ public void testAddDimensionToMapping() throws Exception {
               ]
             }
             """, XContentType.JSON);
-        assertAcked(client().execute(TransportPutMappingAction.TYPE, putMappingRequest).actionGet());
+        ActionFuture<AcknowledgedResponse> putMappingFuture = client().execute(TransportPutMappingAction.TYPE, putMappingRequest);
         if (INDEX_DIMENSIONS_TSID_OPTIMIZATION_FEATURE_FLAG) {
+            IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, putMappingFuture::actionGet);
+            assertThat(exception.getMessage(), containsString(
+                "Cannot add dynamic templates that define dimension fields on an existing index with index.dimensions")
+            );
             assertThat(
-                getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH),
-                containsInAnyOrder("metricset", "labels.*", "k8s.pod.name")
+                getSetting(dataStreamName, IndexMetadata.INDEX_DIMENSIONS),
+                containsInAnyOrder("metricset", "k8s.pod.name")
             );
+            assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH), empty());
         } else {
+            assertAcked(putMappingFuture);
             assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_ROUTING_PATH), containsInAnyOrder("metricset"));
+            assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_DIMENSIONS), empty());
         }
-        assertThat(getSetting(dataStreamName, IndexMetadata.INDEX_DIMENSIONS), empty());
-
         indexWithPodNames(dataStreamName, Instant.now(), Map.of(), "dog", "cat");
     }
 

modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProvider.java

@@ -173,7 +173,7 @@ public void onUpdateMappings(IndexMetadata indexMetadata, DocumentMapper documen
             && new HashSet<>(indexDimensions).equals(new HashSet<>(newIndexDimensions)) == false;
         if (matchesAllDimensions == false) {
             throw new IllegalArgumentException(
-                "Cannot add dimension fields via dynamic templates or mappings for an index with "
+                "Cannot add dynamic templates that define dimension fields on an existing index with "
                     + INDEX_DIMENSIONS.getKey()
                     + ". "
                     + "Please change the index template and roll over the data stream "

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

@@ -963,7 +963,7 @@ public void testAddDynamicTemplate() throws Exception {
         assertThat(
             exception.getMessage(),
             equalTo(
-                "Cannot add dimension fields via dynamic templates or mappings for an index with index.dimensions. "
+                "Cannot add dynamic templates that define dimension fields on an existing index with index.dimensions. "
                     + "Please change the index template and roll over the data stream "
                     + "instead of modifying the mappings of the backing indices."
             )