bug fix: previous commit introduces a bug

antidote-cis

@@ -197,33 +197,31 @@ function cis_get_job_status () {
     jobid="$1"
     getjobhierarchy_apires=`curl_wrapped "https://beta-cps.trafficmanager.net/cis.client.svc/Public/$cis_namespace/GenericJob/$jobid/GetJobHierarchy"` && 
     subworkflows_text=`echo "$getjobhierarchy_apires" | json2table DisplayName,Id,DisplayStatus,JobType -p` || ! echo2 "API GetJobHierarchy failed. Server says '$getjobhierarchy_apires'" || return $?
-        callstack_formatted=`echo "$getjobhierarchy_apires" | json2table DisplayName,Id,DisplayStatus | grep -E '( InProgress )|( PlanError )|( Internal Error )'` # Ignore failure because it's only useful in InProgress and PlanError state. 
-    _mdcode='```'
-
-    echo "DEBUG: $subworkflows_text"
-    if planerror_callstack=`echo "$subworkflows_text" | grep -F '|PlanError|'`; then
-        # RemoteJob may have PlanError in subworkflow. The top-level workflow is still InProgress but bottom workflow got PlanError. 
-        [[ -z "$callstack_formatted" ]] && echo2 "API GetJobHierarchy result misinterpreted. No workflow in stat InProgress or PlanError or InternalError. This is an unexpected non-fatal error and I did not catch it. " && return 2
-        [[ -z $ANTIDOTE_JOBSTAT_MARKDOWN ]] &&
-            echo2 -e ">>> CIS reported PlanError:\nCallstack: \n$callstack_formatted\nCIS Log: https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid" ||
-            echo2 -e "## CIS reported PlanError\n\n[View CIS Log](https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid)\n\n### Callstack\n\n$_mdcode\n$callstack_formatted\n$_mdcode\n"
-        echo "Failed" && return 0
-    fi
-    if planerror_callstack=`echo "$subworkflows_text" | grep -F '|Internal Error|'`; then
-        # RemoteJob may have PlanError in subworkflow. The top-level workflow is still InProgress but bottom workflow got PlanError. 
-        [[ -z "$callstack_formatted" ]] && echo2 "API GetJobHierarchy result misinterpreted. No workflow in stat InProgress or PlanError or InternalError. This is an unexpected non-fatal error and I did not catch it. " && return 2
-        [[ -z $ANTIDOTE_JOBSTAT_MARKDOWN ]] &&
-            echo2 -e ">>> CIS reported Internal Error:\nCallstack: \n$callstack_formatted\nCIS Log: https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid" ||
-            echo2 -e "## CIS reported Internal Error\n\n[View CIS Log](https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid)\n\n### Callstack\n\n$_mdcode\n$callstack_formatted\n$_mdcode\n"
-        echo "Failed" && return 0
-    fi
+    _ts='```'
+
+    # RemoteJob may have some known bad states in subworkflow. The top-level workflow is still InProgress but bottom workflow has boomed. 
+    bad_states=(
+        'PlanError'
+        'Internl Error'
+        'Aborted'
+    )
+    callstack_in_email=`echo "$getjobhierarchy_apires" | json2table DisplayName,Id,DisplayStatus | grep -E '( InProgress )|( PlanError )|( Internal Error )|( Aborted )'`
+    for bad_state in "${bad_states[@]}"; do
+        if planerror_callstack=`echo "$subworkflows_text" | grep -F "|$bad_state|"`; then
+            [[ -z "$callstack_in_email" ]] && echo2 "API GetJobHierarchy result misinterpreted. No workflow in state $bad_state. This is an unexpected non-fatal error and I did not catch it. " && return 2
+            [[ -z $ANTIDOTE_JOBSTAT_MARKDOWN ]] &&
+                echo2 -e ">>> CIS reported $bad_state:\nCallstack: \n$callstack_in_email\nCIS Log: https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid" ||
+                echo2 -e "## CIS reported $bad_state\n\n[View CIS Log](https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid)\n\n### Callstack\n\n$_ts\n$callstack_in_email\n$_ts\n"
+            echo "Failed" && return 0
+        fi
+    done
     if inprogress_callstack=`echo "$subworkflows_text" | grep -F '|InProgress|'`; then
         # There's some workflow in-progress. It maybe inprogress or blocked. 
         # Note that, there may be multiple workflows in "InProgress" state. In this scenario, 
         #   the last "InProgress" workflow is the bottom sub-workflow which we're interested in. 
         #   We just check the last sub-workflow, to see if there's any "Blocked" activity. 
 
-        [[ -z "$callstack_formatted" ]] && echo2 "API GetJobHierarchy result misinterpreted. No workflow in stat InProgress or PlanError or InternalError. This is an unexpected non-fatal error and I did not catch it. " && return 2
+        [[ -z "$callstack_in_email" ]] && echo2 "API GetJobHierarchy result misinterpreted. No workflow in stat InProgress. This is an unexpected non-fatal error and I did not catch it. " && return 2
 
         # Remote workflow may have different namespace, so we need to get bottom_subworkflow_namespace. 
         bottom_subworkflow_id=`echo "$inprogress_callstack" | tail -n 1 | cut -d '|' -f 3` && 
@@ -234,8 +232,8 @@ function cis_get_job_status () {
             # I found some activity blocked! Show incident and exit. 
             icm_link=`echo "$bottom_wf_pagedtasks_apires" | json2table Data/Tasks/Incidents/ExternalLink -p | sed 's/VAL: //g' | tr -d '|'` || icm_link=""
             [[ -z $ANTIDOTE_JOBSTAT_MARKDOWN ]] &&
-                echo2 -e ">>> Incident detected:\nCallstack: \n$callstack_formatted\nActivity: \n$bottom_wf_activities\nCIS Log: https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid\nICM Link: $icm_link" ||
-                echo2 -e "## Incident detected\n\n[View CIS Log](https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid)\n\n### Callstack\n\n$_mdcode\n$callstack_formatted\n$_mdcode\n\n### Activity\n\n$_mdcode\n$bottom_wf_activities\n$_mdcode\n[View ICM Incident]($icm_link)"
+                echo2 -e ">>> Incident detected:\nCallstack: \n$callstack_in_email\nActivity: \n$bottom_wf_activities\nCIS Log: https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid\nICM Link: $icm_link" ||
+                echo2 -e "## Incident detected\n\n[View CIS Log](https://beta-cps.trafficmanager.net/Public/$cis_namespace/JobDetails/$jobid)\n\n### Callstack\n\n$_ts\n$callstack_in_email\n$_ts\n\n### Activity\n\n$_ts\n$bottom_wf_activities\n$_ts\n[View ICM Incident]($icm_link)"
             echo "Blocked" && return 0
         fi
 
@@ -357,7 +355,7 @@ function subcmd_xmldownload () {
 }
 
 # Initialization
-antidote_version="1.1.12"
+antidote_version="1.1.12-2"
 subcmd="$1"
 shift