Fixed bugs in AWS Config Querying

- Fixed some log bugs in the Config querying APIs
- Fixed an issue with S3 ACLs when described from Config (it's actually
a double-wrapped JSON)

moto/s3/config.py

@@ -8,8 +8,8 @@ from moto.s3 import s3_backends
 class S3ConfigQuery(ConfigQueryModel):
 
     def list_config_service_resources(self, resource_ids, resource_name, limit, next_token, backend_region=None, resource_region=None):
-        # S3 need not care about "backend_region" as S3 is global. The resource_region only matters for aggregated queries as you can
-        # filter on bucket regions for them. For other resource types, you would need to iterate appropriately for the backend_region.
+        # The resource_region only matters for aggregated queries as you can filter on bucket regions for them.
+        # For other resource types, you would need to iterate appropriately for the backend_region.
 
         # Resource IDs are the same as S3 bucket names
         # For aggregation -- did we get both a resource ID and a resource name?
@@ -31,12 +31,13 @@ class S3ConfigQuery(ConfigQueryModel):
                 if bucket in filter_buckets:
                     bucket_list.append(bucket)
 
-        # If a resource_region was supplied (aggregated only), then filter on bucket region too:
-        if resource_region:
+        # Filter on the proper region if supplied:
+        region_filter = backend_region or resource_region
+        if region_filter:
             region_buckets = []
 
             for bucket in bucket_list:
-                if self.backends['global'].buckets[bucket].region_name == resource_region:
+                if self.backends['global'].buckets[bucket].region_name == region_filter:
                     region_buckets.append(bucket)
 
             bucket_list = region_buckets
@@ -69,8 +70,6 @@ class S3ConfigQuery(ConfigQueryModel):
                 for bucket in bucket_list], new_token
 
     def get_config_resource(self, resource_id, resource_name=None, backend_region=None, resource_region=None):
-        # backend_region is ignored for S3 as the backend is 'global'
-
         # Get the bucket:
         bucket = self.backends['global'].buckets.get(resource_id, {})
 
@@ -78,7 +77,8 @@ class S3ConfigQuery(ConfigQueryModel):
             return
 
         # Are we filtering based on region?
-        if resource_region and bucket.region_name != resource_region:
+        region_filter = backend_region or resource_region
+        if region_filter and bucket.region_name != region_filter:
             return
 
         # Are we also filtering on bucket name?

moto/s3/models.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import json
 import os
 import base64
 import datetime
@@ -520,7 +521,6 @@ class LifecycleRule(BaseModel):
         Note: The following are missing that should be added in the future:
             - transitions (returns None for now)
             - noncurrentVersionTransitions (returns None for now)
-            - LifeCycle Filters that are NOT prefix
 
         :param kwargs:
         :return:
@@ -530,9 +530,9 @@ class LifecycleRule(BaseModel):
             'id': self.id,
             'prefix': self.prefix,
             'status': self.status,
-            'expirationInDays': self.expiration_days,
+            'expirationInDays': int(self.expiration_days) if self.expiration_days else None,
             'expiredObjectDeleteMarker': self.expired_object_delete_marker,
-            'noncurrentVersionExpirationInDays': -1 or self.nve_noncurrent_days,
+            'noncurrentVersionExpirationInDays': -1 or int(self.nve_noncurrent_days),
             'expirationDate': self.expiration_date,
             'transitions': None,    # Replace me with logic to fill in
             'noncurrentVersionTransitions': None,   # Replace me with logic to fill in
@@ -930,7 +930,9 @@ class FakeBucket(BaseModel):
 
         # Make the supplementary configuration:
         # TODO: Implement Public Access Block Support
-        s_config = {'AccessControlList': self.acl.to_config_dict()}
+
+        # This is a dobule-wrapped JSON for some reason...
+        s_config = {'AccessControlList': json.dumps(json.dumps(self.acl.to_config_dict()))}
 
         # TODO implement Accelerate Configuration:
         s_config['BucketAccelerateConfiguration'] = {'status': None}