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

Add validity dates to IoT fakecerts

Browse source
This commit is contained in:
cătălin 2021-07-23 11:49:52 +02:00
commit e94a3e39df
2 changed files with 85 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

17
moto/iot/models.py
View file

@ -12,6 +12,7 @@ from datetime import datetime
from boto3 import Session from boto3 import Session
from moto.core import BaseBackend, BaseModel from moto.core import BaseBackend, BaseModel
from moto.utilities.utils import random_string
from .exceptions import ( from .exceptions import (
CertificateStateException, CertificateStateException,
DeleteConflictException, DeleteConflictException,
@ -21,7 +22,6 @@ from .exceptions import (
VersionConflictException, VersionConflictException,
ResourceAlreadyExistsException, ResourceAlreadyExistsException,
) )
from moto.utilities.utils import random_string
class FakeThing(BaseModel): class FakeThing(BaseModel):
@ -144,7 +144,8 @@ class FakeCertificate(BaseModel):
self.transfer_data = {} self.transfer_data = {}
self.creation_date = time.time() self.creation_date = time.time()
self.last_modified_date = self.creation_date self.last_modified_date = self.creation_date
self.validity_not_before = (time.time() - 86400)
self.validity_not_after = (time.time() + 86400)
self.ca_certificate_id = None self.ca_certificate_id = None
self.ca_certificate_pem = ca_certificate_pem self.ca_certificate_pem = ca_certificate_pem
if ca_certificate_pem: if ca_certificate_pem:
@ -174,6 +175,10 @@ class FakeCertificate(BaseModel):
"ownedBy": self.owner, "ownedBy": self.owner,
"creationDate": self.creation_date, "creationDate": self.creation_date,
"lastModifiedDate": self.last_modified_date, "lastModifiedDate": self.last_modified_date,
"validity": {
"notBefore": self.validity_not_before,
"notAfter": self.validity_not_after
},
"transferData": self.transfer_data, "transferData": self.transfer_data,
} }
@ -578,7 +583,7 @@ class IoTBackend(BaseBackend):
) )
else: else:
token = int(token) token = int(token)
things = filtered_things[token : token + max_results] things = filtered_things[token: token + max_results]
next_token = ( next_token = (
str(token + max_results) str(token + max_results)
if len(filtered_things) > token + max_results if len(filtered_things) > token + max_results
@ -1209,7 +1214,7 @@ class IoTBackend(BaseBackend):
next_token = str(max_results) if len(filtered_jobs) > max_results else None next_token = str(max_results) if len(filtered_jobs) > max_results else None
else: else:
token = int(token) token = int(token)
jobs = filtered_jobs[token : token + max_results] jobs = filtered_jobs[token: token + max_results]
next_token = ( next_token = (
str(token + max_results) str(token + max_results)
if len(filtered_jobs) > token + max_results if len(filtered_jobs) > token + max_results
@ -1288,7 +1293,7 @@ class IoTBackend(BaseBackend):
next_token = str(max_results) if len(job_executions) > max_results else None next_token = str(max_results) if len(job_executions) > max_results else None
else: else:
token = int(token) token = int(token)
job_executions = job_executions[token : token + max_results] job_executions = job_executions[token: token + max_results]
next_token = ( next_token = (
str(token + max_results) str(token + max_results)
if len(job_executions) > token + max_results if len(job_executions) > token + max_results
@ -1320,7 +1325,7 @@ class IoTBackend(BaseBackend):
next_token = str(max_results) if len(job_executions) > max_results else None next_token = str(max_results) if len(job_executions) > max_results else None
else: else:
token = int(token) token = int(token)
job_executions = job_executions[token : token + max_results] job_executions = job_executions[token: token + max_results]
next_token = ( next_token = (
str(token + max_results) str(token + max_results)
if len(job_executions) > token + max_results if len(job_executions) > token + max_results

2
moto/iot/responses.py
View file

@ -49,7 +49,7 @@ class IoTResponse(BaseResponse):
next_token = str(max_results) if len(thing_types) > max_results else None next_token = str(max_results) if len(thing_types) > max_results else None
else: else:
token = int(previous_next_token) token = int(previous_next_token)
result = thing_types[token : token + max_results] result = thing_types[token: token + max_results]
next_token = ( next_token = (
str(token + max_results) str(token + max_results)
if len(thing_types) > token + max_results if len(thing_types) > token + max_results