Fix tests in part-2

Author: gmarouli

test/framework/src/main/java/org/elasticsearch/cluster/metadata/DataStreamTestHelper.java

@@ -78,6 +78,7 @@
 import static org.elasticsearch.cluster.metadata.DataStream.getDefaultFailureStoreName;
 import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_INDEX_UUID;
 import static org.elasticsearch.test.ESTestCase.generateRandomStringArray;
+import static org.elasticsearch.test.ESTestCase.indexSettings;
 import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength;
 import static org.elasticsearch.test.ESTestCase.randomAlphanumericOfLength;
 import static org.elasticsearch.test.ESTestCase.randomBoolean;
@@ -88,6 +89,7 @@
 import static org.elasticsearch.test.ESTestCase.randomMillisUpToYear9999;
 import static org.elasticsearch.test.ESTestCase.randomPositiveTimeValue;
 import static org.elasticsearch.test.ESTestCase.randomProjectIdOrDefault;
+import static org.elasticsearch.test.ESTestCase.randomUUID;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -608,12 +610,10 @@ public static void getClusterStateWithDataStream(
     }
 
     public static IndexMetadata createIndexMetadata(String name, boolean hidden, Settings settings, int replicas) {
-        Settings.Builder b = Settings.builder()
-            .put(settings)
-            .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
+        Settings.Builder indexSettingsBuilder = indexSettings(IndexVersion.current(), randomUUID(), 1, replicas).put(settings)
             .put("index.hidden", hidden);
 
-        return IndexMetadata.builder(name).settings(b).numberOfShards(1).numberOfReplicas(replicas).build();
+        return IndexMetadata.builder(name).settings(indexSettingsBuilder).build();
     }
 
     public static String backingIndexPattern(String dataStreamName, long generation) {

x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderDecisionTests.java

@@ -820,9 +820,10 @@ private static ClusterState addRandomIndices(int minShards, int maxShardCopies,
         RoutingTable.Builder routingTableBuilder = RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY);
         while (shards > 0) {
             IndexMetadata indexMetadata = IndexMetadata.builder("test" + "-" + shards)
-                .settings(settings(IndexVersion.current()).put(randomFrom(tierSettingNames), "data_hot"))
-                .numberOfShards(randomIntBetween(1, 5))
-                .numberOfReplicas(randomIntBetween(0, maxShardCopies - 1))
+                .settings(
+                    indexSettings(IndexVersion.current(), randomUUID(), randomIntBetween(1, 5), randomIntBetween(0, maxShardCopies - 1))
+                        .put(randomFrom(tierSettingNames), "data_hot")
+                )
                 .build();
 
             builder.put(indexMetadata, false);

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datatiers/DataTierUsageFixtures.java

@@ -101,7 +101,7 @@ private static ShardStats shardStat(long byteCount, long docCount, ShardRouting
     }
 
     static IndexMetadata indexMetadata(String indexName, int numberOfShards, int numberOfReplicas, String... dataTierPrefs) {
-        Settings.Builder settingsBuilder = indexSettings(IndexVersion.current(), numberOfShards, numberOfReplicas).put(
+        Settings.Builder settingsBuilder = indexSettings(IndexVersion.current(), randomUUID(), numberOfShards, numberOfReplicas).put(
             SETTING_CREATION_DATE,
             System.currentTimeMillis()
         );