insightconnect-plugin-runtime 5.4.8__tar.gz → 5.4.9__tar.gz

{insightconnect_plugin_runtime-5.4.8/insightconnect_plugin_runtime.egg-info → insightconnect_plugin_runtime-5.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: insightconnect-plugin-runtime
-Version: 5.4.8
+Version: 5.4.9
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -211,6 +211,7 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 5.4.9 - Updated aws_client to clean assume role json object to remove any none or empty string values.
 * 5.4.8 - Address vulnerabilities within `gunicorn` and `idna` python packages.
 * 5.4.7 - Address vulnerabilities within `insightconnect-python-3-plugin` image.
 * 5.4.6 - Updated our cloud loggers to include the request path | Updated slim image to remediate vulnerabilities.

{insightconnect_plugin_runtime-5.4.8 → insightconnect_plugin_runtime-5.4.9}/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
+* 5.4.9 - Updated aws_client to clean assume role json object to remove any none or empty string values.
 * 5.4.8 - Address vulnerabilities within `gunicorn` and `idna` python packages.
 * 5.4.7 - Address vulnerabilities within `insightconnect-python-3-plugin` image.
 * 5.4.6 - Updated our cloud loggers to include the request path | Updated slim image to remediate vulnerabilities.

{insightconnect_plugin_runtime-5.4.8 → insightconnect_plugin_runtime-5.4.9}/insightconnect_plugin_runtime/clients/aws_client.py

@@ -15,6 +15,7 @@ from botocore.exceptions import ClientError
 import insightconnect_plugin_runtime
 from insightconnect_plugin_runtime.action import Action
 from insightconnect_plugin_runtime.exceptions import PluginException
+from insightconnect_plugin_runtime.helper import clean
 
 REGION = "region"
 EXTERNAL_ID = "external_id"
@@ -28,13 +29,13 @@ class PaginationHelper:
     """
 
     def __init__(
-        self,
-        input_token: List[str],
-        output_token: List[str],
-        result_key: List[str],
-        limit_key: str = None,
-        more_results: str = None,
-        non_aggregate_keys: List[str] = None,
+            self,
+            input_token: List[str],
+            output_token: List[str],
+            result_key: List[str],
+            limit_key: str = None,
+            more_results: str = None,
+            non_aggregate_keys: List[str] = None,
     ):
         self.input_token = input_token
         self.output_token = output_token
@@ -69,9 +70,9 @@ class PaginationHelper:
         is_paginated = False
 
         if (
-            self.more_results
-            and self.more_results in output.keys()
-            and output[self.more_results]
+                self.more_results
+                and self.more_results in output.keys()
+                and output[self.more_results]
         ):
             is_paginated = True
 
@@ -83,10 +84,10 @@ class PaginationHelper:
         return is_paginated
 
     def merge_responses(
-        self,
-        input_: Dict[str, Any],
-        response_1: Dict[str, Any],
-        response_2: Dict[str, Any],
+            self,
+            input_: Dict[str, Any],
+            response_1: Dict[str, Any],
+            response_2: Dict[str, Any],
     ) -> Tuple[Dict[str, Any], bool]:
         """
         Merges two output dictionaries together.
@@ -111,8 +112,7 @@ class PaginationHelper:
                 if len(response_1[response]) >= input_[self.limit_key]:
                     max_hit = True
                     response_1[response] = response_1[response][
-                        : input_[self.limit_key]
-                    ]
+                                           : input_[self.limit_key]]
 
         return response_1, max_hit
 
@@ -302,7 +302,7 @@ class ActionHelper:
 
     @classmethod
     def format_output(
-        cls, output_schema: Union[Dict[str, Any], None], output: Dict[str, Any]
+            cls, output_schema: Union[Dict[str, Any], None], output: Dict[str, Any]
     ) -> Any:
         """
         Formats a botocore response into a correct Komand response.
@@ -333,14 +333,14 @@ class AWSAction(Action):
     """
 
     def __init__(
-        self,
-        name: str,
-        description: str,
-        input_: insightconnect_plugin_runtime.Input,
-        output: insightconnect_plugin_runtime.Output,
-        aws_service: str,
-        aws_command: str,
-        pagination_helper: PaginationHelper = None,
+            self,
+            name: str,
+            description: str,
+            input_: insightconnect_plugin_runtime.Input,
+            output: insightconnect_plugin_runtime.Output,
+            aws_service: str,
+            aws_command: str,
+            pagination_helper: PaginationHelper = None,
     ):
         """
 
@@ -362,7 +362,7 @@ class AWSAction(Action):
         self.pagination_helper = pagination_helper
 
     def _handle_botocore_function(
-        self, client_function: Callable, params: Dict
+            self, client_function: Callable, params: Dict
     ) -> Dict:
         try:
             response = client_function(**params)
@@ -480,11 +480,11 @@ class AWSAction(Action):
             client_function = getattr(client, self.aws_command)
         except AttributeError:
             error_message = (
-                'Unable to find the command "'
-                + self.aws_service
-                + " "
-                + self.aws_command
-                + '"'
+                    'Unable to find the command "'
+                    + self.aws_service
+                    + " "
+                    + self.aws_command
+                    + '"'
             )
             self.logger.error(error_message)
             raise PluginException(cause=error_message)
@@ -533,17 +533,17 @@ class AWSAction(Action):
 
     @staticmethod
     def try_to_assume_role(
-        service_name: str,
-        assume_role_params: Dict[str, str],
-        auth_params: Dict[str, str],
+            service_name: str,
+            assume_role_params: Dict[str, str],
+            auth_params: Dict[str, str],
     ):
         session_name = str(uuid.uuid1())
         sts_client = boto3.client("sts", **auth_params)
         try:
             assumed_role_object = sts_client.assume_role(
-                RoleArn=assume_role_params.get(ROLE_ARN),
-                RoleSessionName=session_name,
-                ExternalId=assume_role_params.get(EXTERNAL_ID),
+                **clean({"RoleArn": assume_role_params.get(ROLE_ARN),
+                         "RoleSessionName": session_name,
+                         "ExternalId": assume_role_params.get(EXTERNAL_ID)})
             )
         except ClientError as error:
             raise PluginException(

{insightconnect_plugin_runtime-5.4.8 → insightconnect_plugin_runtime-5.4.9/insightconnect_plugin_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: insightconnect-plugin-runtime
-Version: 5.4.8
+Version: 5.4.9
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -211,6 +211,7 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 5.4.9 - Updated aws_client to clean assume role json object to remove any none or empty string values.
 * 5.4.8 - Address vulnerabilities within `gunicorn` and `idna` python packages.
 * 5.4.7 - Address vulnerabilities within `insightconnect-python-3-plugin` image.
 * 5.4.6 - Updated our cloud loggers to include the request path | Updated slim image to remediate vulnerabilities.

{insightconnect_plugin_runtime-5.4.8 → insightconnect_plugin_runtime-5.4.9}/setup.py

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