Skip to content

Fixes SecurityIntegTestCase so it always adds at least one alias #33296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2018
Merged

Fixes SecurityIntegTestCase so it always adds at least one alias #33296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35890e
Fixes SecurityIntegTestCase so it always adds at least one alias
colings86 Aug 31, 2018
4c27d26
Addresses review comments
colings86 Aug 31, 2018
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
8 changes: 6 additions & 2 deletions x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import io.netty.util.ThreadDeathWatcher;
import io.netty.util.concurrent.GlobalEventExecutor;

import org.elasticsearch.Version;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
Expand Down Expand Up @@ -44,7 +45,6 @@
import org.elasticsearch.xpack.core.security.authc.support.UsernamePasswordToken;
import org.elasticsearch.xpack.core.security.client.SecurityClient;
import org.elasticsearch.xpack.security.LocalStateSecurity;

import org.elasticsearch.xpack.security.support.SecurityIndexManager;
import org.junit.AfterClass;
import org.junit.Before;
Expand Down Expand Up @@ -420,14 +420,18 @@ protected void createIndicesWithRandomAliases(String... indices) {
createIndex(indices);

if (frequently()) {
boolean aliasAdded = false;
IndicesAliasesRequestBuilder builder = client().admin().indices().prepareAliases();
for (String index : indices) {
if (frequently()) {
//one alias per index with prefix "alias-"
builder.addAlias(index, "alias-" + index);
aliasAdded = true;
}
}
if (randomBoolean()) {
// If we get to this point and we haven't added an alias to the request we need to add one
// or the request will fail so use noAliasAdded to force adding the alias in this case
if (aliasAdded == false || randomBoolean()) {
//one alias pointing to all indices
for (String index : indices) {
builder.addAlias(index, "alias");
Expand Down
1 change: 0 additions & 1 deletion ...lugin/security/src/test/java/org/elasticsearch/xpack/security/authz/ReadActionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ public void testEmptyAuthorizedIndicesSearchForAll() {
assertNoSearchHits(client().prepareSearch().get());
}

@AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/33123")
public void testEmptyAuthorizedIndicesSearchForAllDisallowNoIndices() {
createIndicesWithRandomAliases("index1", "index2");
IndexNotFoundException e = expectThrows(IndexNotFoundException.class, () -> client().prepareSearch()
Expand Down