Merge pull request #16 from chentao1596/go-style-mistakes

Fix some go style mistakes about fmt.Errorf

cmd/sidecar-e2e/main.go

@@ -126,7 +126,7 @@ func waitForTcpOrExit(cmd *exec.Cmd, endpoint string) error {
 			// Check to see that the process has not died early.
 			select {
 			case err := <-exitChan:
-				return true, fmt.Errorf("Process died: %v", err)
+				return true, fmt.Errorf("process died: %v", err)
 			default:
 			}
 
@@ -400,7 +400,7 @@ func (t *test) runDig() {
 		if err == nil {
 			t.digOutput += string(output)
 		} else {
-			t.errors = append(t.errors, fmt.Errorf("Error running dig: %v", err))
+			t.errors = append(t.errors, fmt.Errorf("error running dig: %v", err))
 		}
 	}
 }
@@ -517,6 +517,6 @@ func main() {
 		break
 
 	default:
-		log.Fatal(fmt.Errorf("Invalid --mode: %v", opts.mode))
+		log.Fatal(fmt.Errorf("invalid --mode: %v", opts.mode))
 	}
 }

pkg/dnsmasq/dnsmasq.go

@@ -105,14 +105,14 @@ func (mc *metricsClient) getSingleMetric(name string) (int64, error) {
 	}
 
 	if len(in.Answer) != 1 {
-		return 0, fmt.Errorf("Invalid number of Answer records for %s: %d",
+		return 0, fmt.Errorf("invalid number of Answer records for %s: %d",
 			name, len(in.Answer))
 	}
 
 	if t, ok := in.Answer[0].(*dns.TXT); ok {
 		glog.V(4).Infof("Got valid TXT response %+v for %s", t, name)
 		if len(t.Txt) != 1 {
-			return 0, fmt.Errorf("Invalid number of TXT records for %s: %d",
+			return 0, fmt.Errorf("invalid number of TXT records for %s: %d",
 				name, len(t.Txt))
 		}
 
@@ -124,5 +124,5 @@ func (mc *metricsClient) getSingleMetric(name string) (int64, error) {
 		return value, nil
 	}
 
-	return 0, fmt.Errorf("missing txt record for %s", name)
+	return 0, fmt.Errorf("missing TXT record for %s", name)
 }