From 36b2be12d7a19e3ecb5bffe0eb6733675b0727ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Wieczorek?= <pawiecz@collabora.com>
Date: Wed, 12 Mar 2025 13:23:14 +0100
Subject: [PATCH] lava_callback: Add patch upload support to /patchset endpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Wieczorek <pawiecz@collabora.com>
---
 src/lava_callback.py | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/lava_callback.py b/src/lava_callback.py
index 792925022..1e1224e0a 100755
--- a/src/lava_callback.py
+++ b/src/lava_callback.py
@@ -174,6 +174,14 @@ def _upload_log(log_parser, job_node, storage):
         return _upload_file(storage, job_node, src, 'log.txt.gz')
 
 
+def _upload_patch(data, upload_id, filename, storage):
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        src = os.path.join(tmp_dir, filename)
+        with open(src, 'wt') as f:
+            f.write(data)
+        return _upload_file(storage, upload_id, src, filename)
+
+
 @app.get('/')
 async def read_root():
     page = '''
@@ -675,6 +683,11 @@ async def patchset(data: PatchSet, request: Request,
         item['message'] = 'Node is not a checkout'
         return JSONResponse(content=item, status_code=400)
 
+    # Maybe add field who requested the patchset?
+    treeidsrc = node['data']['kernel_revision']['url'] + \
+        node['data']['kernel_revision']['branch'] + str(datetime.now())
+    treeid = hashlib.sha256(treeidsrc.encode()).hexdigest()
+
     # validate patch URL
     if data.patchurl:
         if isinstance(data.patchurl, list):
@@ -688,20 +701,22 @@ async def patchset(data: PatchSet, request: Request,
         else:
             return 'Invalid patch URL type', 400
     elif data.patch:
-        # We need to implement upload to storage and return URL
-        item['message'] = 'Not implemented yet'
-        return JSONResponse(content=item, status_code=501)
+        if isinstance(data.patch, list):
+            data.patchurl = []
+            upload_id = {
+                'name': 'patchset',
+                'id': treeid,
+            }
+            for i, patch in enumerate(data.patch):
+                patchurl = _upload_patch(patch, upload_id, f'patch{i}', storage)
+                data.patchurl.append(patchurl)
     else:
         item['message'] = 'Missing patch URL or patch'
         return JSONResponse(content=item, status_code=400)
 
     # Now we can submit custom patchset node to the API
-    # Maybe add field who requested the patchset?
     timeout = 300
     patchset_timeout = datetime.utcnow() + timedelta(minutes=timeout)
-    treeidsrc = node['data']['kernel_revision']['url'] + \
-        node['data']['kernel_revision']['branch'] + str(datetime.now())
-    treeid = hashlib.sha256(treeidsrc.encode()).hexdigest()
     # copy node to newnode
     newnode = node.copy()
     # delete some fields, like id, created, updated, timeout