[TEST] Remove token methods from HLRC SecurityClient #85515
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tvernum
added
>test
elasticmachine
added
Team:Security
|
Pinging @elastic/es-security (Team:Security) |
|
Pinging @elastic/clients-team (Team:Clients) |
ywangd
approved these changes
Mar 31, 2022
Comment on lines
+340
to
+342
| // This API returns 404 (with the same body as a 200 response) if there's nothing to delete. | ||
| // RestClient will throw an exception on 404, but we don't want that, we want to parse the body and return it | ||
| request.addParameter("ignore", "404"); |
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
Comment on lines
+387
to
+395
| public record OAuth2Token(String accessToken, Optional<String> refreshToken, String principal) { | ||
|
|
||
| @Nullable | ||
| public String getRefreshToken() { | ||
| return refreshToken.orElse(null); | ||
| } | ||
| } | ||
|
|
||
| public record TokenInvalidation(int invalidated, int previouslyInvalidated, List<ElasticsearchException> errors) {} |
There was a problem hiding this comment.
I suspect we eventually want to turn these into production code. But it can wait.
There was a problem hiding this comment.
We have TokensInvalidationResult but it contains a list of token ids, not a count of them.
I'm not sure whether we need a production record for the rest response, but if we do we'll move it where it's needed.
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
...src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
Outdated
Show resolved
Hide resolved
Comment on lines
-868
to
663
| final PlainActionFuture<org.elasticsearch.xpack.core.security.action.token.CreateTokenResponse> future1 = new PlainActionFuture<>(); | ||
| final PlainActionFuture<CreateTokenResponse> future1 = new PlainActionFuture<>(); | ||
| runAsClient.execute(CreateTokenAction.INSTANCE, createTokenRequest1, future1); |
There was a problem hiding this comment.
This method should be rewritten to use the new convenient methods from TestSecurityClient. I can follow up with a separate PR (since I wrote the original version).
tvernum
added
the
auto-merge-without-approval
|
@elasticmachine update branch |
|
|
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Apr 12, 2022
This is a follow up PR for elastic#85515 to rewrite one more test to leverage the new TestSecurityClient and its convenient token methods. Relates: elastic#85515
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Apr 13, 2022
* upstream/master: (40 commits) Fix BuildTests serialization (elastic#85827) Use urgent priority for node shutdown cluster state update (elastic#85838) Remove Task classes from HLRC (elastic#85835) Remove unused migration classes (elastic#85834) Remove uses of Charset name parsing (elastic#85795) Remove legacy versioned logic for DefaultSystemMemoryInfo (elastic#85761) Expose proxy settings for GCS repositories (elastic#85785) Remove SLM classes from HLRC (elastic#85825) TSDB: fix the time_series in order collect priority (elastic#85526) Remove ILM classes from HLRC (elastic#85822) FastVectorHighlighter should use ValueFetchers to load source data (elastic#85815) Iteratively execute synchronous ingest processors (elastic#84250) Remove TransformClient from HLRC (elastic#85787) Mute XPackRestIT deprecation/10_basic/Test Deprecations (elastic#85807) Unmute Lintian packaging test (elastic#85778) Add a highlighter unit test base class (elastic#85719) Remove NIO Transport Plugin (elastic#82085) [TEST] Remove token methods from HLRC SecurityClient (elastic#85515) [Test] Use thread-safe hashSet for result collection (elastic#85653) [TEST] Mute BuildTests.testSerialization (elastic#85801) ... # Conflicts: # server/src/test/java/org/elasticsearch/search/aggregations/timeseries/TimeSeriesIndexSearcherTests.java
ywangd
added a commit
that referenced
this pull request
Apr 26, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The High Level Rest Client (HLRC) is deprecated and is no longer
shipped as a standalone artifact.
It can now be safely removed from the ES codebase.
This commit removes all token methods from the HLRC
SecurityClient, along with their associated Request/Response
classes.
Test code that depended on these methods has been migrated
to use
TestSecurityClientinstead.Relates: #83423