Apps/app-install replaced with apps/local

.github/workflows/test.yml

@@ -26,6 +26,7 @@ jobs:
           TEST_TCP_PORT: 10667
           TEST_UDP_PORT: 10668
           SPLUNK_HOME: "/opt/splunk"
+          SPLUNK_APPS_URL: https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
         ports:
           - 8000:8000
           - 8089:8089
@@ -58,7 +59,7 @@ jobs:
           echo version=${{ matrix.splunk }} >> .splunkrc
 
       - name: Test using maven
-        run: make test
+        run: mvn test -fae
         env:
           SPLUNK_HOME: "/opt/splunk"
           TEST_TCP_PORT: 10667

docker-compose.yml

@@ -8,7 +8,7 @@ services:
             - SPLUNK_START_ARGS=--accept-license
             - SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113
             - SPLUNK_PASSWORD=changed!
-            - SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.0.0/sdk-app-collection.tgz
+            - SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
         ports:
             - 8000:8000
             - 8088:8088

splunk/src/test/java/com/splunk/ApplicationTest.java

@@ -76,7 +76,6 @@ public void testForEmptySetup() {
         Assert.assertTrue(setupXml.contains("stub"));
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testForSetupPresent() throws Exception {
         if (!hasTestData()) {

splunk/src/test/java/com/splunk/IndexTest.java

@@ -688,7 +688,6 @@ public boolean predicate() {
         });
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testUploadArgs() throws Exception {
         if (!hasTestData()) {
@@ -732,7 +731,6 @@ public boolean predicate() {
         });
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testUploadArgsFailure() throws Exception{
         if (!hasTestData()) {
@@ -764,7 +762,6 @@ public void testUploadArgsFailure() throws Exception{
 
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testUpload() throws Exception {
         if (!hasTestData()) {

splunk/src/test/java/com/splunk/InputCrudTest.java

@@ -248,24 +248,23 @@ public boolean predicate() {
         });
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testScriptInputCrud() {
         if (!hasTestData()) {
             System.out.println("WARNING: sdk-app-collection not installed in Splunk; skipping test.");
             return;
         }
 
-        installApplicationFromTestData("modular-inputs");
+        installApplicationFromTestData("modular_inputs");
 
         // Determine what script to use for the input
         String filename;
         if (service.getInfo().getOsName().equals("Windows")) {
             // Windows
-            filename = "etc\\apps\\modular-inputs\\bin\\echo.bat";
+            filename = "etc\\apps\\modular_inputs\\bin\\echo.bat";
         } else {
             // Linux or Mac OS X
-            filename = "etc/apps/modular-inputs/bin/echo.sh";
+            filename = "etc/apps/modular_inputs/bin/echo.sh";
         }
 
         // Create

splunk/src/test/java/com/splunk/ModularInputKindsTest.java

@@ -29,7 +29,7 @@ public void checkModularInputKind(ModularInputKind m) {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 
@@ -43,28 +43,25 @@ public void checkModularInputKind(ModularInputKind m) {
 
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testListInputKinds() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
-
         for (ModularInputKind kind : inputKinds.values()) {
             checkModularInputKind(kind);
         }
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testInputByName() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
         ModularInputKind m;
@@ -74,27 +71,25 @@ public void testInputByName() {
         checkModularInputKind(m);
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testNonexistantArg() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
         ModularInputKind test1 = inputKinds.get("test1");
         Assert.assertFalse(test1.hasArgument("nonexistant_argument"));
         Assert.assertNull(test1.getArgument("nonexistant_argument"));
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testInputKindDescriptionAndTitle() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
         ModularInputKind test1 = inputKinds.get("test1");
@@ -107,13 +102,12 @@ public void testInputKindDescriptionAndTitle() {
         Assert.assertEquals("test2", test2.getTitle());
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testArgDescription() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 
@@ -135,13 +129,12 @@ public void testArgDescription() {
         }
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testArgDataType() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 
@@ -162,13 +155,12 @@ public void testArgDataType() {
         }
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testRequiredOnCreate() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 
@@ -187,13 +179,12 @@ public void testRequiredOnCreate() {
         }
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testRequiredOnEdit() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 
@@ -212,13 +203,12 @@ public void testRequiredOnEdit() {
         }
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testGetArguments() {
         if (service.versionIsEarlierThan("5.0") || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             inputKinds = service.getModularInputKinds();
         }
 

splunk/src/test/java/com/splunk/ModularInputTest.java

@@ -21,13 +21,12 @@
 import org.junit.Test;
 
 public class ModularInputTest extends InputTest {
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testModularInputKinds() {
         if (service.versionCompare("5.0") < 0 || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             // Will not pick up the new inputs unless a restart is done.
             // Nevertheless Splunk does not request a restart after app installation.
             uncheckedSplunkRestart();
@@ -43,13 +42,12 @@ public void testModularInputKinds() {
         Assert.assertTrue(hasTest2);
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testListModularInputs() {
         if (service.versionCompare("5.0") < 0 || !hasTestData()) {
             return;
         } else {
-            installApplicationFromTestData("modular-inputs");
+            installApplicationFromTestData("modular_inputs");
             // Will not pick up the new inputs unless a restart is done.
             // Nevertheless Splunk does not request a restart after app installation.
             uncheckedSplunkRestart();

splunk/src/test/java/com/splunk/SDKTestCase.java

@@ -213,13 +213,13 @@ public static boolean assertEventuallyTrue(EventuallyTrueBehavior behavior) {
     // === Test Data Installation ===
 
     public boolean hasTestData() {
-        String collectionName = "sdk-app-collection";
-        return service.getApplications().containsKey("sdk-app-collection");
+        String collectionName = "sdkappcollection";
+        return service.getApplications().containsKey("sdkappcollection");
     }
 
     public void installApplicationFromTestData(String applicationName) {
-        String collectionName = "sdk-app-collection";
-        if (!service.getApplications().containsKey("sdk-app-collection")) {
+        String collectionName = "sdkappcollection";
+        if (!service.getApplications().containsKey("sdkappcollection")) {
             throw new TestDataNotInstalledException();
         }
 
@@ -248,10 +248,13 @@ public void installApplicationFromTestData(String applicationName) {
         String appPath = Util.join(separator, pathComponents);
 
         Args args = new Args();
+
         args.put("name", appPath);
-        args.put("update", "1");
-        service.post("apps/appinstall", args);
-
+        args.put("filename", true);
+        args.put("update", true);
+
+        service.post("apps/local", args);
+
         installedApps.add(applicationName);
     }
 

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

@@ -656,7 +656,6 @@ public void testAttributes() {
         job.cancel();
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testEnablePreview() throws InterruptedException {
         if (!hasTestData()) {
@@ -709,7 +708,6 @@ public boolean predicate() {
         waitForSleepingJobToDie(job);
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testDisablePreview() throws InterruptedException {
         if (!hasTestData()) {
@@ -782,7 +780,6 @@ public boolean predicate() {
         } catch (InterruptedException e) {}
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testSetPriority() throws InterruptedException {
         if (!hasTestData()) {
@@ -833,7 +830,6 @@ public boolean predicate() {
         job.cancel();
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testPause() throws InterruptedException {
         if (!hasTestData()) {
@@ -867,7 +863,6 @@ public boolean predicate() {
         job.cancel();
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testUnpause() throws InterruptedException {
         if (!hasTestData()) {
@@ -901,7 +896,6 @@ public boolean predicate() {
         job.cancel();
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testFinalize() throws InterruptedException {
         if (!hasTestData()) {
@@ -932,7 +926,6 @@ public boolean predicate() {
         job.cancel();
     }
 
-    @Ignore("apps/appinstall endpoint is removed in version 8.1.0")
     @Test
     public void testDone() throws InterruptedException {
         if (!hasTestData()) {