fix test cases, bug when no tags are present and conflict
This commit is contained in:
parent
38413577fc
commit
1221d2653a
6 changed files with 58 additions and 47 deletions
|
|
@ -367,7 +367,7 @@ class EventsBackend(BaseBackend):
|
|||
self.event_buses.pop(name, None)
|
||||
|
||||
def list_tags_for_resource(self, arn):
|
||||
name = arn.split('/')[-1]
|
||||
name = arn.split("/")[-1]
|
||||
if name in self.rules:
|
||||
return self.tagger.list_tags_for_resource(self.rules[name].arn)
|
||||
raise JsonRESTError(
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ class Key(BaseModel):
|
|||
key_usage="ENCRYPT_DECRYPT",
|
||||
customer_master_key_spec="SYMMETRIC_DEFAULT",
|
||||
description=properties["Description"],
|
||||
tags=properties["Tags"],
|
||||
tags=properties.get("Tags", []),
|
||||
region=region_name,
|
||||
)
|
||||
key.key_rotation_status = properties["EnableKeyRotation"]
|
||||
|
|
@ -131,14 +131,12 @@ class KmsBackend(BaseBackend):
|
|||
def __init__(self):
|
||||
self.keys = {}
|
||||
self.key_to_aliases = defaultdict(set)
|
||||
self.tagger = TaggingService(keyName='TagKey', valueName='TagValue')
|
||||
self.tagger = TaggingService(keyName="TagKey", valueName="TagValue")
|
||||
|
||||
def create_key(
|
||||
self, policy, key_usage, customer_master_key_spec, description, tags, region
|
||||
):
|
||||
key = Key(
|
||||
policy, key_usage, customer_master_key_spec, description, region
|
||||
)
|
||||
key = Key(policy, key_usage, customer_master_key_spec, description, region)
|
||||
self.keys[key.id] = key
|
||||
if tags is not None and len(tags) > 0:
|
||||
self.tag_resource(key.id, tags)
|
||||
|
|
@ -326,7 +324,8 @@ class KmsBackend(BaseBackend):
|
|||
if key_id in self.keys:
|
||||
return self.tagger.list_tags_for_resource(key_id)
|
||||
raise JsonRESTError(
|
||||
"NotFoundException", "The request was rejected because the specified entity or resource could not be found."
|
||||
"NotFoundException",
|
||||
"The request was rejected because the specified entity or resource could not be found.",
|
||||
)
|
||||
|
||||
def tag_resource(self, key_id, tags):
|
||||
|
|
@ -334,7 +333,8 @@ class KmsBackend(BaseBackend):
|
|||
self.tagger.tag_resource(key_id, tags)
|
||||
return {}
|
||||
raise JsonRESTError(
|
||||
"NotFoundException", "The request was rejected because the specified entity or resource could not be found."
|
||||
"NotFoundException",
|
||||
"The request was rejected because the specified entity or resource could not be found.",
|
||||
)
|
||||
|
||||
def untag_resource(self, key_id, tag_names):
|
||||
|
|
@ -342,7 +342,8 @@ class KmsBackend(BaseBackend):
|
|||
self.tagger.untag_resource_using_names(key_id, tag_names)
|
||||
return {}
|
||||
raise JsonRESTError(
|
||||
"NotFoundException", "The request was rejected because the specified entity or resource could not be found."
|
||||
"NotFoundException",
|
||||
"The request was rejected because the specified entity or resource could not be found.",
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ class ResourceGroupsTaggingAPIBackend(BaseBackend):
|
|||
# KMS
|
||||
def get_kms_tags(kms_key_id):
|
||||
result = []
|
||||
for tag in self.kms_backend.list_resource_tags(kms_key_id).get("Tags",[]):
|
||||
for tag in self.kms_backend.list_resource_tags(kms_key_id).get("Tags", []):
|
||||
result.append({"Key": tag["TagKey"], "Value": tag["TagValue"]})
|
||||
return result
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue