2 files changed, 23 insertions, 6 deletions

diff --git a/vendor/github.com/hashicorp/terraform/helper/logging/logging.go b/vendor/github.com/hashicorp/terraform/helper/logging/logging.go
index 433cd77..6bd92f7 100644
--- a/vendor/github.com/hashicorp/terraform/helper/logging/logging.go
+++ b/vendor/github.com/hashicorp/terraform/helper/logging/logging.go
@@ -18,7 +18,7 @@ const (
         EnvLogFile = "TF_LOG_PATH" // Set to a file
 )
 
-var validLevels = []logutils.LogLevel{"TRACE", "DEBUG", "INFO", "WARN", "ERROR"}
+var ValidLevels = []logutils.LogLevel{"TRACE", "DEBUG", "INFO", "WARN", "ERROR"}
 
 // LogOutput determines where we should send logs (if anywhere) and the log level.
 func LogOutput() (logOutput io.Writer, err error) {
@@ -40,7 +40,7 @@ func LogOutput() (logOutput io.Writer, err error) {
 
         // This was the default since the beginning
         logOutput = &logutils.LevelFilter{
-                Levels:   validLevels,
+                Levels:   ValidLevels,
                 MinLevel: logutils.LogLevel(logLevel),
                 Writer:   logOutput,
         }
@@ -77,7 +77,7 @@ func LogLevel() string {
                 logLevel = strings.ToUpper(envLevel)
         } else {
                 log.Printf("[WARN] Invalid log level: %q. Defaulting to level: TRACE. Valid levels are: %+v",
-                        envLevel, validLevels)
+                        envLevel, ValidLevels)
         }
 
         return logLevel
@@ -90,7 +90,7 @@ func IsDebugOrHigher() bool {
 }
 
 func isValidLogLevel(level string) bool {
-        for _, l := range validLevels {
+        for _, l := range ValidLevels {
                 if strings.ToUpper(level) == string(l) {
                         return true
                 }
diff --git a/vendor/github.com/hashicorp/terraform/helper/logging/transport.go b/vendor/github.com/hashicorp/terraform/helper/logging/transport.go
index 4477924..bddabe6 100644
--- a/vendor/github.com/hashicorp/terraform/helper/logging/transport.go
+++ b/vendor/github.com/hashicorp/terraform/helper/logging/transport.go
@@ -1,9 +1,12 @@
 package logging
 
 import (
+        "bytes"
+        "encoding/json"
         "log"
         "net/http"
         "net/http/httputil"
+        "strings"
 )
 
 type transport struct {
@@ -15,7 +18,7 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
         if IsDebugOrHigher() {
                 reqData, err := httputil.DumpRequestOut(req, true)
                 if err == nil {
-                        log.Printf("[DEBUG] "+logReqMsg, t.name, string(reqData))
+                        log.Printf("[DEBUG] "+logReqMsg, t.name, prettyPrintJsonLines(reqData))
                 } else {
                         log.Printf("[ERROR] %s API Request error: %#v", t.name, err)
                 }
@@ -29,7 +32,7 @@ func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
         if IsDebugOrHigher() {
                 respData, err := httputil.DumpResponse(resp, true)
                 if err == nil {
-                        log.Printf("[DEBUG] "+logRespMsg, t.name, string(respData))
+                        log.Printf("[DEBUG] "+logRespMsg, t.name, prettyPrintJsonLines(respData))
                 } else {
                         log.Printf("[ERROR] %s API Response error: %#v", t.name, err)
                 }
@@ -42,6 +45,20 @@ func NewTransport(name string, t http.RoundTripper) *transport {
         return &transport{name, t}
 }
 
+// prettyPrintJsonLines iterates through a []byte line-by-line,
+// transforming any lines that are complete json into pretty-printed json.
+func prettyPrintJsonLines(b []byte) string {
+        parts := strings.Split(string(b), "\n")
+        for i, p := range parts {
+                if b := []byte(p); json.Valid(b) {
+                        var out bytes.Buffer
+                        json.Indent(&out, b, "", " ")
+                        parts[i] = out.String()
+                }
+        }
+        return strings.Join(parts, "\n")
+}
+
 const logReqMsg = `%s API Request Details:
 ---[ REQUEST ]---------------------------------------
 %s