Apply upstream ES GeoIP factory interface changes. (#273)

* Apply upstream ES GeoIP factory interface changes.

* Keep setting ES treeish main in main branch.

Author: mashhurs

gradle.properties

@@ -1,2 +1,2 @@
 LOGSTASH_PATH=../../logstash
-ELASTICSEARCH_TREEISH=9.0
+ELASTICSEARCH_TREEISH=main

src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java

@@ -9,6 +9,7 @@
 import co.elastic.logstash.filters.elasticintegration.ingest.PipelineProcessor;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.ingest.Pipeline;
 import org.elasticsearch.ingest.PipelineConfiguration;
 import org.elasticsearch.ingest.Processor;
@@ -46,7 +47,7 @@ public IngestPipelineFactory withProcessors(final Map<String, Processor.Factory>
 
     public Optional<IngestPipeline> create(final PipelineConfiguration pipelineConfiguration) {
         try {
-            final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService);
+            final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService, ProjectId.DEFAULT);
             final IngestPipeline ingestPipeline = new IngestPipeline(pipelineConfiguration, pipeline);
             LOGGER.debug(() -> String.format("successfully created ingest pipeline `%s` from pipeline configuration", pipelineConfiguration.getId()));
             return Optional.of(ingestPipeline);

src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java

@@ -6,6 +6,7 @@
  */
 package co.elastic.logstash.filters.elasticintegration.geoip;
 
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.ingest.Processor;
 import org.elasticsearch.ingest.geoip.GeoIpProcessor;
 
@@ -22,7 +23,9 @@ public GeoIpProcessorFactory(final IpDatabaseProvider ipDatabaseProvider) {
     public Processor create(Map<String, Processor.Factory> processorFactories,
                             String tag,
                             String description,
-                            Map<String, Object> config) throws Exception {
-        return new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider).create(processorFactories, tag, description, config);
+                            Map<String, Object> config,
+                            ProjectId projectId) throws Exception {
+        return new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider)
+                .create(processorFactories, tag, description, config, projectId);
     }
 }

src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java

@@ -10,6 +10,7 @@
 import co.elastic.logstash.filters.elasticintegration.IngestPipelineResolver;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.ingest.AbstractProcessor;
 import org.elasticsearch.ingest.ConfigurationUtils;
 import org.elasticsearch.ingest.IngestDocument;
@@ -91,7 +92,8 @@ public Factory(IngestPipelineResolver pipelineProvider, ScriptService scriptServ
         public Processor create(Map<String, Processor.Factory> registry,
                                 String processorTag,
                                 String description,
-                                Map<String, Object> config) throws Exception {
+                                Map<String, Object> config,
+                                ProjectId projectId) throws Exception {
             String pipeline = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "name");
             TemplateScript.Factory pipelineTemplate = ConfigurationUtils.compileTemplate(TYPE, processorTag, "name", pipeline, scriptService);
             boolean ignoreMissingPipeline = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_missing_pipeline", false);

src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java

@@ -6,6 +6,7 @@
  */
 package co.elastic.logstash.filters.elasticintegration.ingest;
 
+import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.ingest.AbstractProcessor;
 import org.elasticsearch.ingest.IngestDocument;
 import org.elasticsearch.ingest.Processor;
@@ -36,7 +37,7 @@ public static final class Factory implements Processor.Factory {
 
         @Override
         public SetSecurityUserProcessor create(Map<String, Processor.Factory> registry, String processorTag,
-                                               String description, Map<String, Object> config) {
+                                               String description, Map<String, Object> config, ProjectId projectId) {
             String[] supportedConfigs = {"field", "properties"};
             for (String cfg : supportedConfigs) {
                 config.remove(cfg);