fix: input.template should not render interval field (#799)

splunk · Jul 7, 2023 · 6375de1 · 6375de1
1 parent abfad62
commit 6375de1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 31 deletions.
diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -115,7 +115,10 @@ jobs:
 
   test-ui:
     name: test-ui Splunk ${{ matrix.splunk.version }} -m ${{ matrix.test-mark }}
-    if: contains(github.event.pull_request.labels.*.name, 'run-ui-tests')
+    if: |
+      github.base_ref == 'main' ||
+      github.ref_name == 'main' ||
+      contains(github.event.pull_request.labels.*.name, 'run-ui-tests')
     runs-on: ubuntu-latest
     continue-on-error: true
     needs:

diff --git a/splunk_add_on_ucc_framework/commands/build.py b/splunk_add_on_ucc_framework/commands/build.py
@@ -131,7 +131,7 @@ def _add_modular_input(
         class_name = input_name.upper()
         description = service.get("title")
         entity = service.get("entity")
-        field_allow_list = frozenset(["name", "index", "sourcetype"])
+        field_allow_list = frozenset(["name", "interval", "index", "sourcetype"])
         template = "input.template"
         if "template" in service:
             template = service.get("template") + ".template"

diff --git a/...s/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_four.py b/...s/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_four.py
@@ -26,13 +26,6 @@ def get_scheme(self):
             )
         )
 
-        scheme.add_argument(
-            smi.Argument(
-                'interval',
-                required_on_create=True,
-            )
-        )
-
         return scheme
 
     def validate_input(self, definition):

diff --git a/...ns/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_one.py b/...ns/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_one.py
@@ -54,13 +54,6 @@ def get_scheme(self):
             )
         )
 
-        scheme.add_argument(
-            smi.Argument(
-                'interval',
-                required_on_create=True,
-            )
-        )
-
         scheme.add_argument(
             smi.Argument(
                 'account',

diff --git a/.../expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_three.py b/.../expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_three.py
@@ -26,13 +26,6 @@ def get_scheme(self):
             )
         )
 
-        scheme.add_argument(
-            smi.Argument(
-                'interval',
-                required_on_create=True,
-            )
-        )
-
         return scheme
 
     def validate_input(self, definition):

diff --git a/...ns/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_two.py b/...ns/expected_output_global_config_everything/Splunk_TA_UCCExample/bin/example_input_two.py
@@ -26,13 +26,6 @@ def get_scheme(self):
             )
         )
 
-        scheme.add_argument(
-            smi.Argument(
-                'interval',
-                required_on_create=True,
-            )
-        )
-
         scheme.add_argument(
             smi.Argument(
                 'account',

diff --git a/tests/testdata/test_addons/package_global_config_everything/globalConfig.json b/tests/testdata/test_addons/package_global_config_everything/globalConfig.json
@@ -1134,7 +1134,7 @@
     "meta": {
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.26.0Reeb03d63",
+        "version": "5.28.1R4adbf5c3",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.3"
     }