Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Apr 15, 2024. It is now read-only.

fix txn token,dc and consistency #225

Open
amuhametov wants to merge 17 commits into
base: master
Choose a base branch
Loading
from
Open

fix txn token,dc and consistency #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7350c6a
fix txn token,dc and consistency
Aug 2, 2018
ced8fcf
add support to auto base64-decode values
Aug 3, 2018
0a6e74e
add decode txn result value option
Aug 6, 2018
e2da015
reduce str len
Aug 6, 2018
2e4d1bc
add decode txn test
Aug 6, 2018
fded800
try to fix test
Aug 6, 2018
d2c65a5
str to byte
Aug 6, 2018
cf2804c
one more try to make the test successful
Aug 6, 2018
f13b8d3
try to fix indent
Aug 6, 2018
7019841
try to fix indent
Aug 6, 2018
ee901c0
try to fix indent
Aug 6, 2018
462901a
try to fix indent
Aug 6, 2018
9c56b2f
try to fix indent
Aug 6, 2018
5eb01da
Thanks, @matusvalo
Oct 8, 2018
75bb0ac
update due to api change
Oct 8, 2018
cd0a2c9
Revert "update due to api change"
Oct 8, 2018
6fe3a4f
revert auto-decode result, keep the API safe
Oct 8, 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
55 changes: 48 additions & 7 deletions 55 consul/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ def json(
one=False,
decode=False,
is_id=False,
index=False):
index=False,
txn=False):
Copy link
Collaborator

@matusvalo matusvalo Aug 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to add new parameters to docs string?

Copy link
Author

@amuhametov amuhametov Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

"""
*map* is a function to apply to the final result.

Expand All @@ -218,6 +219,9 @@ def json(
*decode* if specified this key will be base64 decoded.

*is_id* only the 'ID' field of the json object will be returned.

*txn* if specified along with *decode*, the answer will be treated as
transaction result and all values will be base64-decoded
"""
def cb(response):
CB._status(response, allow_404=allow_404)
Expand All @@ -227,9 +231,16 @@ def cb(response):
data = json.loads(response.body)

if decode:
for item in data:
if item.get(decode) is not None:
item[decode] = base64.b64decode(item[decode])
if txn and data.get('Results') is not None:
for item in data.get('Results'):
if item.get('KV').get('Value') is not None:
item['KV']['Value'] = base64.b64decode(
item['KV']['Value'])
elif not txn:
for item in data:
if item.get(decode) is not None:
item[decode] = base64.b64decode(item[decode])

if is_id:
data = data['ID']
if one:
Expand Down Expand Up @@ -665,7 +676,13 @@ class Txn(object):
def __init__(self, agent):
self.agent = agent

def put(self, payload):
def put(
self,
payload,
token=None,
consistency=None,
dc=None,
decode=False):
Copy link
Collaborator

@matusvalo matusvalo Aug 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about this but I prefer to hide encoding/decoding logic from user. This will break API but it will be more clear. Is there any objection against it? Moreover, new parameters should be documented in doc string.

Copy link
Author

@amuhametov amuhametov Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

"""
Create a transaction by submitting a list of operations to apply to
the KV store inside of a transaction. If any operation fails, the
Expand All @@ -686,9 +703,33 @@ def put(self, payload):
"Session": "<session id>"
}
}

*token* is an optional `ACL token`_ to apply to this request. If
the token's policy is not allowed to delete to this key an
*ACLPermissionDenied* exception will be raised.

*consistency* can be either 'default', 'consistent' or 'stale'. if
not specified *consistency* will the consistency level this client
was configured with.

*consistency* the result will be base64-decoded if set to True
"""
return self.agent.http.put(CB.json(), "/v1/txn",
data=json.dumps(payload))

params = []
token = token or self.agent.token
if token:
params.append(('token', token))
dc = dc or self.agent.dc
if dc:
params.append(('dc', dc))
consistency = consistency or self.agent.consistency
if consistency in ('consistent', 'stale'):
params.append(('consistency', 1))

return self.agent.http.put(CB.json(txn=True, decode=decode),
"/v1/txn",
data=json.dumps(payload),
params=params)

class Agent(object):
"""
Expand Down
12 changes: 12 additions & 0 deletions 12 tests/test_std.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ def test_transaction(self, consul_port):
r = c.txn.put([d])
assert r["Results"][0]["KV"]["Value"] == value

def test_transaction_decode(self, consul_port):
c = consul.Consul(port=consul_port)
value = b'123 qweqwe'
enc_value = base64.b64encode(value).decode("utf8")
d = {"KV": {"Verb": "set", "Key": "asdf", "Value": enc_value}}
r = c.txn.put([d])
assert r["Errors"] is None

d = {"KV": {"Verb": "get", "Key": "asdf"}}
r = c.txn.put([d], decode=True)
assert r["Results"][0]["KV"]["Value"] == value

def test_event(self, consul_port):
c = consul.Consul(port=consul_port)

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.