insightconnect-plugin-runtime 5.2.4__tar.gz → 5.3.1__tar.gz

{insightconnect-plugin-runtime-5.2.4/insightconnect_plugin_runtime.egg-info → insightconnect-plugin-runtime-5.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: insightconnect-plugin-runtime
-Version: 5.2.4
+Version: 5.3.1
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -15,11 +15,11 @@ Description-Content-Type: text/markdown
 Requires-Dist: requests==2.31.0
 Requires-Dist: python_jsonschema_objects==0.3.12
 Requires-Dist: jsonschema==3.2.0
-Requires-Dist: certifi==2022.12.7
+Requires-Dist: certifi==2023.7.22
 Requires-Dist: Flask==2.3.2
 Requires-Dist: gunicorn==20.0.4
-Requires-Dist: greenlet<=1.1.2,>=0.4.17
-Requires-Dist: gevent==20.9.0
+Requires-Dist: greenlet==3.0.1
+Requires-Dist: gevent==23.9.1
 Requires-Dist: marshmallow==3.4.0
 Requires-Dist: apispec==3.2.0
 Requires-Dist: apispec-webframeworks==0.5.2
@@ -48,10 +48,10 @@ to get started.
 
 ## Development of the InsightConnect Plugin Runtime
 
-The Python Runtime codebase is built to support Python 3.8+ as of version 4.0.0. The following dependencies will need 
+The Python Runtime codebase is built to support Python 3.9.18 as of version 5.3.0. The following dependencies will need 
 to be installed when developing or testing the Plugin Runtime:
 
-- Python 3.8
+- Python 3.9.18
 - Docker
 - make
 - tox
@@ -67,19 +67,51 @@ version and activate it. Then build, install, and confirm the package has been i
 > source venv/bin/activate
 > pip install -e ./
 > pip list | grep insightconnect-plugin-runtime
-insightconnect-plugin-runtime 4.0.0
+insightconnect-plugin-runtime 5.2.2
 ```
 
 #### Building the InsightConnect Plugin Runtime Docker Images
 
-Currently the `3-38` dockerfile is used by default when building the docker image. If you want to specify another 
-dockerfile for testing purposes, such as `3-38-slim`, you can pass it as an argument.
+Currently the `python-3` dockerfile is used by default when building the docker image. If you want to specify another
+dockerfile for testing purposes, such as `python-3-slim`, you can pass it as an argument.
 
 ```
-make build-image DOCKERFILE=3-38-slim
+make build-image DOCKERFILE=python-3-slim
 ```
 
-This will overwrite the default `3-38`, provided that it exists in the `dockerfiles` directory.
+This will overwrite the default `python-3`, provided that it exists in the `dockerfiles` directory.
+
+#### Building/troubleshooting local images (Mac M1)
+
+Our images are built with OS/ARCH:linux/amd64 due to our ci.yml file specifying linux. Historically this has
+not caused any issues but with an M1 Mac, docker will now use arm64. This is because docker builds the image to match the
+distribution of the OS running the command. To ensure that building locally and on GH produces an image of the same 
+architecture the `--platform` specifier is passed in the dockerfile.
+
+If you build a plugin locally we can see further issues that:
+- the local image does match the current OS distro so docker continues to look remotely..
+- docker can not find this (newly created) image remotely on docker registry (dev images should not be pushed to registry)
+
+To overcome this we need to specify `platform=linux/amd64` in the plugin docker file. E.g. if building plugins/html then
+this file should be updated `plugins/html/Dockerfile`.
+*Note*: building this arch on mac M1 will cause the build to be slower.
+
+
+Example error of local image not matching OS distro without passing the `--platform` flag:
+```
+ => ERROR [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest                          1.4s
+------
+ > [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest:
+------
+Dockerfile:1
+--------------------
+   1 | >>> FROM rapid7/insightconnect-python-3-slim-plugin
+   2 |     LABEL organization=rapid7
+   3 |     LABEL sdk=python
+--------------------
+ERROR: failed to solve: rapid7/insightconnect-python-3-slim-plugin: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
+make: *** [image] Error 1
+```
 
 ### Testing Sample Plugin
 The easiest way to test changes to the runtime is by running it locally against one of the [sample plugins](./samples) 
@@ -145,9 +177,21 @@ Running all tests:
 
 Running a specific test file:
 ```
-> tox -e py38 -- tests/plugin/hello_world/tests/test_cli.py
+> tox -e py39 -- tests/plugin/hello_world/tests/test_cli.py
 ```
 
+## Plugin vs Slim Plugin Comparison
+
+|                   | Plugin  | Slim Plugin |
+|:------------------|:-------:|:-----------:|
+| Python Version    | 3.9.18  |   3.9.18    |
+| OS                | Alpine  |  Bullseye   |
+| Package installer |   apk   |     apt     |
+| Shell             | /bin/sh |  /bin/bash  |
+| Image Size        | ~350MB  |   ~180MB    |
+
+Note that for the plugin image, we run `apk update` and `apk add ..` which leads to a longer build time.
+
 ## Release
 
 To release a new version of the InsightConnect Python Plugin Runtime, the below steps must be followed:
@@ -168,6 +212,8 @@ after cloning this repository.
 
 ## Changelog
 
+* 5.3.1 - New logging added to the beginning and end of a task | New logging when an exception is instantiated.
+* 5.3.0 - Update base images to pull Python 3.9.18 | python packages bump | rename image to drop python minor version.
 * 5.2.4 - Extended logging with OrgID and IntID
 * 5.2.3 - Extended logging in AWSClient
 * 5.2.2 - Fix longstanding bug where some error responses from a plugin could be in HTML format instead of JSON 

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/README.md

@@ -19,10 +19,10 @@ to get started.
 
 ## Development of the InsightConnect Plugin Runtime
 
-The Python Runtime codebase is built to support Python 3.8+ as of version 4.0.0. The following dependencies will need 
+The Python Runtime codebase is built to support Python 3.9.18 as of version 5.3.0. The following dependencies will need 
 to be installed when developing or testing the Plugin Runtime:
 
-- Python 3.8
+- Python 3.9.18
 - Docker
 - make
 - tox
@@ -38,19 +38,51 @@ version and activate it. Then build, install, and confirm the package has been i
 > source venv/bin/activate
 > pip install -e ./
 > pip list | grep insightconnect-plugin-runtime
-insightconnect-plugin-runtime 4.0.0
+insightconnect-plugin-runtime 5.2.2
 ```
 
 #### Building the InsightConnect Plugin Runtime Docker Images
 
-Currently the `3-38` dockerfile is used by default when building the docker image. If you want to specify another 
-dockerfile for testing purposes, such as `3-38-slim`, you can pass it as an argument.
+Currently the `python-3` dockerfile is used by default when building the docker image. If you want to specify another
+dockerfile for testing purposes, such as `python-3-slim`, you can pass it as an argument.
 
 ```
-make build-image DOCKERFILE=3-38-slim
+make build-image DOCKERFILE=python-3-slim
 ```
 
-This will overwrite the default `3-38`, provided that it exists in the `dockerfiles` directory.
+This will overwrite the default `python-3`, provided that it exists in the `dockerfiles` directory.
+
+#### Building/troubleshooting local images (Mac M1)
+
+Our images are built with OS/ARCH:linux/amd64 due to our ci.yml file specifying linux. Historically this has
+not caused any issues but with an M1 Mac, docker will now use arm64. This is because docker builds the image to match the
+distribution of the OS running the command. To ensure that building locally and on GH produces an image of the same 
+architecture the `--platform` specifier is passed in the dockerfile.
+
+If you build a plugin locally we can see further issues that:
+- the local image does match the current OS distro so docker continues to look remotely..
+- docker can not find this (newly created) image remotely on docker registry (dev images should not be pushed to registry)
+
+To overcome this we need to specify `platform=linux/amd64` in the plugin docker file. E.g. if building plugins/html then
+this file should be updated `plugins/html/Dockerfile`.
+*Note*: building this arch on mac M1 will cause the build to be slower.
+
+
+Example error of local image not matching OS distro without passing the `--platform` flag:
+```
+ => ERROR [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest                          1.4s
+------
+ > [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest:
+------
+Dockerfile:1
+--------------------
+   1 | >>> FROM rapid7/insightconnect-python-3-slim-plugin
+   2 |     LABEL organization=rapid7
+   3 |     LABEL sdk=python
+--------------------
+ERROR: failed to solve: rapid7/insightconnect-python-3-slim-plugin: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
+make: *** [image] Error 1
+```
 
 ### Testing Sample Plugin
 The easiest way to test changes to the runtime is by running it locally against one of the [sample plugins](./samples) 
@@ -116,9 +148,21 @@ Running all tests:
 
 Running a specific test file:
 ```
-> tox -e py38 -- tests/plugin/hello_world/tests/test_cli.py
+> tox -e py39 -- tests/plugin/hello_world/tests/test_cli.py
 ```
 
+## Plugin vs Slim Plugin Comparison
+
+|                   | Plugin  | Slim Plugin |
+|:------------------|:-------:|:-----------:|
+| Python Version    | 3.9.18  |   3.9.18    |
+| OS                | Alpine  |  Bullseye   |
+| Package installer |   apk   |     apt     |
+| Shell             | /bin/sh |  /bin/bash  |
+| Image Size        | ~350MB  |   ~180MB    |
+
+Note that for the plugin image, we run `apk update` and `apk add ..` which leads to a longer build time.
+
 ## Release
 
 To release a new version of the InsightConnect Python Plugin Runtime, the below steps must be followed:
@@ -139,6 +183,8 @@ after cloning this repository.
 
 ## Changelog
 
+* 5.3.1 - New logging added to the beginning and end of a task | New logging when an exception is instantiated.
+* 5.3.0 - Update base images to pull Python 3.9.18 | python packages bump | rename image to drop python minor version.
 * 5.2.4 - Extended logging with OrgID and IntID
 * 5.2.3 - Extended logging in AWSClient
 * 5.2.2 - Fix longstanding bug where some error responses from a plugin could be in HTML format instead of JSON 

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/insightconnect-plugin-swagger.json

@@ -451,32 +451,36 @@
     "PluginInfo": {
       "type": "object",
       "properties": {
-        "enable_cache": {
-          "type": "boolean"
+        "sdk_version": {
+          "type": "string"
         },
-        "threads": {
+        "title": {
+          "type": "string"
+        },
+        "number_of_workers": {
           "type": "integer",
           "format": "int32"
         },
-        "plugin_spec_version": {
-          "type": "string"
-        },
-        "name": {
+        "version": {
           "type": "string"
         },
-        "sdk_version": {
+        "vendor": {
           "type": "string"
         },
-        "support": {
-          "type": "string"
+        "threads": {
+          "type": "integer",
+          "format": "int32"
         },
         "description": {
           "type": "string"
         },
-        "title": {
+        "name": {
           "type": "string"
         },
-        "vendor": {
+        "enable_cache": {
+          "type": "boolean"
+        },
+        "support": {
           "type": "string"
         },
         "tags": {
@@ -485,11 +489,7 @@
             "type": "string"
           }
         },
-        "number_of_workers": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "version": {
+        "plugin_spec_version": {
           "type": "string"
         }
       }
@@ -520,9 +520,6 @@
     "ActionTriggerOutput": {
       "type": "object",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/ActionTriggerOutputBody"
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -532,6 +529,9 @@
         },
         "version": {
           "type": "string"
+        },
+        "body": {
+          "$ref": "#/definitions/ActionTriggerOutputBody"
         }
       },
       "required": [
@@ -546,16 +546,16 @@
         "status": {
           "type": "string"
         },
-        "state": {
-          "type": "object"
-        },
-        "meta": {
+        "output": {
           "type": "object"
         },
         "log": {
           "type": "string"
         },
-        "output": {
+        "meta": {
+          "type": "object"
+        },
+        "state": {
           "type": "object"
         }
       },
@@ -570,9 +570,6 @@
     "TaskOutput": {
       "type": "object",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/TaskOutputBody"
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -581,6 +578,9 @@
         },
         "version": {
           "type": "string"
+        },
+        "body": {
+          "$ref": "#/definitions/TaskOutputBody"
         }
       },
       "required": [
@@ -592,14 +592,14 @@
     "ActionTriggerInputBody": {
       "type": "object",
       "properties": {
-        "action": {
-          "type": "string"
-        },
         "connection": {
           "type": "object"
         },
         "input": {
           "type": "object"
+        },
+        "action": {
+          "type": "string"
         }
       },
       "required": [
@@ -611,9 +611,6 @@
     "ActionTriggerInput": {
       "type": "object",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/ActionTriggerInputBody"
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -623,6 +620,9 @@
         },
         "version": {
           "type": "string"
+        },
+        "body": {
+          "$ref": "#/definitions/ActionTriggerInputBody"
         }
       },
       "required": [
@@ -634,7 +634,7 @@
     "TaskInputBody": {
       "type": "object",
       "properties": {
-        "input": {
+        "state": {
           "type": "object"
         },
         "connection": {
@@ -643,7 +643,7 @@
         "task": {
           "type": "string"
         },
-        "state": {
+        "input": {
           "type": "object"
         }
       },
@@ -657,9 +657,6 @@
     "TaskInput": {
       "type": "object",
       "properties": {
-        "body": {
-          "$ref": "#/definitions/TaskInputBody"
-        },
         "type": {
           "type": "string",
           "enum": [
@@ -668,6 +665,9 @@
         },
         "version": {
           "type": "string"
+        },
+        "body": {
+          "$ref": "#/definitions/TaskInputBody"
         }
       },
       "required": [
@@ -679,15 +679,15 @@
     "ActionTriggerDetails": {
       "type": "object",
       "properties": {
+        "input": {
+          "type": "object"
+        },
         "output": {
           "type": "object"
         },
         "title": {
           "type": "string"
         },
-        "input": {
-          "type": "object"
-        },
         "description": {
           "type": "string"
         }
@@ -696,6 +696,12 @@
     "ConnectionDetails": {
       "type": "object",
       "properties": {
+        "type": {
+          "type": "string"
+        },
+        "title": {
+          "type": "string"
+        },
         "required": {
           "type": "array",
           "items": {
@@ -704,12 +710,6 @@
         },
         "properties": {
           "type": "object"
-        },
-        "type": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
         }
       }
     },
@@ -724,23 +724,23 @@
     "TaskDetails": {
       "type": "object",
       "properties": {
-        "schedule": {
-          "type": "object"
-        },
         "state": {
           "type": "object"
         },
-        "description": {
-          "type": "string"
-        },
         "title": {
           "type": "string"
         },
-        "input": {
+        "schedule": {
           "type": "object"
         },
+        "description": {
+          "type": "string"
+        },
         "output": {
           "type": "object"
+        },
+        "input": {
+          "type": "object"
         }
       }
     }

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/insightconnect_plugin_runtime/api/endpoints.py

@@ -157,11 +157,13 @@ 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")
             output = self.run_action_trigger_task(input_message)
+            self.logger.info("Plugin task finished execution...")
             return output
 
         @legacy.route("/triggers/<string:name>/test", methods=["POST"])

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/insightconnect_plugin_runtime/exceptions.py

@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+import structlog
+logger = structlog.get_logger("plugin")
+
+
 class ClientException(Exception):
     """
     An exception which marks an error made by the plugin invoker.
@@ -120,6 +124,12 @@ class ConnectionTestException(Exception):
 
         self.data = str(data) if data else ""
 
+        # Safeguard to ensure the exception is logged across all plugins even if the plugin
+        # itself does not call `self.logger.error(<error info>)`
+        params = ["cause", "assistance", "data", "preset"]
+        info_log = ", ".join([f"{atr}='{getattr(self, atr)}'" for atr in params if getattr(self, atr)])
+        logger.error(f"Plugin exception instantiated. {info_log}")
+
     def __str__(self):
         if self.data:
             return "Connection test failed!\n\n{cause} {assistance} Response was: {data}".format(

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1/insightconnect_plugin_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: insightconnect-plugin-runtime
-Version: 5.2.4
+Version: 5.3.1
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -15,11 +15,11 @@ Description-Content-Type: text/markdown
 Requires-Dist: requests==2.31.0
 Requires-Dist: python_jsonschema_objects==0.3.12
 Requires-Dist: jsonschema==3.2.0
-Requires-Dist: certifi==2022.12.7
+Requires-Dist: certifi==2023.7.22
 Requires-Dist: Flask==2.3.2
 Requires-Dist: gunicorn==20.0.4
-Requires-Dist: greenlet<=1.1.2,>=0.4.17
-Requires-Dist: gevent==20.9.0
+Requires-Dist: greenlet==3.0.1
+Requires-Dist: gevent==23.9.1
 Requires-Dist: marshmallow==3.4.0
 Requires-Dist: apispec==3.2.0
 Requires-Dist: apispec-webframeworks==0.5.2
@@ -48,10 +48,10 @@ to get started.
 
 ## Development of the InsightConnect Plugin Runtime
 
-The Python Runtime codebase is built to support Python 3.8+ as of version 4.0.0. The following dependencies will need 
+The Python Runtime codebase is built to support Python 3.9.18 as of version 5.3.0. The following dependencies will need 
 to be installed when developing or testing the Plugin Runtime:
 
-- Python 3.8
+- Python 3.9.18
 - Docker
 - make
 - tox
@@ -67,19 +67,51 @@ version and activate it. Then build, install, and confirm the package has been i
 > source venv/bin/activate
 > pip install -e ./
 > pip list | grep insightconnect-plugin-runtime
-insightconnect-plugin-runtime 4.0.0
+insightconnect-plugin-runtime 5.2.2
 ```
 
 #### Building the InsightConnect Plugin Runtime Docker Images
 
-Currently the `3-38` dockerfile is used by default when building the docker image. If you want to specify another 
-dockerfile for testing purposes, such as `3-38-slim`, you can pass it as an argument.
+Currently the `python-3` dockerfile is used by default when building the docker image. If you want to specify another
+dockerfile for testing purposes, such as `python-3-slim`, you can pass it as an argument.
 
 ```
-make build-image DOCKERFILE=3-38-slim
+make build-image DOCKERFILE=python-3-slim
 ```
 
-This will overwrite the default `3-38`, provided that it exists in the `dockerfiles` directory.
+This will overwrite the default `python-3`, provided that it exists in the `dockerfiles` directory.
+
+#### Building/troubleshooting local images (Mac M1)
+
+Our images are built with OS/ARCH:linux/amd64 due to our ci.yml file specifying linux. Historically this has
+not caused any issues but with an M1 Mac, docker will now use arm64. This is because docker builds the image to match the
+distribution of the OS running the command. To ensure that building locally and on GH produces an image of the same 
+architecture the `--platform` specifier is passed in the dockerfile.
+
+If you build a plugin locally we can see further issues that:
+- the local image does match the current OS distro so docker continues to look remotely..
+- docker can not find this (newly created) image remotely on docker registry (dev images should not be pushed to registry)
+
+To overcome this we need to specify `platform=linux/amd64` in the plugin docker file. E.g. if building plugins/html then
+this file should be updated `plugins/html/Dockerfile`.
+*Note*: building this arch on mac M1 will cause the build to be slower.
+
+
+Example error of local image not matching OS distro without passing the `--platform` flag:
+```
+ => ERROR [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest                          1.4s
+------
+ > [internal] load metadata for docker.io/rapid7/insightconnect-python-3-slim-plugin:latest:
+------
+Dockerfile:1
+--------------------
+   1 | >>> FROM rapid7/insightconnect-python-3-slim-plugin
+   2 |     LABEL organization=rapid7
+   3 |     LABEL sdk=python
+--------------------
+ERROR: failed to solve: rapid7/insightconnect-python-3-slim-plugin: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
+make: *** [image] Error 1
+```
 
 ### Testing Sample Plugin
 The easiest way to test changes to the runtime is by running it locally against one of the [sample plugins](./samples) 
@@ -145,9 +177,21 @@ Running all tests:
 
 Running a specific test file:
 ```
-> tox -e py38 -- tests/plugin/hello_world/tests/test_cli.py
+> tox -e py39 -- tests/plugin/hello_world/tests/test_cli.py
 ```
 
+## Plugin vs Slim Plugin Comparison
+
+|                   | Plugin  | Slim Plugin |
+|:------------------|:-------:|:-----------:|
+| Python Version    | 3.9.18  |   3.9.18    |
+| OS                | Alpine  |  Bullseye   |
+| Package installer |   apk   |     apt     |
+| Shell             | /bin/sh |  /bin/bash  |
+| Image Size        | ~350MB  |   ~180MB    |
+
+Note that for the plugin image, we run `apk update` and `apk add ..` which leads to a longer build time.
+
 ## Release
 
 To release a new version of the InsightConnect Python Plugin Runtime, the below steps must be followed:
@@ -168,6 +212,8 @@ after cloning this repository.
 
 ## Changelog
 
+* 5.3.1 - New logging added to the beginning and end of a task | New logging when an exception is instantiated.
+* 5.3.0 - Update base images to pull Python 3.9.18 | python packages bump | rename image to drop python minor version.
 * 5.2.4 - Extended logging with OrgID and IntID
 * 5.2.3 - Extended logging in AWSClient
 * 5.2.2 - Fix longstanding bug where some error responses from a plugin could be in HTML format instead of JSON 

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/insightconnect_plugin_runtime.egg-info/requires.txt

@@ -1,11 +1,11 @@
 requests==2.31.0
 python_jsonschema_objects==0.3.12
 jsonschema==3.2.0
-certifi==2022.12.7
+certifi==2023.7.22
 Flask==2.3.2
 gunicorn==20.0.4
-greenlet<=1.1.2,>=0.4.17
-gevent==20.9.0
+greenlet==3.0.1
+gevent==23.9.1
 marshmallow==3.4.0
 apispec==3.2.0
 apispec-webframeworks==0.5.2

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="insightconnect-plugin-runtime",
-    version="5.2.4",
+    version="5.3.1",
     description="InsightConnect Plugin Runtime",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -17,11 +17,11 @@ setup(
         "requests==2.31.0",
         "python_jsonschema_objects==0.3.12",
         "jsonschema==3.2.0",
-        "certifi==2022.12.7",
+        "certifi==2023.7.22",
         "Flask==2.3.2",
         "gunicorn==20.0.4",
-        "greenlet>=0.4.17, <=1.1.2",
-        "gevent==20.9.0",
+        "greenlet==3.0.1",
+        "gevent==23.9.1",
         "marshmallow==3.4.0",
         "apispec==3.2.0",
         "apispec-webframeworks==0.5.2",

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/tests/plugin/__init__.py

@@ -55,10 +55,16 @@ def run_trigger(input_file, output_file, plugin, expect_timeout=False):
     plugin.triggers[trigger_name].dispatcher = capture
 
     executor = thread.ThreadPoolExecutor()
-    executor.submit(plugin.handle_step, input_message)
-    future = executor.submit(capture.wait_for_caught_message)
-    out = futures.wait([future], timeout=10)
-    done = out.done
+
+    if expect_timeout:
+        future = executor.submit(plugin.handle_step, input_message)
+        future_ans = future.exception()
+        done = future_ans.output
+    else:
+        executor.submit(plugin.handle_step, input_message)
+        future = executor.submit(capture.wait_for_caught_message)
+        out = futures.wait([future], timeout=10)
+        done = out.done
 
     # Non-graceful shutdown
     executor._threads.clear()
@@ -69,7 +75,8 @@ def run_trigger(input_file, output_file, plugin, expect_timeout=False):
             return
         raise Exception("Timeout")
 
-    output = capture.caught_message
+    # output = capture.caught_message
+    output = done if expect_timeout else capture.caught_message
 
     if "body" in output and "log" in output["body"]:
         output["body"]["log"] = ""
@@ -79,7 +86,7 @@ def run_trigger(input_file, output_file, plugin, expect_timeout=False):
 
     if output != expected_output:
         raise Exception(
-            "Actual output differs from expected output.{} != {}".format(
-                output, expected_output
-            )
+            f"Actual output differs from expected output/ \n"
+            f"Actual output: {output} \n"
+            f"Expected output: {expected_output}"
         )

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/tests/plugin/hello_world/hello_world/komand_hello_world/triggers/hello_trigger/trigger.py

@@ -18,8 +18,14 @@ class HelloTrigger(insightconnect_plugin_runtime.Trigger):
         """Run the trigger"""
         while True:
             self.logger.info("I am the log")
-            self.send({"message": self.connection.greeting.format(params["name"])})
+            resp = {"message": self.connection.greeting.format(params["name"])}
+            self.send(resp)
             time.sleep(10)
+            # because this is a test we need to return otherwise the thread runs indefinitely to match how
+            # triggers run in production. Check using params 'test' so that if we build image of this plugin and
+            # test we will enter the loop as usual.
+            if params["test"]:
+                return resp
 
     def test(self):
         self.logger.info("This is a test")

{insightconnect-plugin-runtime-5.2.4 → insightconnect-plugin-runtime-5.3.1}/tests/plugin/hello_world/hello_world/komand_hello_world/triggers/throw_exception_trigger/trigger.py

@@ -15,7 +15,7 @@ class ThrowExceptionTrigger(insightconnect_plugin_runtime.Trigger):
         )
 
     def run(self, params={}):
-        raise Exception("because I can")
+        raise Exception("Forced exception test")
 
     def test(self, params={}):
-        raise Exception("because I can")
+        raise Exception("Forced exception test")