feat: add cim 6.2.0 support (#928)

harshilgajera-crest · mkolasinski-splunk · dvarasani-crest · web-flow · commit 119dcc6cc4c7 · 2025-12-01T11:24:21.000+05:30
Adding support for cim 6.2.0
Adding compatibility for python 3.13
Update ignore_internal_errors file

---------

Co-authored-by: mkolasinski-splunk &lt;105011638+mkolasinski-splunk@users.noreply.github.com&gt;
Co-authored-by: dvarasani-crest &lt;151819886+dvarasani-crest@users.noreply.github.com&gt;
Co-authored-by: Marcin Bruzda &lt;94437843+mbruzda-splunk@users.noreply.github.com&gt;
Co-authored-by: srv-rr-github-token &lt;94607705+srv-rr-github-token@users.noreply.github.com&gt;
Co-authored-by: mbruzda &lt;mbruzda@splunk.com&gt;
Co-authored-by: Darshan Varasani &lt;dvarasani@splunk.com&gt;
diff --git a/NOTICE b/NOTICE
@@ -7,9 +7,9 @@
 
 The following 3rd-party software packages may be used by or distributed with pytest-splunk-addon. Any information relevant to third-party vendors listed below are collected using common, reasonable means.
 
-Date generated: 2025-10-27
+Date generated: 2025-11-19
 
-Revision ID: 6303babdf76a1a5c0dabd335e2fda2f069c87948
+Revision ID: 683fb5aecf5f30568520e0b9e320bf59f22e13bf
 
 ================================================================================
 ================================================================================
@@ -66,9 +66,9 @@ No licenses found
 - jsonschema (4.17.3) [MIT, Apache-2.0]
 - junitparser (4.0.2) [Apache-2.0]
 - packaging (24.0) [Apache-2.0]
-- pkgutil_resolve_name (1.3.10) [MIT, PSF-2.0]
+- pkgutil_resolve_name (1.3.10) [PSF-2.0, MIT]
 - pluggy (1.2.0) [MIT]
-- pyparsing (3.1.4) [MIT, BSD-3-Clause, MIT-CMU, GPL-1.0-only]
+- pyparsing (3.1.4) [MIT, MIT-CMU, GPL-1.0-only, BSD-3-Clause]
 - pyrsistent (0.19.3) [MIT, BSD-3-Clause]
 - pytest (7.4.4) [MIT]
 - pytest-ordering (0.6) [MIT]
@@ -1927,7 +1927,24 @@ Package Depth: Transitive
 --------------------------------------------------------------------------------
 
 * Declared Licenses *
-MIT, PSF-2.0
+PSF-2.0, MIT
+
+* PSF-2.0 *
+--------------------------------------------------------------------------------
+File matches:
+LICENSE
+--------------------------------------------------------------------------------
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+
+  1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.
+  2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.
+  3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.
+  4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+  6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
+  7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
+  8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement.
 
 * MIT *
 --------------------------------------------------------------------------------
@@ -2012,23 +2029,6 @@ agrees to be bound by the terms and conditions of this License
 Agreement.
 
 
-* PSF-2.0 *
---------------------------------------------------------------------------------
-File matches:
-LICENSE
---------------------------------------------------------------------------------
-
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-
-  1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated documentation.
-  2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee.
-  3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to Python.
-  4. PSF is making Python available to Licensee on an "AS IS" basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
-  5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-  6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
-  7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between PSF and Licensee. This License Agreement does not grant permission to use PSF trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
-  8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this License Agreement.
-
 
 --------------------------------------------------------------------------------
 Package Title: pluggy (1.2.0)
@@ -2111,12 +2111,37 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 * Other Licenses *
-BSD-3-Clause, MIT-CMU, GPL-1.0-only
+MIT-CMU, GPL-1.0-only, BSD-3-Clause
+
+* MIT-CMU *
+--------------------------------------------------------------------------------
+File matches:
+examples/snmp_api.h
+--------------------------------------------------------------------------------
+
+
+Copyright 1989, 1991, 1992 by Carnegie Mellon University
+Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of the University of California
+All Rights Reserved
+Permission to use, copy, modify and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of CMU and The Regents of the University of California not be used in advertising or publicity pertaining to distribution of the software without specific written permission.
+CMU AND THE REGENTS OF THE UNIVERSITY OF CALIFORNIA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL CMU OR THE REGENTS OF THE UNIVERSITY OF CALIFORNIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+* GPL-1.0-only *
+--------------------------------------------------------------------------------
+File matches:
+examples/verilog_parse.py
+--------------------------------------------------------------------------------
+
+
+Copyright (C) 2004-2011 Paul T. McGuire.  All rights reserved.
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 1.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 * BSD-3-Clause *
 --------------------------------------------------------------------------------
 File matches:
-examples/searchparser.py
+examples/booleansearchparser.py
 --------------------------------------------------------------------------------
 
 
@@ -2147,31 +2172,6 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-* MIT-CMU *
---------------------------------------------------------------------------------
-File matches:
-examples/snmp_api.h
---------------------------------------------------------------------------------
-
-
-Copyright 1989, 1991, 1992 by Carnegie Mellon University
-Derivative Work - 1996, 1998-2000 Copyright 1996, 1998-2000 The Regents of the University of California
-All Rights Reserved
-Permission to use, copy, modify and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of CMU and The Regents of the University of California not be used in advertising or publicity pertaining to distribution of the software without specific written permission.
-CMU AND THE REGENTS OF THE UNIVERSITY OF CALIFORNIA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL CMU OR THE REGENTS OF THE UNIVERSITY OF CALIFORNIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM THE LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-* GPL-1.0-only *
---------------------------------------------------------------------------------
-File matches:
-examples/verilog_parse.py
---------------------------------------------------------------------------------
-
-
-Copyright (C) 2004-2011 Paul T. McGuire.  All rights reserved.
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 1.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 
 --------------------------------------------------------------------------------
 Package Title: pyrsistent (0.19.3)
@@ -5913,13 +5913,13 @@ Copyright (c) 2022 SISSA (International School for Advanced Studies).
 
 Copyright (c) 2018-2021 SISSA (International School for Advanced Studies).
 
-Copyright (c) 2018-2023 SISSA (International School for Advanced Studies).
-
 Copyright (c) 2018-2022 SISSA (International School for Advanced Studies).
 
-Copyright (c) 2023 SISSA (International School for Advanced Studies).
+Copyright (c) 2018-2023 SISSA (International School for Advanced Studies).
 
 Copyright (c) 2018 SISSA (International School for Advanced Studies).
+
+Copyright (c) 2023 SISSA (International School for Advanced Studies).
 MIT License
 Copyright (c) <year> <copyright holders>
 
@@ -6332,4 +6332,4 @@ This formulation of W3C's notice and license became active on August 14 1998 so
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
 
-Report Generated by FOSSA on 2025-10-27
+Report Generated by FOSSA on 2025-11-19
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@
 
 [tool.poetry]
 name = "pytest-splunk-addon"
-version = "6.2.0"
+version = "6.3.0-beta.3"
 description = "A Dynamic test tool for Splunk Apps and Add-ons"
 authors = ["Splunk <addonfactory@splunk.com>"]
 license = "APACHE-2.0"
diff --git a/pytest_splunk_addon/.ignore_splunk_internal_errors b/pytest_splunk_addon/.ignore_splunk_internal_errors
@@ -14,4 +14,6 @@ app="search" sid="*" message_key="" message=Failed to get latest bucketMap from
 ERROR SavedSplunker - savedsearch_id="nobody;cloud-monitoring-console-summarizer;splunk-svc", message="Error in 'eval' command: Failed to parse the provided arguments. Usage: eval dest_key = expression.". No actions executed
 SavedSplunker - savedsearch_id="nobody;splunk_instance_monitoring;SIM SS - Splunk Apps Manifest", message="Error in 'lookup' command: Could not construct lookup 'splunk_upgrade_prereq_es_installable_apps.csv, app, OUTPUT, es_managed'. See search.log for more details.". No actions executed
 ERROR SearchMessages - orig_component="SearchStatusEnforcer" app="search" sid="*" message_key="" message=Error in 'noah' command: operation='get_latest_bucket_map' failed with err='Failed Dependency'
-Error reading SSG config from KV Store
+Error reading SSG config from KV Store
+"service":"compsup"
+"service":"ipc_broker"
diff --git a/pytest_splunk_addon/CIM_Models/datamodel_definition.py b/pytest_splunk_addon/CIM_Models/datamodel_definition.py
@@ -2396,8 +2396,9 @@
         },
     },
 }
