diff --git a/moto/iam/models.py b/moto/iam/models.py index a5f40b996..e0f725299 100644 --- a/moto/iam/models.py +++ b/moto/iam/models.py @@ -51,8 +51,8 @@ class Policy(BaseModel): self.default_version_id = default_version_id or 'v1' self.versions = [PolicyVersion(self.arn, document, True)] - self.create_datetime = datetime.strftime(datetime.utcnow(), "%Y-%m-%dT%H:%M:%SZ") - self.update_datetime = datetime.strftime(datetime.utcnow(), "%Y-%m-%dT%H:%M:%SZ") + self.create_datetime = datetime.now(pytz.utc) + self.update_datetime = datetime.now(pytz.utc) class SAMLProvider(BaseModel): @@ -76,7 +76,7 @@ class PolicyVersion(object): self.is_default = is_default self.version_id = 'v1' - self.create_datetime = datetime.strftime(datetime.utcnow(), "%Y-%m-%dT%H:%M:%SZ") + self.create_datetime = datetime.now(pytz.utc) class ManagedPolicy(Policy): @@ -132,7 +132,7 @@ class Role(BaseModel): self.path = path or '/' self.policies = {} self.managed_policies = {} - self.create_date = datetime.strftime(datetime.utcnow(), "%Y-%m-%dT%H:%M:%SZ") + self.create_date = datetime.now(pytz.utc) self.tags = {} self.description = "" diff --git a/moto/iam/responses.py b/moto/iam/responses.py index c981f9b35..5be07430f 100644 --- a/moto/iam/responses.py +++ b/moto/iam/responses.py @@ -742,12 +742,12 @@ CREATE_POLICY_TEMPLATE = """ {{ policy.arn }} {{ policy.attachment_count }} - {{ policy.create_datetime }} + {{ policy.create_datetime.isoformat() }} {{ policy.default_version_id }} {{ policy.path }} {{ policy.id }} {{ policy.name }} - {{ policy.update_datetime }} + {{ policy.update_datetime.isoformat() }} @@ -765,8 +765,8 @@ GET_POLICY_TEMPLATE = """ {{ policy.path }} {{ policy.arn }} {{ policy.attachment_count }} - {{ policy.create_datetime }} - {{ policy.update_datetime }} + {{ policy.create_datetime.isoformat() }} + {{ policy.update_datetime.isoformat() }} @@ -858,7 +858,7 @@ LIST_POLICIES_TEMPLATE = """ {{ policy.path }} {{ policy.id }} {{ policy.name }} - {{ policy.update_datetime.isoformat() }} + {{ policy.update_datetime }} {% endfor %} @@ -951,7 +951,7 @@ UPDATE_ROLE_DESCRIPTION_TEMPLATE = """