Skip to content
This repository was archived by the owner on Apr 15, 2024. It is now read-only.

Add params for deregister method to resolve ACLPermissionDenied #228

Open
qantnull wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add params for deregister method to resolve ACLPermissionDenied #228

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45e6025
fix
qantnull Aug 15, 2018
6c9a9a8
Merge pull request #1 from qantnull/fix/deregister
qantnull Aug 15, 2018
5f46c5f
fix/Something
qantnull Aug 16, 2018
82deb53
fixsomething
qantnull Aug 16, 2018
c597f93
Merge pull request #2 from qantnull/fix/deregister
qantnull Aug 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions consul/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,14 +896,19 @@ def register(
params=params,
data=json.dumps(payload))

def deregister(self, service_id):
def deregister(self, service_id,token=None):
"""
Used to remove a service from the local agent. The agent will
take care of deregistering the service with the Catalog. If
there is an associated check, that is also deregistered.
"""
params = []
token = token or self.agent.token
if token:
params.append(("token",token))
return self.agent.http.put(
CB.bool(), '/v1/agent/service/deregister/%s' % service_id)
CB.bool(), '/v1/agent/service/deregister/%s' % service_id,
params=params)

def maintenance(self, service_id, enable, reason=None):
"""
Expand Down Expand Up @@ -1180,6 +1185,7 @@ def deregister(self,
assert not (service_id and check_id)
data = {'node': node}
dc = dc or self.agent.dc
params = []
if dc:
data['datacenter'] = dc
if service_id:
Expand All @@ -1189,8 +1195,11 @@ def deregister(self,
token = token or self.agent.token
if token:
data['WriteRequest'] = {'Token': token}
params.append(("token",token))
return self.agent.http.put(
CB.bool(), '/v1/catalog/deregister', data=json.dumps(data))
CB.bool(), '/v1/catalog/deregister',
data=json.dumps(data),
params=params)

def datacenters(self):
"""
Expand Down