-# No fields changes between v6.0.0 and v6.0.2
+# No recommended/required fields changes between v6.0.0 and v6.2.0
 datamodels["6.0.1"] = datamodels["6.0.0"]
 datamodels["6.0.2"] = datamodels["6.0.0"]
 datamodels["6.1.0"] = datamodels["6.0.2"]
-datamodels["latest"] = datamodels["6.1.0"]
+datamodels["6.2.0"] = datamodels["6.1.0"]
+datamodels["latest"] = datamodels["6.2.0"]
diff --git a/pytest_splunk_addon/__init__.py b/pytest_splunk_addon/__init__.py
@@ -18,4 +18,4 @@
 
 __author__ = """Splunk Inc."""
 __email__ = "addonfactory@splunk.com"
-__version__ = "6.2.0"
+__version__ = "6.3.0-beta.3"
diff --git a/pytest_splunk_addon/addon_parser/props_parser.py b/pytest_splunk_addon/addon_parser/props_parser.py
@@ -203,7 +203,7 @@ def _get_extract_fields(self, name: str, value: str):
                 yield field
 
         # If SOURCE_KEY is used in EXTRACT, generate the test for the same.
-        regex_for_source_key = r"(?:(?i)in\s+(\w+))\s*$"
+        regex_for_source_key = r"(?i)(?:in\s+(\w+))\s*$"
         extract_source_key = re.search(regex_for_source_key, value, re.MULTILINE)
         if extract_source_key:
             LOGGER.info(f"Found a source key in {name}")
