Merge pull request #8 from nzlosh/master

Refresh consul pack

Author: LindsayHill

CHANGES.md

@@ -1,5 +1,33 @@
 # Change Log
 
+## [0.6.0] 16 Nov 2017
+
+### Added the following API calls. (See https://python-consul.readthedocs.io for documentation)
+    - AgentChecks
+    - AgentForce
+    - AgentJoin
+    - AgentMaintenance
+    - AgentMembers
+    - AgentServices
+    - EventFire
+    - EventList
+    - HealthNode
+    - HealthState
+    - ServiceDeregister
+    - ServiceMaintenance
+    - ServiceRegister
+    - SessionCreate
+    - SessionDestroy
+    - SessionInfo
+    - SessionList
+    - SessionNode
+    - SessionRenew
+### Changed
+ - Renamed existing action names to be aligned with the consul API.  This helps logically group
+   operations by the subsystem they will apply to.
+ - Returned unmodified data from Consul API from some existing actions.  Some of the existing actions
+   were masking the metadata returned by the consul API.  This metadata is useful in certain cases.
+
 ## 0.5.0
 
 - Updated action `runner_type` from `run-python` to `python-script`

actions/create_token.py actions/acl_create.pyactions/create_token.py renamed to actions/acl_create.py

@@ -5,5 +5,4 @@ class ConsulAclCreateAction(action.ConsulBaseAction):
     def run(self, name=None, acl_type='client', rules=None):
 
         rules = rules.encode('ascii', 'ignore')
-        acl_id = self.consul.acl.create(name=name, type=acl_type, rules=rules)
-        return acl_id
+        return (True, self.consul.acl.create(name=name, type=acl_type, rules=rules))

actions/create_token.yaml actions/acl_create.yamlactions/create_token.yaml renamed to actions/acl_create.yaml

@@ -1,9 +1,9 @@
-name: create_token
+name: acl_create
 pack: consul
 runner_type: python-script
 description: "Create an acl token"
 enabled: true
-entry_point: "create_token.py"
+entry_point: "acl_create.py"
 parameters:
     name:
         type: string

actions/destroy_token.py actions/acl_destroy.pyactions/destroy_token.py renamed to actions/acl_destroy.py

@@ -3,6 +3,4 @@
 
 class ConsulAclDestroyAction(action.ConsulBaseAction):
     def run(self, acl_id):
-
-        resp = self.consul.acl.destroy(acl_id)
-        return resp
+        return (True, self.consul.acl.destroy(acl_id))

actions/destroy_token.yaml actions/acl_destroy.yamlactions/destroy_token.yaml renamed to actions/acl_destroy.yaml

@@ -1,9 +1,9 @@
-name: destroy_token
+name: acl_destroy
 pack: consul
 runner_type: python-script
 description: "Destroy an acl token"
 enabled: true
-entry_point: "destroy_token.py"
+entry_point: "acl_destroy.py"
 parameters:
     acl_id:
         type: string

actions/list_tokens.py actions/acl_list.pyactions/list_tokens.py renamed to actions/acl_list.py

@@ -5,6 +5,4 @@
 
 class ConsulAclListAction(action.ConsulBaseAction):
     def run(self):
-
-        acl_list = self.consul.acl.list()
-        print json.dumps(acl_list)
+        return (True, json.dumps(self.consul.acl.list()))

actions/list_tokens.yaml actions/acl_list.yamlactions/list_tokens.yaml renamed to actions/acl_list.yaml

@@ -1,6 +1,6 @@
-name: list_tokens
+name: acl_list
 pack: consul
 runner_type: python-script
 description: "List all acl tokens"
 enabled: true
-entry_point: "list_tokens.py"
+entry_point: "acl_list.py"

actions/agent_checks.py

@@ -0,0 +1,6 @@
+from lib import action
+
+
+class ConsulAgentChecksAction(action.ConsulBaseAction):
+    def run(self):
+        return (True, self.consul.agent.checks())

actions/agent_checks.yaml

@@ -0,0 +1,5 @@
+name: agent_checks
+runner_type: python-script
+description: "Returns all the checks that are registered with the local agent."
+enabled: true
+entry_point: "agent_checks.py"

actions/agent_force_leave.py

@@ -0,0 +1,6 @@
+from lib import action
+
+
+class ConsulAgentForceLeaveAction(action.ConsulBaseAction):
+    def run(self, node):
+        return (True, self.consul.agent.force_leave(node))