Skip to content

[Test] Revert test workaround for FullClusterRestartIT.testApiKeySuperuser #84843

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
Mar 10, 2022
Merged

[Test] Revert test workaround for FullClusterRestartIT.testApiKeySuperuser #84843

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740ad7b
Revert test workaround for #82837
Mar 9, 2022
c2b3be6
Merge branch 'master' into tests/revert_workaround_for_testapikey
Mar 9, 2022
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
24 changes: 12 additions & 12 deletions ...l-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,17 +411,12 @@ public void testApiKeySuperuser() throws IOException {

// read is ok
final Request searchRequest = new Request("GET", ".security/_search");
// TODO: change the warning expectation to be always once #82837 is fixed
// Configure the warning to be optional due to #82837, it is ok since this test is for something else
searchRequest.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(warnings -> {
if (warnings.isEmpty()) {
return false;
} else if (warnings.size() == 1) {
return false == warnings.get(0).startsWith("this request accesses system indices: [.security-7]");
} else {
return true;
}
}).addHeader("Authorization", apiKeyAuthHeader));
searchRequest.setOptions(
expectWarnings(
"this request accesses system indices: [.security-7], but in a future major "
+ "version, direct access to system indices will be prevented by default"
).toBuilder().addHeader("Authorization", apiKeyAuthHeader)
);
assertOK(client().performRequest(searchRequest));

// write must not be allowed
Expand All @@ -430,7 +425,12 @@ public void testApiKeySuperuser() throws IOException {
{
"doc_type": "foo"
}""");
indexRequest.setOptions(RequestOptions.DEFAULT.toBuilder().addHeader("Authorization", apiKeyAuthHeader));
indexRequest.setOptions(
expectWarnings(
"this request accesses system indices: [.security-7], but in a future major "
+ "version, direct access to system indices will be prevented by default"
).toBuilder().addHeader("Authorization", apiKeyAuthHeader)
);
final ResponseException e = expectThrows(ResponseException.class, () -> client().performRequest(indexRequest));
assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(403));
assertThat(e.getMessage(), containsString("is unauthorized"));
Expand Down