Merge branch 'master' into is6791/fix-projects-inactivity-interval-env-var

giancarloromeo · web-flow · commit 14a1c7115217 · 2024-11-27T09:27:38.000+01:00
diff --git a/services/storage/src/simcore_service_storage/handlers_simcore_s3.py b/services/storage/src/simcore_service_storage/handlers_simcore_s3.py
@@ -18,7 +18,6 @@
     parse_request_query_parameters_as,
 )
 from servicelib.logging_utils import log_context
-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from settings_library.s3 import S3Settings
 
 from . import sts
@@ -79,8 +78,10 @@ async def _copy_folders_from_project(
             task_progress=task_progress,
         )
 
-    raise web.HTTPCreated(
-        text=json_dumps(body.destination), content_type=MIMETYPE_APPLICATION_JSON
+    return web.json_response(
+        {"data": jsonable_encoder(body.destination)},
+        status=status.HTTP_201_CREATED,
+        dumps=json_dumps,
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`parse_request_query_parameters_as,`
`19`	`19`	`)`
`20`	`20`	`from servicelib.logging_utils import log_context`
`21`		`-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON`
`22`	`21`	`from settings_library.s3 import S3Settings`
`23`	`22`
`24`	`23`	`from . import sts`
`@@ -79,8 +78,10 @@ async def _copy_folders_from_project(`
`79`	`78`	`task_progress=task_progress,`
`80`	`79`	`)`
`81`	`80`
`82`		`- raise web.HTTPCreated(`
`83`		`- text=json_dumps(body.destination), content_type=MIMETYPE_APPLICATION_JSON`
	`81`	`+ return web.json_response(`
	`82`	`+ {"data": jsonable_encoder(body.destination)},`
	`83`	`+ status=status.HTTP_201_CREATED,`
	`84`	`+ dumps=json_dumps,`
`84`	`85`	`)`
`85`	`86`
`86`	`87`