Skip to content

Commit e6b32b4

Browse files
committed
Fix test that did not use the normalised lifecycle template
1 parent e2b9b1d commit e6b32b4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,14 +1563,14 @@ public void testResolveLifecycle() throws Exception {
15631563
// Component A: "lifecycle": {"retention": "30d"}
15641564
// Component B: "lifecycle": {"retention": null}
15651565
// Composable Z: -
1566-
// Result: "lifecycle": {"enabled": true, "retention": null}, here the result of the composition is with retention explicitly
1566+
// Result: "lifecycle": {"enabled": true}, here the result of the composition is with retention explicitly
15671567
// nullified, but effectively this is equivalent to infinite retention.
1568-
assertLifecycleResolution(service, project, List.of(ct30d, ctNullRetention), null, lifecycleNullRetention);
1568+
assertLifecycleResolution(service, project, List.of(ct30d, ctNullRetention), null, DataStreamLifecycle.Template.DEFAULT);
15691569

15701570
// Component A: "lifecycle": {"enabled": true}
15711571
// Component B: "lifecycle": {"retention": "45d", "downsampling": [{"after": "30d", "fixed_interval": "3h"}]}
15721572
// Composable Z: "lifecycle": {"retention": null}
1573-
// Result: "lifecycle": {"enabled": true, "retention": null, "downsampling": [{"after": "30d", "fixed_interval": "3h"}]} ,
1573+
// Result: "lifecycle": {"enabled": true, "downsampling": [{"after": "30d", "fixed_interval": "3h"}]} ,
15741574
// here the result of the composition is with retention explicitly nullified, but effectively this is equivalent to infinite
15751575
// retention.
15761576
assertLifecycleResolution(

0 commit comments

Comments
 (0)