Merge pull request #189 from splunk/DVPL-10898-develop

SDK Support for splunkd search API changes

Author: fantavlik

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
         java-version:
           - 1.8
         splunk-version:
-          - "8.0"
+          - "8.2"
           - "latest"
     runs-on: ${{ matrix.os }}
 

README.md

@@ -40,7 +40,7 @@ Here's what you need to get going with the Splunk SDK for Java.
 If you haven't already installed Splunk, download it
 [here](http://www.splunk.com/download). For more about installing and running
 Splunk and system requirements, see
-[Installing & Running Splunk](http://dev.splunk.com/view/SP-CAAADRV). The Splunk SDK for Java has been tested with Splunk Enterprise 8.0 and 8.2.0.
+[Installing & Running Splunk](http://dev.splunk.com/view/SP-CAAADRV). The Splunk SDK for Java has been tested with Splunk Enterprise 9.0 and 8.2.
 
 #### Splunk SDK for Java
 

splunk/pom.xml

@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <goals>

splunk/src/main/java/com/splunk/Job.java

@@ -35,6 +35,7 @@ public class Job extends Entity {
      *
      * @param service The connected {@code Service} instance.
      * @param path The search jobs endpoint.
+     * @param sid The sid of the job.
      */
     Job(Service service, String path) {
         super(service, path);
@@ -367,7 +368,19 @@ private InputStream getEventsMethod(String methodPath, Map args) {
             args.put("segmentation", "none");
         }
 
-        ResponseMessage response = service.get(path + methodPath, args);
+        // Splunk version pre-9.0 doesn't support v2
+        // v1(GET), v2(POST)
+        String fullPath;
+        ResponseMessage response;
+        if (service.versionIsEarlierThan("9.0")) {
+            fullPath = path.replace(JobCollection.REST_PATH_V2, JobCollection.REST_PATH) + methodPath;
+            response = service.get(fullPath, args);
+        }
+        else {
+            fullPath = path.replace(JobCollection.REST_PATH, JobCollection.REST_PATH_V2) + methodPath;
+            response = service.post(fullPath, args);
+        }
+
         return response.getContent();
     }
 

splunk/src/main/java/com/splunk/JobCollection.java

@@ -27,13 +27,14 @@ public class JobCollection extends EntityCollection<Job> {
     static String oneShotNotAllowed = String.format(
          "Oneshot not allowed, use service oneshot search method");
     static final String REST_PATH = "search/jobs";
+    static final String REST_PATH_V2 = "search/v2/jobs";
     /**
      * Class constructor.
      *
      * @param service The connected {@code Service} instance.
      */
     JobCollection(Service service) {
-        super(service, REST_PATH, Job.class);
+        super(service, service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH, Job.class);
         this.refreshArgs.put("count", "0");
     }
 
@@ -45,7 +46,7 @@ public class JobCollection extends EntityCollection<Job> {
      * return and how to sort them (see {@link CollectionArgs}).
      */
     JobCollection(Service service, Args args) {
-        super(service, REST_PATH, Job.class, args);
+        super(service, service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH, Job.class, args);
         this.refreshArgs.put("count", "0");
     }
 
@@ -86,7 +87,8 @@ public Job create(String query, Map args) {
             .item(0)
             .getTextContent();
 
-        Job job = new Job(service, REST_PATH + "/" + sid);
+        String path = service.versionIsAtLeast("9.0") ? REST_PATH_V2 : REST_PATH;
+        Job job = new Job(service, path + "/" + sid);
         job.refresh();
 
         return job;

splunk/src/main/java/com/splunk/Service.java

@@ -223,7 +223,13 @@ public InputStream export(String search, Map args) {
         if (!args.containsKey("segmentation")) {
             args.put("segmentation", "none");
         }
-        ResponseMessage response = get(JobCollection.REST_PATH + "/export", args);
+        ResponseMessage response;
+
+        if (versionIsAtLeast("9.0"))
+            response = post(JobCollection.REST_PATH_V2 + "/export", args);
+        else {
+            response = post(JobCollection.REST_PATH + "/export", args);
+        }
         return new ExportResultsStream(response.getContent());
     }
 
@@ -1251,7 +1257,11 @@ public ResponseMessage parse(String query) {
      */
     public ResponseMessage parse(String query, Map args) {
         args = Args.create(args).add("q", query);
-        return get("search/parser", args);
+
+        if (versionIsAtLeast("9.0"))
+            return post("search/v2/parser", args);
+        else
+            return get("search/parser", args);
     }
 
     /**

splunk/src/test/java/com/splunk/SearchJobTest.java

@@ -62,6 +62,18 @@ public void testEventsFromJob() {
         job.cancel();
     }
 
+    @Test
+    public void testEventsWithSearchParams() {
+        Job job = jobs.create(QUERY);
+        waitUntilDone(job);
+
+        Map args = new HashMap<String, Object>();
+        args.put("search","| head 1");
+        Assert.assertEquals(1, countEvents(job.getEvents(args)));
+
+        job.cancel();
+    }
+
     @Test
     public void testResultsFromJob() {
         Job job = jobs.create(QUERY);
@@ -71,6 +83,18 @@ public void testResultsFromJob() {
 
         job.cancel();
     }
+
+    @Test
+    public void testResultsWithSearchParams() {
+        Job job = jobs.create(QUERY);
+        waitUntilDone(job);
+
+        Map args = new HashMap<String, Object>();
+        args.put("search","| head 1");
+        Assert.assertEquals(1, countEvents(job.getResults(args)));
+
+        job.cancel();
+    }
 
     @Test
     public void testGetJobBySid() {
@@ -584,6 +608,26 @@ public void testPreview() throws InterruptedException {
         job.cancel();
     }
 
+    @Test
+    public void testPreviewWithSearchParams() throws InterruptedException {
+        JobArgs args = new JobArgs();
+        args.put("field_list", "source,host,sourcetype");
+        args.setStatusBuckets(100);
+
+        Job job = jobs.create(QUERY, args);
+
+        while (!job.isReady()) {
+            Thread.sleep(100);
+        }
+
+        Map argsSearchQuery = new HashMap<String, Object>();
+        argsSearchQuery.put("search","| head 1");
+        // Assert.assertTrue(1 >= countEvents(job.getResultsPreview(args)));
+        Assert.assertEquals(1, countEvents(job.getResultsPreview(argsSearchQuery)));
+
+        job.cancel();
+    }
+
     @Test
     public void testSearchLog() {
         Job job = jobs.create(QUERY);