From 64a8092578016642525eb6ce70521fabfbce1e2a Mon Sep 17 00:00:00 2001
From: Rex White <rexwhite@redhat.com>
Date: Mon, 22 Jan 2024 15:36:44 -0500
Subject: [PATCH] Handle missing playbook run correctly (#416)

---
 src/remediations/fifi.js   | 4 +---
 src/remediations/routes.js | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/remediations/fifi.js b/src/remediations/fifi.js
index 8095b989..713022ae 100644
--- a/src/remediations/fifi.js
+++ b/src/remediations/fifi.js
@@ -168,11 +168,9 @@ async function formatRHCRuns (rhcRuns, playbook_run_id) {
     trace.event(`processing ${rhcRuns.data.length} runs...`);
     
     for (const run of rhcRuns.data) {
-trace.event(`rhcRuns: ${JSON.stringify(rhcRuns)}`); // TODO: delete me!
         // get dispatcher run hosts
         const runHostsFilter = createDispatcherRunHostsFilter(run.labels['playbook-run'], run.id);
         const rhcRunHosts = await dispatcher.fetchPlaybookRunHosts(runHostsFilter, RHCRUNFIELDS);
-trace.event(`playbook run hosts: ${JSON.stringify(rhcRunHosts)}`); // TODO: delete me!
         // If host === 'localhost' then add to RHCDirect
         if (_.get(rhcRunHosts, 'data[0][host]') === 'localhost') {
             rhcDirect.playbook = run.url;
@@ -182,7 +180,7 @@ trace.event(`playbook run hosts: ${JSON.stringify(rhcRunHosts)}`); // TODO: dele
         }
 
         // else create a new sat executor
-        else {
+        else if (!_.isEmpty(rhcRunsHosts)) {
             let satExecutor = {
                 name: 'RHC Satellite',
                 executor_id: playbook_run_id,
diff --git a/src/remediations/routes.js b/src/remediations/routes.js
index 6b463b07..c12cab71 100644
--- a/src/remediations/routes.js
+++ b/src/remediations/routes.js
@@ -46,7 +46,7 @@ module.exports = function (router) {
         .get(trace, openapi('getRemediationConnectionStatus'), rbacExecute, fifi2.connection_status);
 
     router.route('/remediations/:id/playbook_runs')
-        .get(trace, openapi('listPlaybookRuns'), rbacRead, fifi.listPlaybookRuns)
+        .get(openapi('listPlaybookRuns'), rbacRead, fifi.listPlaybookRuns)
         .post(openapi('runRemediation'), rbacExecute, fifi2.executePlaybookRuns);
 
     router.route('/remediations/:id/playbook_runs/:playbook_run_id')