catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

SSM: Fix the formatting associated with label_parameter_version/get_parameter_history updates

Browse source
This commit is contained in:
Brent Driskill 2020-03-11 11:57:04 -04:00
commit e3e4b741d8
4 changed files with 176 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
moto/ssm/exceptions.py
View file

@ -22,23 +22,31 @@ class InvalidFilterValue(JsonRESTError):
def __init__(self, message):
super(InvalidFilterValue, self).__init__("InvalidFilterValue", message)
class ParameterNotFound(JsonRESTError):
code = 400
def __init__(self, message):
super(ParameterNotFound, self).__init__("ParameterNotFound", message)
class ParameterVersionNotFound(JsonRESTError):
code = 400
def __init__(self, message):
super(ParameterVersionNotFound, self).__init__("ParameterVersionNotFound", message)
super(ParameterVersionNotFound, self).__init__(
"ParameterVersionNotFound", message
)
class ParameterVersionLabelLimitExceeded(JsonRESTError):
code = 400
def __init__(self, message):
super(ParameterVersionLabelLimitExceeded, self).__init__("ParameterVersionLabelLimitExceeded", message)
super(ParameterVersionLabelLimitExceeded, self).__init__(
"ParameterVersionLabelLimitExceeded", message
)
class ValidationException(JsonRESTError):
code = 400

20
moto/ssm/models.py
View file

@ -21,7 +21,7 @@ from .exceptions import (
InvalidFilterKey,
ParameterVersionLabelLimitExceeded,
ParameterVersionNotFound,
ParameterNotFound
ParameterNotFound,
)
@ -35,7 +35,7 @@ class Parameter(BaseModel):
allowed_pattern,
keyid,
last_modified_date,
version
version,
):
self.name = name
self.type = type
@ -624,9 +624,7 @@ class SimpleSystemManagerBackend(BaseBackend):
def label_parameter_version(self, name, version, labels):
previous_parameter_versions = self._parameters[name]
if not previous_parameter_versions:
raise ParameterNotFound(
"Parameter %s not found." % name
)
raise ParameterNotFound("Parameter %s not found." % name)
found_parameter = None
labels_needing_removal = []
if not version:
@ -645,11 +643,16 @@ class SimpleSystemManagerBackend(BaseBackend):
raise ParameterVersionNotFound(
"Systems Manager could not find version %s of %s. "
"Verify the version and try again." % (version, name)
)
)
labels_to_append = []
invalid_labels = []
for label in labels:
if label.startswith("aws") or label.startswith("ssm") or label[:1].isdigit() or not re.match("^[a-zA-z0-9_\.\-]*$", label):
if (
label.startswith("aws")
or label.startswith("ssm")
or label[:1].isdigit()
or not re.match("^[a-zA-z0-9_\.\-]*$", label)
):
invalid_labels.append(label)
continue
if len(label) > 100:
@ -657,7 +660,8 @@ class SimpleSystemManagerBackend(BaseBackend):
"1 validation error detected: "
"Value '[%s]' at 'labels' failed to satisfy constraint: "
"Member must satisfy constraint: "
"[Member must have length less than or equal to 100, Member must have length greater than or equal to 1]" % label
"[Member must have length less than or equal to 100, Member must have length greater than or equal to 1]"
% label
)
continue
if label not in found_parameter.labels:

7
moto/ssm/responses.py
View file

@ -168,8 +168,7 @@ class SimpleSystemManagerResponse(BaseResponse):
response = {"Parameters": []}
for parameter_version in result:
param_data = parameter_version.describe_response_object(
decrypt=with_decryption,
include_labels=True
decrypt=with_decryption, include_labels=True
)
response["Parameters"].append(param_data)
@ -180,7 +179,9 @@ class SimpleSystemManagerResponse(BaseResponse):
version = self._get_param("ParameterVersion")
labels = self._get_param("Labels")
invalid_labels, version = self.ssm_backend.label_parameter_version(name, version, labels)
invalid_labels, version = self.ssm_backend.label_parameter_version(
name, version, labels
)
response = {"InvalidLabels": invalid_labels, "ParameterVersion": version}
return json.dumps(response)