Merge pull request #82 from tongson/ansible_changed

Support logging Ansible changed status

const.go

@@ -10,6 +10,7 @@ const cHOSTS1 = "ssh_config"
 const cHOSTS2 = "HOSTS"
 const cLOG = "LOG"
 const cREPAIRED = "__REPAIRED__"
+const cCHANGED = "changed=true"
 const cRUN = "script"
 const cPRE = "script.pre"
 const cPOST = "script.post"

main.go

@@ -677,6 +677,23 @@ func generateHashID() string {
 	return string([]rune(uid)[:8])
 }
 
+func customResult(stdout *bufio.Scanner, stderr *bufio.Scanner) string {
+	var result string
+	for stderr.Scan() {
+		if strings.Contains(stderr.Text(), cREPAIRED) {
+			result = "repaired"
+		}
+	}
+	// It's unlikely we are gonna look for cCHANGED and cREPAIRED at the same time.
+	// cCHANGED (Ansible output) has priority.
+	for stdout.Scan() {
+		if strings.Contains(stdout.Text(), cCHANGED) {
+			result = "changed"
+		}
+	}
+	return result
+}
+
 func main() {
 	runtime.MemProfileRate = 0
 
@@ -1052,13 +1069,11 @@ func main() {
 			failed = true
 			failedLogPrint(scr, opt, out)
 		} else {
-			scanner := bufio.NewScanner(strings.NewReader(out.Stderr))
-			scanner.Split(bufio.ScanWords)
-			for scanner.Scan() {
-				if strings.Contains(scanner.Text(), cREPAIRED) {
-					result = "repaired"
-				}
-			}
+			scanner_err := bufio.NewScanner(strings.NewReader(out.Stderr))
+			scanner_out := bufio.NewScanner(strings.NewReader(out.Stdout))
+			scanner_err.Split(bufio.ScanWords)
+			scanner_out.Split(bufio.ScanWords)
+			result = customResult(scanner_out, scanner_err)
 			okLogPrint(scr, opt, out)
 		}
 	} else if _, err := strconv.ParseInt(hostname, 10, 64); err == nil {
@@ -1116,13 +1131,11 @@ func main() {
 			failed = true
 			failedLogPrint(scr, opt, out)
 		} else {
-			scanner := bufio.NewScanner(strings.NewReader(out.Stderr))
-			scanner.Split(bufio.ScanWords)
-			for scanner.Scan() {
-				if strings.Contains(scanner.Text(), cREPAIRED) {
-					result = "repaired"
-				}
-			}
+			scanner_err := bufio.NewScanner(strings.NewReader(out.Stderr))
+			scanner_out := bufio.NewScanner(strings.NewReader(out.Stdout))
+			scanner_err.Split(bufio.ScanWords)
+			scanner_out.Split(bufio.ScanWords)
+			result = customResult(scanner_out, scanner_err)
 			okLogPrint(scr, opt, out)
 		}
 	} else {
@@ -1219,13 +1232,11 @@ func main() {
 			failed = true
 			failedLogPrint(scr, opt, out)
 		} else {
-			scanner := bufio.NewScanner(strings.NewReader(out.Stderr))
-			scanner.Split(bufio.ScanWords)
-			for scanner.Scan() {
-				if strings.Contains(scanner.Text(), cREPAIRED) {
-					result = "repaired"
-				}
-			}
+			scanner_err := bufio.NewScanner(strings.NewReader(out.Stderr))
+			scanner_out := bufio.NewScanner(strings.NewReader(out.Stdout))
+			scanner_err.Split(bufio.ScanWords)
+			scanner_out.Split(bufio.ScanWords)
+			result = customResult(scanner_out, scanner_err)
 			okLogPrint(scr, opt, out)
 		}
 	}

test/changed/linebreak/script

@@ -0,0 +1,2 @@
+printf "ok\\n"
+printf "\\n\\nchanged=true\\n"

test/changed/linebreak/shell

@@ -0,0 +1 @@
+bash

test/changed/nolinebreak/script

@@ -0,0 +1,2 @@
+printf "ok\\n"
+printf "changed=true"

test/changed/nolinebreak/shell

@@ -0,0 +1 @@
+bash

test/rr_test.go

@@ -132,6 +132,28 @@ func TestRepaired(T *testing.T) {
 	})
 }
 
+func TestChanged(T *testing.T) {
+	T.Parallel()
+	T.Run("changed1", func(t *testing.T) {
+		rr := RunArg{Exe: cEXE, Args: []string{"changed:nolinebreak"}}
+		if ret, _ := rr.Run(); !ret {
+			t.Error("wants `true`")
+		}
+		if got := strings.Contains(FileRead("LOG"), "\"msg\":\"changed\""); !got {
+			t.Error("wants `true`")
+		}
+	})
+	T.Run("changed2", func(t *testing.T) {
+		rr := RunArg{Exe: cEXE, Args: []string{"changed:linebreak"}}
+		if ret, _ := rr.Run(); !ret {
+			t.Error("wants `true`")
+		}
+		if got := strings.Contains(FileRead("LOG"), "\"msg\":\"changed\""); !got {
+			t.Error("wants `true`")
+		}
+	})
+}
+
 func TestArgs(T *testing.T) {
 	T.Parallel()
 	T.Run("args1", func(t *testing.T) {