@@ -260,7 +260,7 @@ def _get_fieldalias_fields(self, name: str, value: str):
         """
         regex = (
             r"(\"(?:\\\"|[^\"])*\"|\'(?:\\\'|[^\'])*\'|[^\s,]+)"
-            r"\s+(?i)(?:as(?:new)?)\s+"
+            r"\s+(?:as(?:new)?)\s+"
             r"(\"(?:\\\"|[^\"])*\"|\'(?:\\\'|[^\'])*\'|[^\s,]+)"
         )
         fields_tuples = re.findall(regex, value, re.IGNORECASE)
diff --git a/pytest_splunk_addon/data_models/Data_Access.json b/pytest_splunk_addon/data_models/Data_Access.json
@@ -65,6 +65,11 @@
                     "type": "optional",
                     "comment": "Name of the destination as defined by the Vendor."
                 },
+                {
+                    "name": "dest_type",
+                    "type": "optional",
+                    "comment": "The type of the destination object, such as 'instance', 'storage', 'firewall', 'printer'."
+                },
                 {
                     "name": "dest_url",
                     "type": "optional",
diff --git a/pytest_splunk_addon/data_models/Endpoint.json b/pytest_splunk_addon/data_models/Endpoint.json
@@ -615,7 +615,7 @@
         {
           "name": "status",
           "type": "required",
-          "expected_values": ["critical", "started", "stopped", "warning"],
+          "expected_values": ["critical", "started", "stopped", "warning", "installed"],
           "validation": "",
           "comment": "The status of the service."
         },
diff --git a/pytest_splunk_addon/data_models/Intrusion_Detection.json b/pytest_splunk_addon/data_models/Intrusion_Detection.json
@@ -81,6 +81,11 @@
           "type": "optional",
           "comment": "The unique identifier or event code of the event signature."
         },
+        {
+          "name": "dest_type",
+          "type": "optional",
+          "comment": "The type of the destination object, such as 'instance', 'storage', 'firewall'."
+        },
         {
           "name": "src",
           "type": "conditional",
diff --git a/pytest_splunk_addon/data_models/Updates.json b/pytest_splunk_addon/data_models/Updates.json
@@ -28,6 +28,7 @@
             {
                 "name": "file_name",
                 "type": "required",
+                "multi_value": true,
                 "comment":"The name of the patch package that was installed or attempted." 
             },
             {
diff --git a/pytest_splunk_addon/sample_generation/rule.py b/pytest_splunk_addon/sample_generation/rule.py
@@ -188,7 +188,7 @@ def apply(self, events):
                             .replace(".", "-")
                         )
                         host_split = host.split("-")
-                        if re.match("\d+", host_split[-1]):
+                        if re.match(r"\d+", host_split[-1]):
                             host = "-".join(host_split[:-1])
                         new_event.metadata["host"] = "{}-{}".format(
                             host, event_host_count
@@ -327,7 +327,7 @@ def replace(self, sample, token_count):
         float_match = re.match(r"[Ff]loat\[(-?[\d\.]+):(-?[\d\.]+)\]", self.replacement)
         if float_match:
             lower_limit, upper_limit = float_match.groups()
-            precision = re.search("\[-?\d+\.?(\d*):", self.replacement).group(1)
+            precision = re.search(r"\[-?\d+\.?(\d*):", self.replacement).group(1)
             if not precision:
                 precision = str(1)
             for _ in range(token_count):
@@ -681,7 +681,7 @@ def replace(self, sample, token_count):
             yield self.token
         for _ in range(token_count):
             random_time = datetime.fromtimestamp(
-                randint(earliest_in_epoch, latest_in_epoch)
+                randint(int(earliest_in_epoch), int(latest_in_epoch))
             )
             if timezone_time in ["local", '"local"', "'local'"]:
                 random_time = random_time.replace(tzinfo=timezone.utc).astimezone(
diff --git a/pytest_splunk_addon/sample_generation/sample_stanza.py b/pytest_splunk_addon/sample_generation/sample_stanza.py
@@ -25,7 +25,7 @@
 
 LOGGER = logging.getLogger("pytest-splunk-addon")
 
-TIMEZONE_REX = "((\+1[0-2])|(-1[0-4])|[+|-][0][0-9])([0-5][0-9])"
+TIMEZONE_REX = r"((\+1[0-2])|(-1[0-4])|[+|-][0][0-9])([0-5][0-9])"
 BULK_EVENT_COUNT = 250
 
 token_value = namedtuple("token_value", ["key", "value"])
diff --git a/pytest_splunk_addon/splunk.py b/pytest_splunk_addon/splunk.py
@@ -842,7 +842,7 @@ def docker_ip():
     if not docker_host:
         return "127.0.0.1"
 
-    match = re.match("^tcp://(.+?):\d+$", docker_host)
+    match = re.match(r"^tcp://(.+?):\d+$", docker_host)
     if not match:
         raise ValueError('Invalid value for DOCKER_HOST: "%s".' % (docker_host,))
     return match.group(1)
diff --git a/tests/unit/tests_standard_lib/test_event_ingestors/test_ingestor_helper.py b/tests/unit/tests_standard_lib/test_event_ingestors/test_ingestor_helper.py
@@ -103,7 +103,7 @@ def test_ingestor_can_be_obtained(
         ingestor_helper.get_event_ingestor(ingest_method, "ingest_meta_data")
         == expected_output
     )
-    assert ingestors_mocks[expected_output].has_calls("ingest_meta_data")
+    ingestors_mocks[expected_output].assert_called_with("ingest_meta_data")
 
 
 @pytest.mark.parametrize(

Original file line number	Diff line number	Diff line change
`@@ -615,7 +615,7 @@`
`615`	`615`	`{`
`616`	`616`	`"name": "status",`
`617`	`617`	`"type": "required",`
`618`		`- "expected_values": ["critical", "started", "stopped", "warning"],`
	`618`	`+ "expected_values": ["critical", "started", "stopped", "warning", "installed"],`
`619`	`619`	`"validation": "",`
`620`	`620`	`"comment": "The status of the service."`
`621`	`621`	`},`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`{`
`29`	`29`	`"name": "file_name",`
`30`	`30`	`"type": "required",`
	`31`	`+ "multi_value": true,`
`31`	`32`	`"comment":"The name of the patch package that was installed or attempted."`
`32`	`33`	`},`
`33`	`34`	`{`