From ce0d8d13fe23389c98b8b432e1d87c1d58d990f1 Mon Sep 17 00:00:00 2001 From: Jacob Shufro Date: Sun, 22 Jan 2023 22:50:42 +0000 Subject: [PATCH] Use the new delete-by-query functionality for morgue delete --- bin/morgue.js | 6 ++---- lib/coroner.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/morgue.js b/bin/morgue.js index fbeea7b..bef2040 100755 --- a/bin/morgue.js +++ b/bin/morgue.js @@ -6343,10 +6343,8 @@ function coronerDelete(argv, config) { } if (aq && aq.query) { - coroner.promise('query', p.universe, p.project, aq.query).then(function(r) { - unpackQueryObjects(o, r); - return delete_fn(); - }).then(std_success_cb).catch(std_failure_cb); + coroner.promise('delete_query', p.universe, p.project, aq.query, + params).then(std_success_cb).catch(std_failure_cb); } else { delete_fn().then(std_success_cb).catch(std_failure_cb); } diff --git a/lib/coroner.js b/lib/coroner.js index 4addd78..5ca00c4 100644 --- a/lib/coroner.js +++ b/lib/coroner.js @@ -597,6 +597,16 @@ CoronerClient.prototype.delete_objects = function(universe, project, objects, pa this.post("/api/delete", { universe }, p, null, callback); }; +CoronerClient.prototype.delete_query = function(universe, project, query, params, callback) { + var p = Object.assign({ + universe: universe, + project: project, + query: query, + }, params); + + this.post("/api/delete", { universe }, p, null, callback); +}; + /* * Find a service from its name. */