Implement log collection for errored runners

Author: 0x2b3bfa0

iterative/resource_runner.go

@@ -204,8 +204,10 @@ func resourceRunnerCreate(ctx context.Context, d *schema.ResourceData, m interfa
 
 		if logError != nil {
 			return resource.RetryableError(fmt.Errorf("Waiting for the machine to accept connections... %s", logError))
-		} else if !utils.IsReady(logEvents) {
-			return resource.RetryableError(fmt.Errorf("Waiting for the runner to be ready... %s", logError))
+		} else if utils.HasStatus(logEvents, "terminated") {
+			return resource.NonRetryableError(fmt.Errorf("Failed to launch the runner!"))
+		} else if !utils.HasStatus(logEvents, "ready") {
+			return resource.RetryableError(fmt.Errorf("Waiting for the runner to be ready..."))
 		}
 
 		return nil // The runner is ready.

iterative/utils/runner.go

@@ -22,16 +22,16 @@ func ParseLogEvent(logEvent string) (LogEvent, error) {
 	return result, err
 }
 
-// IsReady checks whether a runner is ready or not by parsing the JSONL records from the logs it produces.
-func IsReady(logs string) bool {
+// HasStatus checks whether a runner is has reported the given status or not by parsing the JSONL records from the logs it produces
+func HasStatus(logs string, status string) bool {
 	scanner := bufio.NewScanner(strings.NewReader(logs))
 	for scanner.Scan() {
 		line := scanner.Text()
 		// Extract the JSON between curly braces from the log line.
 		record := regexp.MustCompile(`\{.+\}`).Find([]byte(line))
 		// Try to parse the retrieved JSON string into a LogEvent structure.
 		if event, err := ParseLogEvent(string(record)); err == nil {
-			if event.Status == "ready" {
+			if event.Status == status {
 				return true
 			}
 		}

iterative/utils/runner_test.go

@@ -12,14 +12,14 @@ func TestReadinessCheck(t *testing.T) {
 			-- Logs begin at Wed 2021-01-20 00:25:37 UTC, end at Fri 2021-02-26 15:37:56 UTC. --
 			Feb 26 15:37:20 ip-172-31-6-188 cml.sh[2203]: {"level":"info","time":"···","repo":"···","status":"ready"}
 		`
-		assert.True(t, IsReady(logString))
+		assert.True(t, HasStatus(logString, "ready"))
 	})
 
 	t.Run("Runner log not containing a readiness message should not be considered ready", func(t *testing.T) {
 		logString := `
 			-- Logs begin at Wed 2021-01-20 00:25:37 UTC, end at Fri 2021-02-26 15:37:56 UTC. --
 			Feb 26 15:37:20 ip-172-31-6-188 cml.sh[2203]: {"level":"info","time":"···","repo":"···"}
 		`
-		assert.False(t, IsReady(logString))
+		assert.False(t, HasStatus(logString, "ready"))
 	})
 }