fix step execution

Author: jayeshsadhwani99

executor/playbook_result_conditional_evaluators/step_condition_evaluator.py

@@ -73,7 +73,8 @@ def evaluate(self, condition: PlaybookStepResultCondition,
 
             variable_rules: [PlaybookTaskResultRule] = rs.variable_rules
             for vr in variable_rules:
-                variable_evaluator = self._variable_rule_map.get(vr.type)
+                variable_evaluator = self._variable_rule_map.get()
+                print("WOOOOOOO 0", variable_evaluator, vr)
                 global_variable_set = next(
                     (tr.execution_global_variable_set for tr in playbook_task_execution_log), None)
                 if not variable_evaluator:

executor/playbook_result_conditional_evaluators/task_result_evalutors/global_variable_evaluator.py

@@ -1,7 +1,6 @@
 from executor.playbook_result_conditional_evaluators.task_result_evalutors.task_result_evaluator import TaskResultEvaluator
 from protos.base_pb2 import Operator
 from protos.playbooks.playbook_commons_pb2 import PlaybookTaskResultType
-from protos.playbooks.playbook_pb2 import PlaybookTaskResultRule
 from protos.playbooks.playbook_global_variable_evaluator_pb2 import GlobalVariableResultRule
 from utils.proto_utils import proto_to_dict
 from google.protobuf.struct_pb2 import Struct
@@ -26,17 +25,21 @@ def function_result_operator_threshold(value, operator, threshold):
 
 class GlobalVariabletEvaluator(TaskResultEvaluator):
 
-    def evaluate(self, rule: PlaybookTaskResultRule, global_variable_set: Struct) -> (bool, dict):
+    def evaluate(self, rule: GlobalVariableResultRule, global_variable_set: Struct) -> (bool, dict):
         if rule.type != PlaybookTaskResultType.GLOBAL_VARIABLE:
             raise ValueError("Received unsupported rule and task types")
-        global_variable_rule: GlobalVariableResultRule = rule.global_variable
-        variable_name = global_variable_rule.variable_name
-        operator = global_variable_rule.operator
-        threshold = global_variable_rule.threshold.value
 
-        global_variable_set_dict = proto_to_dict(global_variable_set)
+        print("WOOOOOOO 1", rule)
+        variable_name = rule.variable_name
+        operator = rule.operator
+        threshold = rule.threshold.value
+
+        global_variable_set_dict = proto_to_dict(global_variable_set) if global_variable_set else {}
         value = global_variable_set_dict.get(variable_name, None)
 
+        print("WOOOOOOO 2", global_variable_set_dict, value)
+
+
         if not value:
             return False, {'value': value}
 

executor/tasks.py

@@ -1,3 +1,4 @@
+import json
 import logging
 
 from celery import shared_task
@@ -103,7 +104,6 @@ def execute_playbook_step_impl(tr: TimeRange, account: Account, step: PlaybookSt
                                                              execution_global_variable_set=execution_global_variable_set))
                     continue
 
-                bulk_execution_var_values = execution_global_variable_set[bulk_task_var].split(',')
                 if not bulk_execution_var_values:
                     task_result = PlaybookTaskResult(
                         error=StringValue(value="Bulk execution variable values not found in global variables"))