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

KMS: revoke grant raises NotFound (#5410)

Browse Source
This commit is contained in:
Giorgio Ruffa 2022-08-24 12:48:37 +02:00 committed by GitHub
parent a14469dafe
commit 6232ccfa57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/kms/models.py
View File

@ -113,7 +113,8 @@ class Key(CloudFormationModel):
]
def revoke_grant(self, grant_id) -> None:
self.grants.pop(grant_id, None)
if not self.grants.pop(grant_id, None):
raise JsonRESTError("NotFoundException", f"Grant ID {grant_id} not found")
def retire_grant(self, grant_id) -> None:
self.grants.pop(grant_id, None)

22
tests/test_kms/test_kms_grants.py
View File

@ -1,5 +1,6 @@
import boto3
import sure # noqa # pylint: disable=unused-import
import pytest
from moto import mock_kms
from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
@ -137,23 +138,18 @@ def test_revoke_grant():
@mock_kms
def test_revoke_grant_by_token():
def test_revoke_grant_raises_when_grant_does_not_exist():
client = boto3.client("kms", region_name="us-east-1")
key_id = client.create_key(Policy="my policy")["KeyMetadata"]["KeyId"]
not_existent_grant_id = "aabbccdd"
client.list_grants(KeyId=key_id).should.have.key("Grants").equals([])
with pytest.raises(client.exceptions.NotFoundException) as ex:
client.revoke_grant(KeyId=key_id, GrantId=not_existent_grant_id)
grant_id = client.create_grant(
KeyId=key_id,
GranteePrincipal=grantee_principal,
Operations=["DECRYPT"],
Name="testgrant",
)["GrantId"]
client.revoke_grant(KeyId=key_id, GrantId=grant_id)
client.list_grants(KeyId=key_id)["Grants"].should.have.length_of(0)
ex.value.response["Error"]["Code"].should.equal("NotFoundException")
ex.value.response["Error"]["Message"].should.equal(
f"Grant ID {not_existent_grant_id} not found"
)
@mock_kms