[PLGN-362]- Pager Duty - Refactor to use requests rather than pypd

plugins/pagerduty/.CHECKSUM

@@ -1,43 +1,43 @@
 {
-	"spec": "f20c11c35f0dbd45c4ae3207b10029b4",
-	"manifest": "322935ff822e9be3217f4e2227e9a00f",
-	"setup": "4a6275a7299d3b5523ecadf7ab8a163a",
+	"spec": "6527a68d9fd5097bbb7075b8b279d9b8",
+	"manifest": "825be40acb77734dcd402f0da001f41b",
+	"setup": "a4f3b2fabe8b53ce95d26b7439c5d3a8",
 	"schemas": [
 		{
 			"identifier": "create_user/schema.py",
-			"hash": "d20d7c28c305fdcebb96939510679ae7"
+			"hash": "c68031209d4fa67ccb59d29e2d9129a0"
 		},
 		{
 			"identifier": "delete_user_by_id/schema.py",
-			"hash": "55d6f98c36228cc8b294303f54eae49c"
+			"hash": "796c3831d82077d659ebc859897d3410"
 		},
 		{
 			"identifier": "get_on_call/schema.py",
-			"hash": "4eb592192c18a8e0a79bd263a2509e29"
+			"hash": "136d6977b7cf82f1d59f6affa2f3112c"
 		},
 		{
 			"identifier": "get_user_by_email/schema.py",
-			"hash": "79d23d5f0c61caa02bb2728c940e4503"
+			"hash": "ca70ed41b688a0648c824a649c5072ff"
 		},
 		{
 			"identifier": "get_user_by_id/schema.py",
-			"hash": "43da47a5a74bc83c3652b398f29db719"
+			"hash": "78552441f46e278e02110bb7742d67ac"
 		},
 		{
 			"identifier": "send_acknowledge_event/schema.py",
-			"hash": "24b59e94be441385f0ce8770647cfa60"
+			"hash": "29ad62b147f212b81ae75380983190b8"
 		},
 		{
 			"identifier": "send_resolve_event/schema.py",
-			"hash": "74ea18af0ba61eb8dc40923971eb7d85"
+			"hash": "139114bf8815c249bac54e8ed9b61ad2"
 		},
 		{
 			"identifier": "send_trigger_event/schema.py",
-			"hash": "2a003fe3014831f80493498c143d302f"
+			"hash": "60c41049677bc3b99a28a2b941239d17"
 		},
 		{
 			"identifier": "connection/schema.py",
-			"hash": "80f4aea21f43406ebe4afe09f912b280"
+			"hash": "222cae0befdc90d883e5d25ea004a33d"
 		}
 	]
 }

plugins/pagerduty/Dockerfile

@@ -1,26 +1,20 @@
-FROM rapid7/insightconnect-python-3-38-slim-plugin:4
-# The three supported python parent images are:
-# - komand/python-2-plugin
-# - komand/python-3-plugin
-# - komand/python-pypy3-plugin
-#
-# Update the tag to a full semver version
+FROM rapid7/insightconnect-python-3-38-plugin:5
 
-# Add any custom package dependencies here
-# NOTE: Add pip packages to requirements.txt
+LABEL organization=rapid7
+LABEL sdk=python
 
-# End package dependencies
-
-# Add source code
 WORKDIR /python/src
+
 ADD ./plugin.spec.yaml /plugin.spec.yaml
-ADD . /python/src
+ADD ./requirements.txt /python/src/requirements.txt
 
-# Install pip dependencies
 RUN if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
-# Install plugin
-RUN python setup.py build && python setup.py install
+ADD . /python/src
+
+RUN	python setup.py build && python setup.py install
 
+# User to run plugin code. The two supported users are: root, nobody
+USER nobody
 
 ENTRYPOINT ["/usr/local/bin/komand_pagerduty"]

plugins/pagerduty/bin/komand_pagerduty

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
-# GENERATED BY KOMAND SDK - DO NOT EDIT
+# GENERATED BY INSIGHT-PLUGIN - DO NOT EDIT
 import os
 import json
 from sys import argv
 
 Name = "PagerDuty"
 Vendor = "rapid7"
-Version = "2.2.0"
+Version = "3.0.0"
 Description = "Leverage PagerDuty for incident management and response"
 
 
@@ -23,7 +23,7 @@ def main():
             monkey.patch_all()
 
     import insightconnect_plugin_runtime
-    from komand_pagerduty import connection, actions, triggers
+    from komand_pagerduty import connection, actions, triggers, tasks
 
     class ICONPagerduty(insightconnect_plugin_runtime.Plugin):
         def __init__(self):
@@ -34,22 +34,22 @@ def main():
                 description=Description,
                 connection=connection.Connection()
             )
-            self.add_action(actions.CreateUser())
-
-            self.add_action(actions.DeleteUserById())
-
             self.add_action(actions.GetOnCall())
-
-            self.add_action(actions.GetUserByEmail())
-
+
             self.add_action(actions.GetUserById())
-
+
+            self.add_action(actions.GetUserByEmail())
+
+            self.add_action(actions.CreateUser())
+
+            self.add_action(actions.DeleteUserById())
+
+            self.add_action(actions.SendTriggerEvent())
+
             self.add_action(actions.SendAcknowledgeEvent())
-
+        
             self.add_action(actions.SendResolveEvent())
-
-            self.add_action(actions.SendTriggerEvent())
-
+
 
     """Run plugin"""
     cli = insightconnect_plugin_runtime.CLI(ICONPagerduty())