Skip to content

Commit 43811f9

Browse files
committed
Put a note to the ProjectIdResolverBridge about resolving project ID for multi-project.
1 parent 1260684 commit 43811f9

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/script/ScriptServiceBridge.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ private static ScriptService getScriptService(final Settings settings, final Lon
7070
MustacheScriptEngine.NAME,
7171
new MustacheScriptEngine(settings)
7272
);
73-
@FixForMultiProject // Should this be non-BridgeProjectIdResolver?
74-
final ProjectResolver projectResolver = new BridgeProjectIdResolver();
75-
return new ScriptService(settings, scriptEngines, ScriptModule.CORE_CONTEXTS, timeProvider, projectResolver);
73+
74+
return new ScriptService(settings, scriptEngines, ScriptModule.CORE_CONTEXTS, timeProvider, ProjectIdResolverBridge.INSTANCE);
7675
}
7776

7877
private static List<Whitelist> getPainlessBaseWhiteList() {
@@ -115,7 +114,13 @@ public void close() throws IOException {
115114
this.internalDelegate.close();
116115
}
117116

118-
static class BridgeProjectIdResolver implements ProjectResolver {
117+
@FixForMultiProject
118+
// Logstash resolves and runs ingest pipelines based on the datastream.
119+
// How should ProjectIdResolverBridge behave in this case?
120+
// In other words, it looks we need to find a way to figure out which ingest pipeline belongs to which project.
121+
static class ProjectIdResolverBridge implements ProjectResolver {
122+
123+
public static final ProjectIdResolverBridge INSTANCE = new ProjectIdResolverBridge();
119124

120125
@Override
121126
public ProjectId getProjectId() {

0 commit comments

Comments
 (0)