feat: add python.version server.conf variants for Splunk 9.4

Author: dkaras-splunk

.github/workflows/main.yml

@@ -24,9 +24,20 @@ jobs:
       - uses: actions/setup-python@v5
       - uses: pre-commit/action@v3.0.1
 
-  build_release:
+  test:
     runs-on: ubuntu-latest
     needs: pre-commit
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+      - run: pip install -r requirements.txt -r requirements-test.txt
+      - run: pytest tests/test_splunk_matrix_update.py -v
+
+  build_release:
+    runs-on: ubuntu-latest
+    needs: [pre-commit, test]
     permissions:
       contents: read
       packages: write

action.yml

@@ -4,7 +4,19 @@ inputs:
   features:
     description: 'Comma separated list of features.'
     required: false
-    type: string
+outputs:
+  supportedSplunk:
+    description: 'JSON array of all supported Splunk versions'
+  supportedSplunkModinput:
+    description: 'JSON array of supported Splunk versions with server_conf_python_versions variants expanded for modinput tests'
+  latestSplunk:
+    description: 'JSON array with the single latest Splunk version'
+  supportedSC4S:
+    description: 'JSON array of all supported SC4S versions'
+  supportedModinputFunctionalVendors:
+    description: 'JSON array of supported modinput functional vendor versions'
+  supportedUIVendors:
+    description: 'JSON array of supported UI vendor versions'
 runs:
   using: "docker"
-  image: 'docker://ghcr.io/splunk/addonfactory-test-matrix-action/addonfactory-test-matrix-action:v3.1.7'
+  image: 'Dockerfile'

addonfactory_test_matrix_action/main.py

@@ -18,40 +18,69 @@ def has_features(features, section):
     return True
 
 
-def _generate_supported_splunk(args, path):
+_ALLOWED_SERVER_CONF_PYTHON_VERSIONS = {"python3", "force_python3"}
+
+
+def _load_splunk_config(path):
     if os.path.exists("splunk_matrix.conf"):
         splunk_matrix = "splunk_matrix.conf"
     else:
         splunk_matrix = os.path.join(path, "splunk_matrix.conf")
     config = configparser.ConfigParser()
     config.read(splunk_matrix)
-    supported_splunk = []
+    return config
+
+
+def _iter_splunk_sections(args, config):
+    """Yield (section, props, base_entry) for each non-EOL, feature-matching Splunk version."""
+    today = datetime.now().date()
     for section in config.sections():
-        if re.search(r"^\d+", section):
-            props = {}
-            supported_splunk_string = config[section]["SUPPORTED"]
-            eol = datetime.strptime(supported_splunk_string, "%Y-%m-%d").date()
-            today = datetime.now().date()
-            if today >= eol:
-                continue
-
-            if not has_features(args.features, config[section]):
-                continue
-            for k in config[section].keys():
-                try:
-                    value = config[section].getboolean(k)
-                except:
-                    value = config[section][k]
-                props[k] = value
+        if not re.search(r"^\d+", section):
+            continue
+        eol = datetime.strptime(config[section]["SUPPORTED"], "%Y-%m-%d").date()
+        if today >= eol:
+            continue
+        if not has_features(args.features, config[section]):
+            continue
+        props = {}
+        for k in config[section].keys():
+            try:
+                value = config[section].getboolean(k)
+            except ValueError:
+                value = config[section][k]
+            props[k] = value
+        base_entry = {
+            "version": props["version"],
+            "build": props["build"],
+            "islatest": (config["GENERAL"]["LATEST"] == section),
+            "isoldest": (config["GENERAL"]["OLDEST"] == section),
+        }
+        yield section, props, base_entry
 
