From 8173cd25bb69b4f0be7bf1a15105d5b1d0c08860 Mon Sep 17 00:00:00 2001
From: Martin Atkins <mart@degeneration.co.uk>
Date: Sun, 11 Oct 2015 10:45:33 -0700
Subject: [PATCH] Demote some log lines to DEBUG.

Now that we support log line filtering (as of 0090c063) it's good to be
a bit more fussy about what log levels are assigned to different things.

Here we make a few things that are implementation details log as DEBUG,
and prevent spurious errors from EvalValidateCount where it was returning
an empty EvalValidateError rather than nil when everything was okay.
---
 config_unix.go             | 2 +-
 plugin/client.go           | 4 ++--
 terraform/context.go       | 2 +-
 terraform/eval_validate.go | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config_unix.go b/config_unix.go
index c51ea5ec4..69d76278a 100644
--- a/config_unix.go
+++ b/config_unix.go
@@ -33,7 +33,7 @@ func configDir() (string, error) {
 func homeDir() (string, error) {
 	// First prefer the HOME environmental variable
 	if home := os.Getenv("HOME"); home != "" {
-		log.Printf("Detected home directory from env var: %s", home)
+		log.Printf("[DEBUG] Detected home directory from env var: %s", home)
 		return home, nil
 	}
 
diff --git a/plugin/client.go b/plugin/client.go
index be54526c7..8a3b03fc0 100644
--- a/plugin/client.go
+++ b/plugin/client.go
@@ -88,7 +88,7 @@ func CleanupClients() {
 		}(client)
 	}
 
-	log.Println("waiting for all plugin processes to complete...")
+	log.Println("[DEBUG] waiting for all plugin processes to complete...")
 	wg.Wait()
 }
 
@@ -326,7 +326,7 @@ func (c *Client) logStderr(r io.Reader) {
 			c.config.Stderr.Write([]byte(line))
 
 			line = strings.TrimRightFunc(line, unicode.IsSpace)
-			log.Printf("%s: %s", filepath.Base(c.config.Cmd.Path), line)
+			log.Printf("[DEBUG] %s: %s", filepath.Base(c.config.Cmd.Path), line)
 		}
 
 		if err == io.EOF {
diff --git a/terraform/context.go b/terraform/context.go
index 0f567ddf2..d91a85176 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -513,7 +513,7 @@ func (c *Context) releaseRun(ch chan<- struct{}) {
 func (c *Context) walk(
 	graph *Graph, operation walkOperation) (*ContextGraphWalker, error) {
 	// Walk the graph
-	log.Printf("[INFO] Starting graph walk: %s", operation.String())
+	log.Printf("[DEBUG] Starting graph walk: %s", operation.String())
 	walker := &ContextGraphWalker{Context: c, Operation: operation}
 	return walker, graph.Walk(walker)
 }
diff --git a/terraform/eval_validate.go b/terraform/eval_validate.go
index e808240a0..533788230 100644
--- a/terraform/eval_validate.go
+++ b/terraform/eval_validate.go
@@ -49,9 +49,12 @@ func (n *EvalValidateCount) Eval(ctx EvalContext) (interface{}, error) {
 	}
 
 RETURN:
-	return nil, &EvalValidateError{
-		Errors: errs,
+	if len(errs) != 0 {
+		err = &EvalValidateError{
+			Errors: errs,
+		}
 	}
+	return nil, err
 }
 
 // EvalValidateProvider is an EvalNode implementation that validates