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

Fix: Added token to params for sessions. #251

Open
abhisekpadhi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix: Added token to params for sessions. #251

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ebc5cd
Added token to params while creating sessions.
Mar 25, 2019
500946b
Added token for all consul.Session endpoints.
Mar 25, 2019
b86a752
Added token for txn
Mar 25, 2019
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
31 changes: 29 additions & 2 deletions consul/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,16 @@ def put(self, payload):
}
}
"""
return self.agent.http.put(CB.json(), "/v1/txn",
data=json.dumps(payload))
params = []
token = self.agent.token
if token:
params.append(('token', tokenn))
return self.agent.http.put(
CB.json(),
"/v1/txn",
params=params,
data=json.dumps(payload)
)

class Agent(object):
"""
Expand Down Expand Up @@ -1769,6 +1777,9 @@ def create(
if ttl:
assert 10 <= ttl <= 86400
data['ttl'] = '%ss' % ttl
token = self.agent.token
if token:
params.append(('token', token))
if data:
data = json.dumps(data)
else:
Expand All @@ -1790,6 +1801,9 @@ def destroy(self, session_id, dc=None):
dc = dc or self.agent.dc
if dc:
params.append(('dc', dc))
token = self.agent.token
if token:
params.append(('token', token))
return self.agent.http.put(
CB.bool(),
'/v1/session/destroy/%s' % session_id,
Expand Down Expand Up @@ -1838,6 +1852,9 @@ def list(self, index=None, wait=None, consistency=None, dc=None):
consistency = consistency or self.agent.consistency
if consistency in ('consistent', 'stale'):
params.append((consistency, '1'))
token = self.agent.token
if token:
params.append(('token', token))
return self.agent.http.get(
CB.json(index=True), '/v1/session/list', params=params)

Expand Down Expand Up @@ -1868,6 +1885,9 @@ def node(self, node, index=None, wait=None, consistency=None, dc=None):
consistency = consistency or self.agent.consistency
if consistency in ('consistent', 'stale'):
params.append((consistency, '1'))
token = self.agent.token
if token:
params.append(('token', token))
return self.agent.http.get(
CB.json(index=True),
'/v1/session/node/%s' % node, params=params)
Expand Down Expand Up @@ -1905,6 +1925,9 @@ def info(self,
consistency = consistency or self.agent.consistency
if consistency in ('consistent', 'stale'):
params.append((consistency, '1'))
token = self.agent.token
if token:
params.append(('token', token))
return self.agent.http.get(
CB.json(index=True, one=True),
'/v1/session/info/%s' % session_id,
Expand All @@ -1924,6 +1947,9 @@ def renew(self, session_id, dc=None):
dc = dc or self.agent.dc
if dc:
params.append(('dc', dc))
token = self.agent.token
if token:
params.append(('token', token))
return self.agent.http.put(
CB.json(one=True, allow_404=False),
'/v1/session/renew/%s' % session_id,
Expand Down Expand Up @@ -2434,3 +2460,4 @@ def raft_config(self):
"""
return self.agent.http.get(
CB.json(), '/v1/operator/raft/configuration')