Make Watch transport actions project-aware #129612
Open
+34
−9
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
samxbr
changed the title
elasticsearchmachine
added
the
Team:Data Management
|
Pinging @elastic/es-data-management (Team:Data Management) |
nielsbauman
approved these changes
Jun 18, 2025
| @@ -37,6 +38,7 @@ public class TransportGetWatcherSettingsAction extends TransportLocalClusterStat | |||
| GetWatcherSettingsAction.Response> { | |||
|
|
|||
| private final IndexNameExpressionResolver indexNameExpressionResolver; | |||
| private final ProjectResolver projectResolver; | |||
There was a problem hiding this comment.
You can make this class extend TransportLocalProjectMetadataAction instead of storing the field here.
| @@ -73,7 +77,7 @@ public ClusterState execute(ClusterState clusterState) { | |||
| XPackPlugin.checkReadyForXPackCustomMetadata(clusterState); | |||
|
|
|||
| WatcherMetadata newWatcherMetadata = new WatcherMetadata(manuallyStopped); | |||
| final var project = clusterState.metadata().getProject(); | |||
| final var project = clusterState.metadata().getProject(projectResolver.getProjectId()); | |||
There was a problem hiding this comment.
Super small nit:
Suggested change
| final var project = clusterState.metadata().getProject(projectResolver.getProjectId()); | |
| final var project = projectResolver.getProjectMetadata(clusterState); |
Comment on lines
67
to
+69
| when(clusterState.getMetadata()).thenReturn(Metadata.EMPTY_METADATA); | ||
| when(clusterService.state()).thenReturn(clusterState); | ||
| when(clusterState.metadata()).thenReturn(Metadata.builder().put(ProjectMetadata.builder(projectId).build()).build()); |
There was a problem hiding this comment.
Can we avoid returning two different metadata objects to avoid confusion? Ideally, we'd align the production code to only use one of the two getter methods (metadata() being the preference), but if that results in a very large number of changes, I'm also ok with leaving that part.
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.
Make Watcher transport actions project-aware.