Added an unlocking function.

ArtifactDB · Dec 1, 2023 · 9df9a2b · 9df9a2b
1 parent 15b154f
commit 9df9a2b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/lock.js b/src/lock.js
@@ -15,6 +15,12 @@ export async function lockProject(project, asset, version, user_name) {
     return;
 }
 
+export async function unlockProject(project, asset, version) {
+    let bound_bucket = s3.getR2Binding();
+    let lck = pkeys.lock(project, asset);
+    await bound_bucket.delete(lck);
+}
+
 export async function checkLock(project, asset, version, user_name) {
     let bound_bucket = s3.getR2Binding();
     let lck = pkeys.lock(project, asset);

diff --git a/src/probation.js b/src/probation.js
@@ -34,7 +34,7 @@ export async function approveProbationHandler(request, nonblockers) {
             throw new utils.HttpError("failed to update version summary", 500);
         }
     } finally {
-        await bound_bucket.delete(pkeys.lock(project, asset));
+        await lck.unlockProject(project, asset);
     }
 
     return new Response(null, { status: 200 });
@@ -70,7 +70,7 @@ export async function rejectProbationHandler(request, nonblockers) {
 
         await utils.quickRecursiveDelete(project + "/" + asset + "/" + version + "/");
     } finally {
-        await bound_bucket.delete(pkeys.lock(project, asset));
+        await lck.unlockProject(project, asset);
     }
 
     return new Response(null, { status: 200 });

diff --git a/tests/lock.test.js b/tests/lock.test.js
@@ -16,4 +16,7 @@ test("project locking works as expected", async () => {
 
     expect(await lock.isLocked("test-lock-test", "locker")).toBe(true);
     expect(await lock.isLocked("test-lock-test", "other")).toBe(false);
+
+    await lock.unlockProject("test-lock-test", "locker");
+    expect(await lock.isLocked("test-lock-test", "locker")).toBe(false);
 })