Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,6 @@ tests:
- class: org.elasticsearch.xpack.inference.action.filter.ShardBulkInferenceActionFilterIT
method: testBulkOperations {p0=false}
issue: https://github.com/elastic/elasticsearch/issues/119901
- class: org.elasticsearch.xpack.security.authz.IndicesAndAliasesResolverTests
method: testBackingIndicesAreVisibleWhenIncludedByRequestWithWildcard
issue: https://github.com/elastic/elasticsearch/issues/119908
- class: org.elasticsearch.xpack.security.authz.IndicesAndAliasesResolverTests
method: testBackingIndicesAreNotVisibleWhenNotIncludedByRequestWithoutWildcard
issue: https://github.com/elastic/elasticsearch/issues/119909
- class: org.elasticsearch.xpack.inference.InferenceCrudIT
method: testGetServicesWithCompletionTaskType
issue: https://github.com/elastic/elasticsearch/issues/119959
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void setup() {
IndexMetadata dataStreamFailureStore1 = DataStreamTestHelper.createFailureStore(dataStreamName, 1).build();
IndexMetadata dataStreamFailureStore2 = DataStreamTestHelper.createFailureStore(dataStreamName, 2).build();
IndexMetadata dataStreamIndex3 = DataStreamTestHelper.createBackingIndex(otherDataStreamName, 1).build();
Metadata metadata = Metadata.builder()
Metadata.Builder metadataBuilder = Metadata.builder()
.put(
indexBuilder("foo").putAlias(AliasMetadata.builder("foofoobar"))
.putAlias(AliasMetadata.builder("foounauthorized"))
Expand Down Expand Up @@ -219,23 +219,27 @@ public void setup() {
.put(dataStreamIndex1, true)
.put(dataStreamIndex2, true)
.put(dataStreamIndex3, true)
.put(dataStreamFailureStore1, true)
.put(dataStreamFailureStore2, true)
.put(
newInstance(
dataStreamName,
List.of(dataStreamIndex1.getIndex(), dataStreamIndex2.getIndex()),
List.of(dataStreamFailureStore1.getIndex(), dataStreamFailureStore2.getIndex())
)
)
.put(newInstance(otherDataStreamName, List.of(dataStreamIndex3.getIndex())))
.put(indexBuilder(securityIndexName).settings(settings))
.build();
.put(indexBuilder(securityIndexName).settings(settings));

// Only add the failure indices if the failure store flag is enabled
if (DataStream.isFailureStoreFeatureFlagEnabled()) {
metadataBuilder.put(dataStreamFailureStore1, true).put(dataStreamFailureStore2, true);
}
metadataBuilder.put(
newInstance(
dataStreamName,
List.of(dataStreamIndex1.getIndex(), dataStreamIndex2.getIndex()),
DataStream.isFailureStoreFeatureFlagEnabled()
? List.of(dataStreamFailureStore1.getIndex(), dataStreamFailureStore2.getIndex())
: List.of()
)
);
if (withAlias) {
metadata = SecurityTestUtils.addAliasToMetadata(metadata, securityIndexName);
this.metadata = SecurityTestUtils.addAliasToMetadata(metadataBuilder.build(), securityIndexName);
} else {
this.metadata = metadataBuilder.build();
}
this.metadata = metadata;

user = new User("user", "role");
userDashIndices = new User("dash", "dash");
Expand Down