fixing encoding issue

awslabs · Dec 16, 2024 · 81215db · 81215db
1 parent f68405b
commit 81215db
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/servicecatalog_puppet/commands/task_reference_helpers/complete_generator.py b/servicecatalog_puppet/commands/task_reference_helpers/complete_generator.py
@@ -15,15 +15,15 @@
 from servicecatalog_puppet.commands.task_reference_helpers.generators.boto3_parameter_handler import (
     boto3_parameter_handler,
 )
+from servicecatalog_puppet.commands.task_reference_helpers.generators.s3_parameter_handler import (
+    s3_parameter_handler,
+)
 from servicecatalog_puppet.commands.task_reference_helpers.generators.ssm_outputs_handler import (
     ssm_outputs_handler,
 )
 from servicecatalog_puppet.commands.task_reference_helpers.generators.ssm_parameter_handler import (
     ssm_parameter_handler,
 )
-from servicecatalog_puppet.commands.task_reference_helpers.generators.s3_parameter_handler import (
-    s3_parameter_handler,
-)
 from servicecatalog_puppet.waluigi.shared_tasks.task_topological_generations_without_scheduler_unit_test import (
     dependency_task_reference,
 )

diff --git a/servicecatalog_puppet/waluigi/task_mixins/io_mixin.py b/servicecatalog_puppet/waluigi/task_mixins/io_mixin.py
@@ -73,10 +73,16 @@ def write_empty_output(self):
             with self.output().open("wb") as f:
                 f.write(b"{}")
 
-    def write_output(self, content):
+    def write_output(self, content, skip_json_encode=False):
         if self.should_use_caching:
             with self.output().open("w") as f:
-                f.write(serialisation_utils.json_dumps(content).decode("utf-8"))
+                if skip_json_encode:
+                    f.write(content.decode("utf-8"))
+                else:
+                    f.write(serialisation_utils.json_dumps(content).decode("utf-8"))
         else:
             with self.output().open("wb") as f:
-                f.write(serialisation_utils.json_dumps(content))
+                if skip_json_encode:
+                    f.write(content)
+                else:
+                    f.write(serialisation_utils.json_dumps(content))
diff --git a/servicecatalog_puppet/workflow/s3/get_s3_object_task.py b/servicecatalog_puppet/workflow/s3/get_s3_object_task.py
@@ -3,11 +3,11 @@
 import json
 from copy import deepcopy
 
+import jmespath
 import luigi
 
 from servicecatalog_puppet import constants
 from servicecatalog_puppet.workflow.dependencies import tasks
-import jmespath
 
 
 class GetS3ObjectTask(tasks.TaskWithReference):
@@ -33,4 +33,4 @@ def run(self):
                 .get("Body")
                 .read()
             )
-            self.write_output(object)
+            self.write_output(object, skip_json_encode=True)
diff --git a/servicecatalog_puppet/workflow/s3/get_s3_parameter_task.py b/servicecatalog_puppet/workflow/s3/get_s3_parameter_task.py
@@ -28,10 +28,10 @@ def params_for_results_display(self):
         }
 
     def run(self):
-        object = self.get_output_from_reference_dependency_raw(
+        object = self.get_output_from_reference_dependency(
             self.s3_object_task_reference
         )
-        result = jmespath.search(self.jmespath_location, json.loads(object))
+        result = jmespath.search(self.jmespath_location, object)
         if result is None:
             if self.default is None:
                 raise Exception(

diff --git a/servicecatalog_puppet/workflow/ssm/get_ssm_parameter_task.py b/servicecatalog_puppet/workflow/ssm/get_ssm_parameter_task.py
@@ -3,11 +3,11 @@
 import json
 from copy import deepcopy
 
+import jmespath
 import luigi
 
 from servicecatalog_puppet import constants
 from servicecatalog_puppet.workflow.dependencies import tasks
-import jmespath
 
 
 class GetSSMParameterTask(tasks.TaskWithReference):