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

ACM: use .utcnow() instead of .now() (#5435)

Browse Source
This commit is contained in:
Ben Limmer 2022-08-31 03:23:50 -06:00 committed by GitHub
parent e621ce419c
commit c7fbbdea48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/acm/models.py
View File

@ -130,7 +130,7 @@ class CertBundle(BaseModel):
cert_type="IMPORTED", cert_type="IMPORTED",
cert_status="ISSUED", cert_status="ISSUED",
): ):
self.created_at = datetime.datetime.now() self.created_at = datetime.datetime.utcnow()
self.cert = certificate self.cert = certificate
self._cert = None self._cert = None
self.common_name = None self.common_name = None
@ -306,7 +306,7 @@ class CertBundle(BaseModel):
) )
self._chain.append(cert) self._chain.append(cert)
now = datetime.datetime.now() now = datetime.datetime.utcnow()
if self._cert.not_valid_after < now: if self._cert.not_valid_after < now:
raise AWSValidationException( raise AWSValidationException(
"The certificate chain has expired, is not valid." "The certificate chain has expired, is not valid."
@ -328,7 +328,7 @@ class CertBundle(BaseModel):
# Basically, if the certificate is pending, and then checked again after a # Basically, if the certificate is pending, and then checked again after a
# while, it will appear as if its been validated. The default wait time is 60 # while, it will appear as if its been validated. The default wait time is 60
# seconds but you can set an environment to change it. # seconds but you can set an environment to change it.
waited_seconds = (datetime.datetime.now() - self.created_at).total_seconds() waited_seconds = (datetime.datetime.utcnow() - self.created_at).total_seconds()
if ( if (
self.type == "AMAZON_ISSUED" self.type == "AMAZON_ISSUED"
and self.status == "PENDING_VALIDATION" and self.status == "PENDING_VALIDATION"
@ -458,7 +458,7 @@ class AWSCertificateManagerBackend(BaseBackend):
:param token: String token :param token: String token
:return: None or ARN :return: None or ARN
""" """
now = datetime.datetime.now() now = datetime.datetime.utcnow()
if token in self._idempotency_tokens: if token in self._idempotency_tokens:
if self._idempotency_tokens[token]["expires"] < now: if self._idempotency_tokens[token]["expires"] < now:
# Token has expired, new request # Token has expired, new request
@ -472,7 +472,7 @@ class AWSCertificateManagerBackend(BaseBackend):
def _set_idempotency_token_arn(self, token, arn): def _set_idempotency_token_arn(self, token, arn):
self._idempotency_tokens[token] = { self._idempotency_tokens[token] = {
"arn": arn, "arn": arn,
"expires": datetime.datetime.now() + datetime.timedelta(hours=1), "expires": datetime.datetime.utcnow() + datetime.timedelta(hours=1),
} }
def import_cert(self, certificate, private_key, chain=None, arn=None, tags=None): def import_cert(self, certificate, private_key, chain=None, arn=None, tags=None):