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

clean up and bring up to master

Browse Source
This commit is contained in:
Nick Stocchero 2020-09-17 17:43:19 -06:00
parent 4354cb06d1
commit fc7f3fecb6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/core/models.py
View File

@ -691,6 +691,7 @@ class ConfigQueryModel(object):
next_token, next_token,
backend_region=None, backend_region=None,
resource_region=None, resource_region=None,
aggregator=None,
): ):
"""For AWS Config. This will list all of the resources of the given type and optional resource name and region. """For AWS Config. This will list all of the resources of the given type and optional resource name and region.
@ -722,6 +723,10 @@ class ConfigQueryModel(object):
:param backend_region: The region for the backend to pull results from. Set to `None` if this is an aggregated query. :param backend_region: The region for the backend to pull results from. Set to `None` if this is an aggregated query.
:param resource_region: The region for where the resources reside to pull results from. Set to `None` if this is a :param resource_region: The region for where the resources reside to pull results from. Set to `None` if this is a
non-aggregated query. non-aggregated query.
:param aggregator: If the query is an aggregated query, *AND* the resource has "non-standard" aggregation logic (mainly, IAM),
you'll need to pass aggregator used. In most cases, this should be omitted/set to `None`. See the
conditional logic under `if aggregator` in the moto/iam/config.py for the IAM example.
:return: This should return a list of Dicts that have the following fields: :return: This should return a list of Dicts that have the following fields:
[ [
{ {

1
moto/iam/models.py
View File

@ -12,7 +12,6 @@ import time
from cryptography import x509 from cryptography import x509
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
from six.moves.urllib.parse import urlparse
from six.moves.urllib import parse from six.moves.urllib import parse
from moto.core.exceptions import RESTError from moto.core.exceptions import RESTError