Introduce projectClient method on Client #129174
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
We originally defined the `projectClient` method on `ProjectResolver` as a convenience method to execute API calls for specific projects. That method requires a reference to both a `ProjectResolver` and a `Client`. We now introduce the same method directly on the `Client` interface and inject a `ProjectResolver` there, removing the need for a `ProjectResolver` reference in places that just want to execute API requests on a specific project. To reduce the number of changes, this change solely focuses on introducing the new method. Future changes will migrate the uses of the original method to the new one and remove the original altogether.
nielsbauman
added
>non-issue
:Distributed Coordination/Network
elasticsearchmachine
added
v9.1.0
Team:Distributed Coordination
Collaborator
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
samxbr
previously approved these changes
Jun 11, 2025
Contributor
samxbr
left a comment
samxbr
left a comment
There was a problem hiding this comment.
Thanks for making this change Niels! This will make my change for adding project id to PersistentTasksService easier too.
LGTM based on the discussion in the other thread, just post a question.
...elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusActionTests.java
Outdated
Show resolved
Hide resolved
samxbr
reviewed
Jun 11, 2025
Contributor
samxbr
left a comment
samxbr
left a comment
There was a problem hiding this comment.
Oh I just saw the serverless tests failed, code compilation failed, looks like you need to update the serverless package as well
ywangd
approved these changes
Jun 11, 2025
Member
ywangd
left a comment
ywangd
left a comment
There was a problem hiding this comment.
LGTM
Some minor comments plus pending fix for the serverless CI.
Comment on lines
426
to
435
| return new FilterClient(this) { | ||
| @Override | ||
| protected <Request extends ActionRequest, Response extends ActionResponse> void doExecute( | ||
| ActionType<Response> action, | ||
| Request request, | ||
| ActionListener<Response> listener | ||
| ) { | ||
| projectResolver.executeOnProject(projectId, () -> super.doExecute(action, request, listener)); | ||
| } | ||
| }; |
Member
There was a problem hiding this comment.
I suggest we also override the projectClient method here to throw an exception says something like "not supporting nested project client creation". The execution should fail anyway without it due to double setting project-id. But an explicit exception makes it quicker to happen and easier to understand.
x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/analysis/CancellationTests.java
Show resolved
Hide resolved
x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlAnomaliesIndexUpdateTests.java
Outdated
Show resolved
Hide resolved
x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlIndexRolloverTests.java
Outdated
Show resolved
Hide resolved
elasticsearchmachine
added
the
serverless-linked
nielsbauman
added a commit
that referenced
this pull request
Jun 12, 2025
We added a new `projectClient` method on `Client` in #129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
nielsbauman
added a commit
that referenced
this pull request
Jun 12, 2025
We added a new `projectClient` method on `Client` in #129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
nielsbauman
added a commit
that referenced
this pull request
Jun 13, 2025
We added a new `projectClient` method on `Client` in #129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
nielsbauman
added a commit
to nielsbauman/elasticsearch
that referenced
this pull request
Jun 13, 2025
We added a new `projectClient` method on `Client` in elastic#129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
nielsbauman
added a commit
to nielsbauman/elasticsearch
that referenced
this pull request
Jun 13, 2025
We added a new `projectClient` method on `Client` in elastic#129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
nielsbauman
added a commit
that referenced
this pull request
Jun 17, 2025
We added a new `projectClient` method on `Client` in #129174. We now update the usages of the old method (on `ProjectResolver`) to use the new one and we delete the old method.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
We originally defined the
projectClientmethod onProjectResolveras a convenience method to execute API calls for specific projects. That method requires a reference to both aProjectResolverand aClient.We now introduce the same method directly on the
Clientinterface and inject aProjectResolverthere, removing the need for aProjectResolverreference in places that just want to execute API requests on a specific project.To reduce the number of changes, this change solely focuses on introducing the new method. Future changes will migrate the uses of the original method to the new one and remove the original altogether.