Merge pull request #4 from copartit/dev

1.2.0 update

Author: igcherkaev

CHANGES.md

@@ -2,7 +2,7 @@
 
 ## 1.2.0
 
-- Added `st2.executions.pause` and `st2.executions.resume` actions.
+- Added `st2.executions.pause`, `st2.executions.resume`, `st2.executions.cancel` actions.
 
 ## 1.1.0
 

README.md

@@ -71,6 +71,8 @@ sensors and more.
   action execution.
 * ``!st2 executions re-run <execution id>`` - Re-run a particular action
   execution.
+* ``!st2 executions cancel <execution id>`` - Pause a particular action
+  execution.
 * ``!st2 executions pause <execution id>`` - Pause a particular action
   execution.
 * ``!st2 executions resume <execution id>`` - Resume a particular action

actions/executions_cancel.py

@@ -0,0 +1,20 @@
+from lib.action import St2BaseAction
+
+__all__ = [
+    'St2ExecutionsCancel'
+]
+
+
+class St2ExecutionsCancel(St2BaseAction):
+    def run(self, ids):
+        result = {}
+        success = True
+        for i in ids:
+            try:
+                res = self.client.executions.delete_by_id(instance_id=i)
+            except Exception as exc:
+                result[i] = str(exc)
+                success = False
+            else:
+                result[i] = res
+        return success, result

actions/executions_cancel.yaml

@@ -0,0 +1,11 @@
+---
+name: "executions.cancel"
+enabled: true
+description: "Cancel action executions."
+runner_type: python-script
+entry_point: executions_cancel.py
+parameters:
+  ids:
+    type: "array"
+    description: "IDs of action executions to resume."
+    required: true

actions/executions_pause.py

@@ -1,25 +1,21 @@
 from lib.action import St2BaseAction
+from lib.formatters import format_result
 
 __all__ = [
     'St2ExecutionsPause'
 ]
 
 
-def format_result(item):
-    if not item:
-        return None
-
-    return item.to_dict()
-
-
 class St2ExecutionsPause(St2BaseAction):
     def run(self, ids):
         result = {}
+        success = True
         for i in ids:
             try:
                 res = self.client.liveactions.pause(execution_id=i)
             except Exception as exc:
-                result[i] = '{}'.format(exc)
+                result[i] = str(exc)
+                success = False
             else:
                 result[i] = format_result(item=res)
-        return result
+        return success, result

actions/executions_resume.py

@@ -1,25 +1,21 @@
 from lib.action import St2BaseAction
+from lib.formatters import format_result
 
 __all__ = [
     'St2ExecutionsResume'
 ]
 
 
-def format_result(item):
-    if not item:
-        return None
-
-    return item.to_dict()
-
-
 class St2ExecutionsResume(St2BaseAction):
     def run(self, ids):
         result = {}
+        success = True
         for i in ids:
             try:
                 res = self.client.liveactions.resume(execution_id=i)
             except Exception as exc:
-                result[i] = '{}'.format(exc)
+                result[i] = str(exc)
+                success = False
             else:
                 result[i] = format_result(item=res)
-        return result
+        return success, result

actions/lib/formatters.py

@@ -14,3 +14,7 @@ def format_client_list_result(result, exclude_attributes=None):
         formatted.append(value)
 
     return formatted
+
+
+def format_result(item):
+    return item.to_dict() if item else None

aliases/executions_cancel.yaml

@@ -0,0 +1,7 @@
+---
+name: "st2_executions_cancel"
+action_ref: "st2.executions.cancel"
+description: "Cancel action executions."
+formats:
+    - "st2 cancel execution {{ ids }}"
+    - "st2 executions cancel {{ ids }}"