Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IOT: update_thing() now behaves correctly with merge=True (#6918)

Browse Source
This commit is contained in:
Nico Tonnhofer 2023-10-15 23:40:15 +02:00 committed by GitHub
parent 00cce90984
commit 5794b619e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/iot/models.py
View File

@ -883,7 +883,8 @@ class IoTBackend(BaseBackend):
if not do_merge: if not do_merge:
thing.attributes = attributes thing.attributes = attributes
else: else:
thing.attributes = {k: v for k, v in attributes.items() if v} thing.attributes.update(attributes)
thing.attributes = {k: v for k, v in thing.attributes.items() if v}
def create_keys_and_certificate( def create_keys_and_certificate(
self, set_as_active: bool self, set_as_active: bool

34
tests/test_iot/test_iot_things.py
View File

@ -52,7 +52,32 @@ def test_update_thing():
assert len(res["things"]) == 1 assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"]["k1"] == "v1" assert res["things"][0]["attributes"] == {"k1": "v1"}
client.update_thing(thingName=name, attributePayload={"attributes": {"k2": "v2"}})
res = client.list_things()
assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"] == {"k2": "v2"}
client.update_thing(
thingName=name, attributePayload={"attributes": {"k1": "v1"}, "merge": True}
)
res = client.list_things()
assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"] == {"k1": "v1", "k2": "v2"}
client.update_thing(
thingName=name, attributePayload={"attributes": {"k1": "v1.1"}, "merge": True}
)
res = client.list_things()
assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"] == {"k1": "v1.1", "k2": "v2"}
client.update_thing( client.update_thing(
thingName=name, attributePayload={"attributes": {"k1": ""}, "merge": True} thingName=name, attributePayload={"attributes": {"k1": ""}, "merge": True}
@ -61,6 +86,13 @@ def test_update_thing():
assert len(res["things"]) == 1 assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"] == {"k2": "v2"}
client.update_thing(thingName=name, attributePayload={"attributes": {"k2": ""}})
res = client.list_things()
assert len(res["things"]) == 1
assert res["things"][0]["thingName"] is not None
assert res["things"][0]["thingArn"] is not None
assert res["things"][0]["attributes"] == {} assert res["things"][0]["attributes"] == {}