insightconnect-plugin-runtime 6.3.0__tar.gz → 6.3.1__tar.gz

{insightconnect_plugin_runtime-6.3.0/insightconnect_plugin_runtime.egg-info → insightconnect_plugin_runtime-6.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: insightconnect-plugin-runtime
-Version: 6.3.0
+Version: 6.3.1
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -224,6 +224,7 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 6.3.1 - Improved filtering for `custom_config` parameters for plugin tasks
 * 6.3.0 - Add Tracing Instrumentation
 * 6.2.6 - Remove setuptools after installation
 * 6.2.5 - Fixed bug related to failure to set default region to assume role method in `aws_client` for newer versions of boto3 | Updated alpine image packages on build

{insightconnect_plugin_runtime-6.3.0 → insightconnect_plugin_runtime-6.3.1}/README.md

@@ -182,6 +182,7 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 6.3.1 - Improved filtering for `custom_config` parameters for plugin tasks
 * 6.3.0 - Add Tracing Instrumentation
 * 6.2.6 - Remove setuptools after installation
 * 6.2.5 - Fixed bug related to failure to set default region to assume role method in `aws_client` for newer versions of boto3 | Updated alpine image packages on build

{insightconnect_plugin_runtime-6.3.0 → insightconnect_plugin_runtime-6.3.1}/insightconnect_plugin_runtime/api/endpoints.py

@@ -24,9 +24,11 @@ from insightconnect_plugin_runtime.exceptions import (
     ServerException,
 )
 from insightconnect_plugin_runtime.util import OutputMasker
+from uuid import UUID
 
 logger = structlog.get_logger("plugin")
 ORG_ID = "X-IPIMS-ORGID"
+INT_ID = "X-INTEGRATION-ID"
 
 PLUGIN_SPEC_DOCKERFILE = "/python/src/plugin.spec.yaml"
 PLUGIN_SPEC_PACK = "/workspace/plugin.spec.yaml"
@@ -173,15 +175,20 @@ class Endpoints:
                 500:
                   description: Unexpected error
             """
+
             self.logger.info("Plugin task beginning execution...")
             input_message = request.get_json(force=True)
             self.logger.debug("Request input: %s", input_message)
             Endpoints.validate_action_trigger_task_empty_input(input_message)
             Endpoints.validate_action_trigger_task_name(input_message, name, "task")
+
             # No validation on the plugin custom config to leave this as configurable as possible.
             # `add_plugin_custom_config` will pass any available values to the plugin for interpretation.
             input_message = self.add_plugin_custom_config(
-                input_message, request.headers.get(ORG_ID)
+                input_message,
+                request.headers.get(ORG_ID, ""),
+                request.headers.get(INT_ID, ""),
+                name,
             )
             output = self.run_action_trigger_task(input_message, mask_output=False)
             self.logger.info("Plugin task finished execution...")
@@ -787,7 +794,7 @@ class Endpoints:
         return version
 
     def add_plugin_custom_config(
-            self, input_data: Dict[str, Any], org_id: str
+        self, input_data: Dict[str, Any], org_id: str, int_id: str, task_name: str
     ) -> Dict[str, Any]:
         """
         Using the retrieved configs pulled from komand-props, pass the configuration that matches the requesting
@@ -800,22 +807,100 @@ class Endpoints:
         - org 1 when in lookback mode will pull back 108 hours (task triggered with no state).
         - all orgs for default runs will poll back 12 hours.
         - all orgs in lookback mode will be 100 hours (task triggered with no state).
+
+        When Int ID is specified or task name. Then it can be used across all orgs (global config) or specific Org ID.
+        There's a hierarchy between task related config and Int ID related, where Int ID will always
+        replace task related config due to its higher priority.
+
+        Config example:
+        {
+            "org_1": {
+                "task_name_1": {
+                    "default": 12,
+                    "lookback": "100"
+                },
+                "int_1": {
+                    "default": 6,
+                    "lookback": "50"
+                },
+                {
+                    "default": 24,
+                    "lookback": "108"
+                }
+            },
+            "*": {
+                "default": 24,
+                "lookback": 200
+                "task_name_2": {
+                    "default": 2,
+                    "lookback": "10"
+                }
+            }
+        }
+
+        In this config example the following we be applied:
+        - org 1 to has a custom default time of 24 hours for their timings.
+        - org 1 when in lookback mode will pull back 108 hours (task triggered with no state).
+        - org 1 all integrations that uses task with 'task_name_1' will pull back 100 hours
+        and have a custom default time of 12 hours for their timings.
+        - org 1 specific integration 'int_1' will pull back 50 hours and have a custom
+        default time of 6 hours for their timings.
+        - all orgs for default runs will poll back 24 hours.
+        - all orgs in lookback mode will be 200 hours (task triggered with no state).
+        - all orgs that uses task with 'task_name_2' will pull back 2 hours
+        - all orgs that uses task with 'task_name_2' in lookback mode will be 10 hours
         """
-        additional_config = self.config_options.get(org_id) or self.config_options.get(
-            "*"
-        )
+
+        # Parse configuration based on organization or global. Use its copies, not to modify original dict.
+        organization_config, global_config = self.config_options.get(org_id, {}).copy(), self.config_options.get("*", {}).copy()
+
+        # Definition of additional config and its type variables.
+        additional_config, config_type = {}, ""
+
+        # Check if we have a global config.
+        # Also, use "config_type" variable just for logging purposes to have an indicator from where the config was pulled.
+        if global_config:
+            # Setup global config as starting point.
+            additional_config, config_type = global_config, "GLOBAL"
+
+            # If task configuration was found under global config, update it with task config to replace necessary values.
+            if task_config := global_config.get(task_name):
+                additional_config.update(task_config)
+                config_type = "GLOBAL_TASK"
+
+        # If organization config is present, then replace its values with the ones coming from global config.
+        if organization_config:
+            # Update additional config with values coming from organization config.
+            additional_config.update(organization_config)
+            config_type = "ORG"
+
+            # If task configuration was found under organization, replace its values with organization config.
+            if task_config := organization_config.get(task_name):
+                additional_config.update(task_config)
+                config_type = "ORG_TASK"
+
+            # If integration config was found under organization replace its values with organization
+            # and task config (higher priority).
+            if integration_config := organization_config.get(int_id):
+                additional_config.update(integration_config)
+                config_type = "ORG_INT"
+
         if additional_config:
             self.logger.info(
-                "Found config options; adding this to the request parameters..."
+                f"Found config options ({config_type}); adding this to the request parameters..."
             )
-            additional_config = (
-                additional_config.copy()
-            )  # copy to preserve the referenced value in self.config_options
+
+            # Sopy to preserve the referenced value in self.config_options.
+            # Also, remove unnecessary fields from that config (int_ids, or task_names) that occurs
+            # when updated global dictionary above. This thing is that we use global config as base
+            # and then updating some fields depending on the configuration.
+            additional_config = self._remove_unnecessary_fields_from_custom_config(additional_config)
+
             # As a safeguard we only pass the lookback config params if the plugin has no state
             # This means we still need to manually delete the state for plugins on a per org basis.
             # This also means first time customers for their 'initial' lookup would get the lookback value passed in.
             if input_data.get("body", {}).get("state") and additional_config.get(
-                    "lookback"
+                "lookback"
             ):
                 self.logger.info(
                     "Found an existing plugin state, not passing lookback value..."
@@ -842,8 +927,8 @@ class Endpoints:
             if isinstance(wrapped_exception, ClientException):
                 status_code = 400
             elif (
-                    isinstance(wrapped_exception, PluginException)
-                    and wrapped_exception.preset is PluginException.Preset.BAD_REQUEST
+                isinstance(wrapped_exception, PluginException)
+                and wrapped_exception.preset is PluginException.Preset.BAD_REQUEST
             ):
                 status_code = 400
             elif isinstance(wrapped_exception, (ConnectionTestException, ClientException)):
@@ -868,8 +953,8 @@ class Endpoints:
         if isinstance(wrapped_exception, (ConnectionTestException, ClientException)):
             return 400
         elif (
-                isinstance(wrapped_exception, PluginException)
-                and wrapped_exception.preset is PluginException.Preset.BAD_REQUEST
+            isinstance(wrapped_exception, PluginException)
+            and wrapped_exception.preset is PluginException.Preset.BAD_REQUEST
         ):
             return 400
         elif isinstance(wrapped_exception, ServerException):
@@ -878,3 +963,46 @@ class Endpoints:
             return 501
         else:
             return 500
+
+    def _remove_unnecessary_fields_from_custom_config(self, additional_config: Dict[str, Any]) -> Dict[str, Any]:
+        """
+        Removes unnecessary fields from custom config such as other task names, and int_ids,
+        leaving only the fields that needs to be parsed.
+
+        :param additional_config: The custom config dictionary on which, unnecessary fields will be removed.
+        :type additional_config: Dict[str, Any]
+
+        :return: New custom config dictionary with unnecessary fields removed.
+        :rtype: Dict[str, Any]
+        """
+
+        # Copy 'additional_config' not to operate on it
+        config_copy = additional_config.copy()
+
+        # Remove other task names from config
+        for task_ in self.plugin.tasks.keys():
+            config_copy.pop(task_, None)
+
+        # Remove other int_ids from config
+        for key_ in additional_config.keys():
+            if self._check_if_uuid(key_):
+                config_copy.pop(key_, None)
+        return config_copy
+
+    @staticmethod
+    def _check_if_uuid(input_string: str) -> bool:
+        """
+        Validates whether the provided string matches UUID format specifications.
+
+        :param input_string: The string to validate against UUID format standards
+        :type input_string: str
+
+        :return: True if the string is a valid UUID, False otherwise
+        :rtype: bool
+        """
+
+        try:
+            UUID(input_string)
+            return True
+        except (TypeError, ValueError):
+            return False

{insightconnect_plugin_runtime-6.3.0 → insightconnect_plugin_runtime-6.3.1/insightconnect_plugin_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: insightconnect-plugin-runtime
-Version: 6.3.0
+Version: 6.3.1
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -224,6 +224,7 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 6.3.1 - Improved filtering for `custom_config` parameters for plugin tasks
 * 6.3.0 - Add Tracing Instrumentation
 * 6.2.6 - Remove setuptools after installation
 * 6.2.5 - Fixed bug related to failure to set default region to assume role method in `aws_client` for newer versions of boto3 | Updated alpine image packages on build

{insightconnect_plugin_runtime-6.3.0 → insightconnect_plugin_runtime-6.3.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="insightconnect-plugin-runtime",
-    version="6.3.0",
+    version="6.3.1",
     description="InsightConnect Plugin Runtime",
     long_description=long_description,
     long_description_content_type="text/markdown",

{insightconnect_plugin_runtime-6.3.0 → insightconnect_plugin_runtime-6.3.1}/tests/unit/test_endpoints.py

@@ -1,11 +1,42 @@
-import unittest
 import json
+import unittest
+from typing import Any, Dict
 
-from insightconnect_plugin_runtime.api.endpoints import Endpoints
-from insightconnect_plugin_runtime.plugin import Plugin
-from insightconnect_plugin_runtime.action import Action
 from insightconnect_plugin_runtime import Input
+from insightconnect_plugin_runtime.action import Action
+from insightconnect_plugin_runtime.api.endpoints import Endpoints
 from insightconnect_plugin_runtime.connection import Connection
+from insightconnect_plugin_runtime.plugin import Plugin
+from insightconnect_plugin_runtime.task import Task
+from parameterized import parameterized
+
+MOCKED_CONFIG = {
+    "*": {
+        "first_property": "first_property_global",
+        "second_property": "second_property_global",
+        "task_name_1": {"second_property": "second_property_global_task_name_1"},
+    },
+    "org_1": {
+        "first_property": "first_property_org_1",
+        "11111111-1111-1111-1111-111111111111": {
+            "first_property": "first_property_org_1_11111111-1111-1111-1111-111111111111"
+        },
+        "task_name_2": {"second_property": "second_property_task_name_2"},
+        "task_name_3": {
+            "first_property": "first_property_task_name_3",
+            "second_property": "second_property_task_name_3",
+        },
+        "22222222-2222-2222-2222-222222222222": {
+            "first_property": "first_property_org_1_22222222-2222-2222-2222-222222222222",
+            "second_property": "second_property_org_1_22222222-2222-2222-2222-222222222222",
+        },
+    },
+    "org_2": {
+        "first_property": "first_property_org_2",
+        "second_property": "second_property_org_2",
+        "task_name_1": {"first_property": "first_property_org_1_task_name_1"},
+    },
+}
 
 
 class TestDefinitionsAllActions(unittest.TestCase):
@@ -18,6 +49,7 @@ class TestDefinitionsAllActions(unittest.TestCase):
             workers=None,
             threads=None,
             master_pid=None,
+            config_options=MOCKED_CONFIG,
         )
 
         plugin = Plugin(
@@ -28,6 +60,11 @@ class TestDefinitionsAllActions(unittest.TestCase):
             connection=Connection(input=None),
         )
 
+        # Add example tasks
+        for task in ("task_name_1", "task_name_2", "task_name_3"):
+            plugin.add_task(
+                Task(name=task, description="Test", input=None, output=None)
+            )
         self.endpoints.plugin = plugin
 
     def test_input_good(self):
@@ -213,3 +250,106 @@ class TestDefinitionsAllActions(unittest.TestCase):
         actual = self.endpoints._create_action_definitions_payload()
 
         self.assertNotEqual(expected, actual)
+
+    @parameterized.expand(
+        [
+            (
+                "",
+                "",
+                "no_task_in_properties",
+                {
+                    "first_property": "first_property_global",
+                    "second_property": "second_property_global",
+                },
+            ),
+            (
+                "",
+                "",
+                "task_name_1",
+                {
+                    "first_property": "first_property_global",
+                    "second_property": "second_property_global_task_name_1",
+                },
+            ),
+            (
+                "org_1",
+                "",
+                "no_task_in_properties",
+                {
+                    "first_property": "first_property_org_1",
+                    "second_property": "second_property_global",
+                },
+            ),
+            (
+                "org_1",
+                "11111111-1111-1111-1111-111111111111",
+                "no_task_in_properties",
+                {
+                    "first_property": "first_property_org_1_11111111-1111-1111-1111-111111111111",
+                    "second_property": "second_property_global",
+                },
+            ),
+            (
+                "org_1",
+                "11111111-1111-1111-1111-111111111111",
+                "task_name_2",
+                {
+                    "first_property": "first_property_org_1_11111111-1111-1111-1111-111111111111",
+                    "second_property": "second_property_task_name_2",
+                },
+            ),
+            (
+                "org_1",
+                "11111111-1111-1111-1111-111111111111",
+                "task_name_3",
+                {
+                    "first_property": "first_property_org_1_11111111-1111-1111-1111-111111111111",
+                    "second_property": "second_property_task_name_3",
+                },
+            ),
+            (
+                "org_1",
+                "22222222-2222-2222-2222-222222222222",
+                "no_task_in_properties",
+                {
+                    "first_property": "first_property_org_1_22222222-2222-2222-2222-222222222222",
+                    "second_property": "second_property_org_1_22222222-2222-2222-2222-222222222222",
+                },
+            ),
+            (
+                "org_1",
+                "22222222-2222-2222-2222-222222222222",
+                "task_name_2",
+                {
+                    "first_property": "first_property_org_1_22222222-2222-2222-2222-222222222222",
+                    "second_property": "second_property_org_1_22222222-2222-2222-2222-222222222222",
+                },
+            ),
+            (
+                "org_2",
+                "",
+                "",
+                {
+                    "first_property": "first_property_org_2",
+                    "second_property": "second_property_org_2",
+                },
+            ),
+            (
+                "org_2",
+                "",
+                "task_name_1",
+                {
+                    "first_property": "first_property_org_1_task_name_1",
+                    "second_property": "second_property_org_2",
+                },
+            ),
+        ]
+    )
+    def test_add_plugin_custom_config(
+        self, org_id: str, int_id: str, task_name: str, expected: Dict[str, Any]
+    ) -> None:
+        response = self.endpoints.add_plugin_custom_config(
+            {"body": {}}, org_id, int_id, task_name
+        )
+        custom_config = response.get("body", {}).get("custom_config", {})
+        self.assertEqual(custom_config, expected)