Fix test

Author: gmarouli

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

@@ -273,7 +273,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
         Settings settings = null;
         CompressedXContent mappings = null;
         Map<String, AliasMetadata> aliases = null;
-        ResettableValue<DataStreamOptions.Template> dataStreamOptions = ResettableValue.undefined();
+        DataStreamOptions.Template dataStreamOptions = null;
         if (randomBoolean()) {
             settings = randomSettings();
         }
@@ -284,7 +284,8 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
             aliases = randomAliases();
         }
         if (randomBoolean()) {
-            dataStreamOptions = randomDataStreamOptionsTemplate();
+            // Do not set random lifecycle to avoid having data_retention and effective_retention in the response.
+            dataStreamOptions = new DataStreamOptions.Template(new DataStreamFailureStore.Template(randomBoolean(), null));
         }
         DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;
         ComponentTemplate template = new ComponentTemplate(

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

@@ -221,7 +221,7 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
         Settings settings = null;
         CompressedXContent mappings = null;
         Map<String, AliasMetadata> aliases = null;
-        ResettableValue<DataStreamOptions.Template> dataStreamOptions = ResettableValue.undefined();
+        DataStreamOptions.Template dataStreamOptions = null;
         ComposableIndexTemplate.DataStreamTemplate dataStreamTemplate = randomDataStreamTemplate();
         if (randomBoolean()) {
             settings = randomSettings();
@@ -233,7 +233,8 @@ public void testXContentSerializationWithRolloverAndEffectiveRetention() throws
             aliases = randomAliases();
         }
         if (randomBoolean()) {
-            dataStreamOptions = ComponentTemplateTests.randomDataStreamOptionsTemplate();
+            // Do not set random lifecycle to avoid having data_retention and effective_retention in the response.
+            dataStreamOptions = new DataStreamOptions.Template(new DataStreamFailureStore.Template(randomBoolean(), null));
         }
         // We use the empty lifecycle so the global retention can be in effect
         DataStreamLifecycle.Template lifecycle = DataStreamLifecycle.Template.DEFAULT;