add check for valid host

Host validity is now verified before building the ansible-runner command, thus any operation on 'host' property is done on a non-null object
michalskrivanek · Aug 4, 2022 · f7561f9 · f7561f9
1 parent 6dc9bf8
commit f7561f9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/...modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java b/...modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java
@@ -146,6 +146,9 @@ public AnsibleReturnValue runCommand(AnsibleCommandConfig command,
     }
 
     public AnsibleReturnValue runCommand(AnsibleCommandConfig commandConfig, int timeout, BiConsumer<String, String> fn, boolean async) {
+        if (commandConfig.host() == null) {
+            throw new AnsibleRunnerCallException("Invalid host");
+        }
         if (timeout <= 0) {
             timeout = EngineLocalConfig.getInstance().getInteger("ANSIBLE_PLAYBOOK_EXEC_DEFAULT_TIMEOUT");
         }
@@ -195,12 +198,6 @@ public AnsibleReturnValue runCommand(AnsibleCommandConfig commandConfig, int tim
     }
 
     private AuditLogable createAuditLogable(AnsibleCommandConfig command, String taskName) {
-        if (command.host() == null) {
-            return AuditLogableImpl.createEvent(
-                    command.correlationId(),
-                    Map.of("Message", taskName, "PlayAction", command.playAction())
-            );
-        }
         return AuditLogableImpl.createHostEvent(
                 command.host(),
                 command.correlationId(),