Skip to content

Set metadata on initial request in API key noop test #88507

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 5 commits into from
Jul 14, 2022
Merged

Set metadata on initial request in API key noop test #88507

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a76ddb2
Ensure initial requests sets metadata
n1v0lg Jul 13, 2022
b79843e
Test fix
n1v0lg Jul 13, 2022
17704d4
Merge branch 'master' into fix/api-key-noop-test-metadata
n1v0lg Jul 13, 2022
2022862
Fix rd randomization
n1v0lg Jul 14, 2022
61fb5cb
Merge branch 'master' into fix/api-key-noop-test-metadata
n1v0lg Jul 14, 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
9 changes: 6 additions & 3 deletions ...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -1744,7 +1745,9 @@ public void testNoopUpdateApiKey() throws ExecutionException, InterruptedExcepti
final var initialRequest = new UpdateApiKeyRequest(
apiKeyId,
List.of(new RoleDescriptor(randomAlphaOfLength(10), new String[] { "all" }, null, null)),
ApiKeyTests.randomMetadata()
// Ensure not `null` to set metadata since we use the initialRequest further down in the test to ensure that
// metadata updates are non-noops
randomValueOtherThanMany(Objects::isNull, ApiKeyTests::randomMetadata)
);
UpdateApiKeyResponse response = executeUpdateApiKey(TEST_USER_NAME, initialRequest);
assertNotNull(response);
Expand Down Expand Up @@ -1772,11 +1775,11 @@ public void testNoopUpdateApiKey() throws ExecutionException, InterruptedExcepti
// Update with different role descriptors is not a noop
final List<RoleDescriptor> newRoleDescriptors = List.of(
randomValueOtherThanMany(
rd -> (RoleDescriptorRequestValidator.validate(rd) != null) && initialRequest.getRoleDescriptors().contains(rd) == false,
rd -> RoleDescriptorRequestValidator.validate(rd) != null || initialRequest.getRoleDescriptors().contains(rd),
() -> RoleDescriptorTests.randomRoleDescriptor(false)
),
randomValueOtherThanMany(
rd -> (RoleDescriptorRequestValidator.validate(rd) != null) && initialRequest.getRoleDescriptors().contains(rd) == false,
rd -> RoleDescriptorRequestValidator.validate(rd) != null || initialRequest.getRoleDescriptors().contains(rd),
() -> RoleDescriptorTests.randomRoleDescriptor(false)
)
);
Expand Down