Merge pull request #2611 from Sytten/fix/ssm-parameter

Add missing information in SSM parameters
This commit is contained in:
Mike Grima 2019-12-16 11:59:42 -08:00 committed by GitHub
commit 65b17e740d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 52 additions and 5 deletions

View File

@ -13,6 +13,7 @@ import time
import uuid
import itertools
from .utils import parameter_arn
from .exceptions import (
ValidationException,
InvalidFilterValue,
@ -60,19 +61,23 @@ class Parameter(BaseModel):
if value.startswith(prefix):
return value[len(prefix) :]
def response_object(self, decrypt=False):
def response_object(self, decrypt=False, region=None):
r = {
"Name": self.name,
"Type": self.type,
"Value": self.decrypt(self.value) if decrypt else self.value,
"Version": self.version,
"LastModifiedDate": round(self.last_modified_date, 3),
}
if region:
r["ARN"] = parameter_arn(region, self.name)
return r
def describe_response_object(self, decrypt=False):
r = self.response_object(decrypt)
r["LastModifiedDate"] = int(self.last_modified_date)
r["LastModifiedDate"] = round(self.last_modified_date, 3)
r["LastModifiedUser"] = "N/A"
if self.description:

View File

@ -51,7 +51,7 @@ class SimpleSystemManagerResponse(BaseResponse):
}
return json.dumps(error), dict(status=400)
response = {"Parameter": result.response_object(with_decryption)}
response = {"Parameter": result.response_object(with_decryption, self.region)}
return json.dumps(response)
def get_parameters(self):
@ -63,7 +63,7 @@ class SimpleSystemManagerResponse(BaseResponse):
response = {"Parameters": [], "InvalidParameters": []}
for parameter in result:
param_data = parameter.response_object(with_decryption)
param_data = parameter.response_object(with_decryption, self.region)
response["Parameters"].append(param_data)
param_names = [param.name for param in result]
@ -92,7 +92,7 @@ class SimpleSystemManagerResponse(BaseResponse):
response = {"Parameters": [], "NextToken": next_token}
for parameter in result:
param_data = parameter.response_object(with_decryption)
param_data = parameter.response_object(with_decryption, self.region)
response["Parameters"].append(param_data)
return json.dumps(response)

9
moto/ssm/utils.py Normal file
View File

@ -0,0 +1,9 @@
ACCOUNT_ID = "1234567890"
def parameter_arn(region, parameter_name):
if parameter_name[0] == "/":
parameter_name = parameter_name[1:]
return "arn:aws:ssm:{0}:{1}:parameter/{2}".format(
region, ACCOUNT_ID, parameter_name
)

View File

@ -102,6 +102,18 @@ def test_get_parameters_by_path():
response = client.get_parameters_by_path(Path="/", Recursive=False)
len(response["Parameters"]).should.equal(2)
{p["Value"] for p in response["Parameters"]}.should.equal(set(["bar", "qux"]))
{p["ARN"] for p in response["Parameters"]}.should.equal(
set(
[
"arn:aws:ssm:us-east-1:1234567890:parameter/foo",
"arn:aws:ssm:us-east-1:1234567890:parameter/baz",
]
)
)
{
p["LastModifiedDate"].should.be.a(datetime.datetime)
for p in response["Parameters"]
}
response = client.get_parameters_by_path(Path="/", Recursive=True)
len(response["Parameters"]).should.equal(9)
@ -190,6 +202,11 @@ def test_put_parameter():
response["Parameters"][0]["Value"].should.equal("value")
response["Parameters"][0]["Type"].should.equal("String")
response["Parameters"][0]["Version"].should.equal(1)
response["Parameters"][0]["LastModifiedDate"].should.be.a(datetime.datetime)
response["Parameters"][0]["ARN"].should.equal(
"arn:aws:ssm:us-east-1:1234567890:parameter/test"
)
initial_modification_date = response["Parameters"][0]["LastModifiedDate"]
try:
client.put_parameter(
@ -208,6 +225,12 @@ def test_put_parameter():
response["Parameters"][0]["Value"].should.equal("value")
response["Parameters"][0]["Type"].should.equal("String")
response["Parameters"][0]["Version"].should.equal(1)
response["Parameters"][0]["LastModifiedDate"].should.equal(
initial_modification_date
)
response["Parameters"][0]["ARN"].should.equal(
"arn:aws:ssm:us-east-1:1234567890:parameter/test"
)
response = client.put_parameter(
Name="test",
@ -227,6 +250,12 @@ def test_put_parameter():
response["Parameters"][0]["Value"].should.equal("value 3")
response["Parameters"][0]["Type"].should.equal("String")
response["Parameters"][0]["Version"].should.equal(2)
response["Parameters"][0]["LastModifiedDate"].should_not.equal(
initial_modification_date
)
response["Parameters"][0]["ARN"].should.equal(
"arn:aws:ssm:us-east-1:1234567890:parameter/test"
)
@mock_ssm
@ -253,6 +282,10 @@ def test_get_parameter():
response["Parameter"]["Name"].should.equal("test")
response["Parameter"]["Value"].should.equal("value")
response["Parameter"]["Type"].should.equal("String")
response["Parameter"]["LastModifiedDate"].should.be.a(datetime.datetime)
response["Parameter"]["ARN"].should.equal(
"arn:aws:ssm:us-east-1:1234567890:parameter/test"
)
@mock_ssm