Updated configConverter and removed the tests

Signed-off-by: Asif Sohail Mohammed <[email protected]>
opensearch-project · Nov 12, 2021 · 219a8c1 · 219a8c1
1 parent e594b87
commit 219a8c1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 52 deletions.
diff --git a/...stash/parser/LogstashConfigConverter.java → ...per/logstash/LogstashConfigConverter.java b/...stash/parser/LogstashConfigConverter.java → ...per/logstash/LogstashConfigConverter.java
@@ -1,4 +1,4 @@
-package org.opensearch.dataprepper.logstash.parser;
+package org.opensearch.dataprepper.logstash;
 
 import com.amazon.dataprepper.model.configuration.PipelineModel;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,14 +7,14 @@
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
-import org.opensearch.dataprepper.logstash.LogstashLexer;
-import org.opensearch.dataprepper.logstash.LogstashParser;
 import org.opensearch.dataprepper.logstash.mapping.LogstashMapper;
 import org.opensearch.dataprepper.logstash.model.LogstashConfiguration;
+import org.opensearch.dataprepper.logstash.parser.LogstashVisitor;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.Map;
@@ -26,19 +26,20 @@
  */
 public class LogstashConfigConverter {
     public String convertLogstashConfigurationToPipeline(String logstashConfigurationPath, String outputDirectory) throws IOException {
-        final String logstashConfigAsString = new String(Files.readAllBytes(Paths.get(logstashConfigurationPath)));
+        Path configurationFilePath = Paths.get(logstashConfigurationPath);
+        final String logstashConfigAsString = new String(Files.readAllBytes(configurationFilePath));
 
         LogstashLexer lexer = new LogstashLexer(CharStreams.fromString(logstashConfigAsString));
         CommonTokenStream tokens = new CommonTokenStream(lexer);
         LogstashParser parser = new LogstashParser(tokens);
         ParseTree tree = parser.config();
 
-        LogstashVisitor visitor = new LogstashVisitor();
+        org.opensearch.dataprepper.logstash.parser.LogstashVisitor visitor = new LogstashVisitor();
         LogstashConfiguration logstashConfiguration = (LogstashConfiguration) visitor.visit(tree);
 
         LogstashMapper logstashMapper = new LogstashMapper();
         PipelineModel pipelineModel = logstashMapper.mapPipeline(logstashConfiguration);
-        Map<String, Object> pipeline = Collections.singletonMap("log-pipeline", pipelineModel);
+        Map<String, Object> pipeline = Collections.singletonMap("logstash-converted-pipeline", pipelineModel);
 
         YAMLFactory factory = new YAMLFactory();
         factory.disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER);
@@ -48,9 +49,13 @@ public String convertLogstashConfigurationToPipeline(String logstashConfiguratio
 
         ObjectMapper mapper = new ObjectMapper(factory);
 
-        String yamlFilePath = outputDirectory + "logstash.yaml";
-        mapper.writeValue(new File(yamlFilePath), pipeline);
+        String confFileName = configurationFilePath.getFileName().toString();
+        String yamlFileName = confFileName.substring(0, confFileName.lastIndexOf("."));
 
-        return yamlFilePath;
+        Path yamlFilePath = Paths.get(outputDirectory , yamlFileName + ".yaml");
+
+        mapper.writeValue(new File(String.valueOf(yamlFilePath)), pipeline);
+
+        return String.valueOf(yamlFilePath);
     }
 }
diff --git a/...src/test/java/org/opensearch/dataprepper/logstash/parser/LogstashConfigConverterTest.java b/...src/test/java/org/opensearch/dataprepper/logstash/parser/LogstashConfigConverterTest.java
diff --git a/...configuration/src/test/resources/org/opensearch/dataprepper/logstash/parser/logstash.conf b/...configuration/src/test/resources/org/opensearch/dataprepper/logstash/parser/logstash.conf