-            supported_splunk.append(
-                {
-                    "version": props["version"],
-                    "build": props["build"],
-                    "islatest": (config["GENERAL"]["LATEST"] == section),
-                    "isoldest": (config["GENERAL"]["OLDEST"] == section),
-                }
-            )
+
+def _generate_supported_splunk(args, path):
+    config = _load_splunk_config(path)
+    return [base_entry for _, _, base_entry in _iter_splunk_sections(args, config)]
+
+
+def _generate_supported_splunk_modinput(args, path):
+    config = _load_splunk_config(path)
+    supported_splunk = []
+    for _, props, base_entry in _iter_splunk_sections(args, config):
+        raw = props.get("server_conf_python_versions")
+        if raw:
+            for python_version in raw.split(","):
+                python_version = python_version.strip()
+                if python_version not in _ALLOWED_SERVER_CONF_PYTHON_VERSIONS:
+                    raise ValueError(
+                        f"Invalid server_conf_python_versions value: {python_version!r}. "
+                        f"Allowed: {sorted(_ALLOWED_SERVER_CONF_PYTHON_VERSIONS)}"
+                    )
+                variant = dict(base_entry)
+                variant["serverConfPythonVersion"] = python_version
+                supported_splunk.append(variant)
+        else:
+            supported_splunk.append(base_entry)
     return supported_splunk
 
 
@@ -136,6 +165,15 @@ def main():
     with open(os.environ["GITHUB_OUTPUT"], "a") as fh:
         print(f"supportedSplunk={json.dumps(supported_splunk)}", file=fh)
 
+    supported_splunk_modinput = _generate_supported_splunk_modinput(args, path)
+    pprint.pprint(
+        f"Supported Splunk versions (modinput): {json.dumps(supported_splunk_modinput)}"
+    )
+    with open(os.environ["GITHUB_OUTPUT"], "a") as fh:
+        print(
+            f"supportedSplunkModinput={json.dumps(supported_splunk_modinput)}", file=fh
+        )
+
     for splunk in supported_splunk:
         if splunk["islatest"]:
             pprint.pprint(f"Latest Splunk version: {json.dumps([splunk])}")

config/SC4S_matrix.conf

@@ -1,6 +1,6 @@
 #SC4S Major versions
 #
 [2]
-VERSION=3.42.0
+VERSION=3.40.0
 DOCKER_REGISTRY=ghcr.io/splunk/splunk-connect-for-syslog/container3
 

config/splunk_matrix.conf

@@ -1,32 +1,40 @@
 [GENERAL]
-LATEST = 10.2
+LATEST = 10.4
 OLDEST = 9.3
 
 [10.2]
-VERSION = 10.2.2
-BUILD = 80b90d638de6
+VERSION = 10.2.4
+BUILD = 1526e5e5df42
 SUPPORTED = 2028-01-15
 PYTHON39 = true
 PYTHON37 = false
 
 [10.0]
-VERSION = 10.0.5
-BUILD = 3d2e2618f448
+VERSION = 10.0.7
+BUILD = d24b16fd5f20
 SUPPORTED = 2027-07-28
 PYTHON39 = true
 PYTHON37 = false
 
 [9.4]
-VERSION = 9.4.10
-BUILD = 3673ab0c12ee
+VERSION = 9.4.12
+BUILD = 9dfc486f3d48
 SUPPORTED = 2026-12-16
 PYTHON39 = true
 PYTHON37 = false
+SERVER_CONF_PYTHON_VERSIONS = python3,force_python3
 
 [9.3]
-VERSION = 9.3.11
-BUILD = 0c8d350423a0
+VERSION = 9.3.13
+BUILD = 688758e24bbe
 SUPPORTED = 2026-07-24
 PYTHON39 = true
 PYTHON37 = false
 
+[10.4]
+VERSION = 10.4.0
+BUILD = f798d4d49089
+SUPPORTED = 2028-05-18
+PYTHON39 = true
+PYTHON37 = false
+

requirements-test.txt

@@ -0,0 +1 @@
+pytest

requirements.txt

@@ -1,2 +1,3 @@
 requests
 packaging
+urllib3>=1.26.0,<2.0.0