Format + fixed json dumps

Pive01 · Pive01 · commit 8467298a3787 · 2024-11-11T13:51:43.000+01:00
diff --git a/localstack-core/localstack/aws/handlers/custom.py b/localstack-core/localstack/aws/handlers/custom.py
@@ -1,7 +1,7 @@
 import logging
 
-from localstack.http import Response
 from localstack import config
+from localstack.http import Response
 
 from ..api import RequestContext
 from ..chain import Handler, HandlerChain
@@ -23,11 +23,14 @@ class AccountRegionCollector(Handler):
     """
 
     def __call__(self, chain: HandlerChain, context: RequestContext, response: Response):
-
         if context.account_id == config.INTERNAL_RESOURCE_ACCOUNT:
             return
-        
-        if context.service and context.service.service_name == 'cloudwatch' and context.operation is None:
-           return
-        
+
+        if (
+            context.service
+            and context.service.service_name == "cloudwatch"
+            and context.operation is None
+        ):
+            return
+
         AccountRegionTracker.track(context.account_id, context.region)
diff --git a/localstack-core/localstack/services/cloudcontrol/provider.py b/localstack-core/localstack/services/cloudcontrol/provider.py
@@ -28,6 +28,7 @@
     get_resource_type,
     resolve_json_pointer,
 )
+from localstack.utils.json import CustomEncoder
 
 LOG = logging.getLogger(__name__)
 
@@ -187,7 +188,7 @@ def list_resources(
                     Identifier=extract_physical_resource_id_from_model_with_schema(
                         props, type_name, provider.SCHEMA
                     ),
-                    Properties=json.dumps(props),
+                    Properties=json.dumps(props, cls=CustomEncoder),
                 )
                 for props in event.resource_models
             ],
diff --git a/localstack-core/localstack/services/iam/resource_providers/aws_iam_policy.py b/localstack-core/localstack/services/iam/resource_providers/aws_iam_policy.py
@@ -92,7 +92,6 @@ def read(
         """
         raise NotImplementedError
 
-
     def delete(
         self,
         request: ResourceRequest[IAMPolicyProperties],
diff --git a/localstack-core/localstack/services/internal.py b/localstack-core/localstack/services/internal.py
@@ -186,14 +186,15 @@ class AccountsRegionUsageResource:
 
     def on_get(self, request):
         from localstack.aws.handlers.custom import AccountRegionTracker
+
         output_dict = {}
 
-            # Iterate over the set and populate the dictionary
+        # Iterate over the set and populate the dictionary
         for x, y in AccountRegionTracker.tracked:
             if x not in output_dict:
-                output_dict[x] = []  
-            output_dict[x].append(y) 
-            
+                output_dict[x] = []
+            output_dict[x].append(y)
+
         return output_dict
 
 

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`get_resource_type,`
`29`	`29`	`resolve_json_pointer,`
`30`	`30`	`)`
	`31`	`+from localstack.utils.json import CustomEncoder`
`31`	`32`
`32`	`33`	`LOG = logging.getLogger(__name__)`
`33`	`34`
`@@ -187,7 +188,7 @@ def list_resources(`
`187`	`188`	`Identifier=extract_physical_resource_id_from_model_with_schema(`
`188`	`189`	`props, type_name, provider.SCHEMA`
`189`	`190`	`),`
`190`		`- Properties=json.dumps(props),`
	`191`	`+ Properties=json.dumps(props, cls=CustomEncoder),`
`191`	`192`	`)`
`192`	`193`	`for props in event.resource_models`
`193`	`194`	`],`