Unify error messages formatting (#51)

medzin · web-flow · commit 20fae7b01e7a · 2017-12-12T11:50:06.000+01:00
diff --git a/cert.go b/cert.go
@@ -18,15 +18,15 @@ func GetCertFromEnvVariables(env []string) (*x509.Certificate, error) {
 			p, _ := pem.Decode(pemEncoded)
 
 			if p == nil {
-				return nil, errors.New("Missing certificate data")
+				return nil, errors.New("missing certificate data")
 			}
 
 			cert, err := x509.ParseCertificate(p.Bytes)
 			if err != nil {
-				return nil, fmt.Errorf("Certificate is invalid: %s", err)
+				return nil, fmt.Errorf("certificate is invalid: %s", err)
 			}
 			return cert, nil
 		}
 	}
-	return nil, errors.New("Missing certificate")
+	return nil, errors.New("missing certificate")
 }
diff --git a/cert_test.go b/cert_test.go
@@ -13,12 +13,12 @@ func TestIfReturnsErrorWhenNoValidCertificateFound(t *testing.T) {
 		err string
 		env []string
 	}{
-		{"Missing certificate", nil},
-		{"Missing certificate", []string{
+		{"missing certificate", nil},
+		{"missing certificate", []string{
 			"ALLEGRO_PKI_SENSITIVE_VAR=xxx",
 			"NOT_SENSITIVE=xxx",
 		}},
-		{"Missing certificate data", []string{
+		{"missing certificate data", []string{
 			"ALLEGRO_PKI_SENSITIVE_VAR=xxx",
 			"CERTIFICATE=xxx",
 			"NOT_SENSITIVE=xxx",
diff --git a/cmd/executor/main.go b/cmd/executor/main.go
@@ -49,7 +49,7 @@ func initSentry(config executor.Config) error {
 
 	environment, err := runenv.Environment()
 	if err != nil {
-		return fmt.Errorf("Unable to determine runtime environment: %s", err)
+		return fmt.Errorf("unable to determine runtime environment: %s", err)
 	}
 
 	if environment == runenv.LocalEnv {
@@ -60,7 +60,7 @@ func initSentry(config executor.Config) error {
 
 	client, err := raven.New(config.SentryDSN)
 	if err != nil {
-		return fmt.Errorf("Unable to setup raven client: %s", err)
+		return fmt.Errorf("unable to setup raven client: %s", err)
 	}
 	client.SetRelease(Version)
 	client.SetEnvironment(string(environment))
@@ -71,7 +71,7 @@ func initSentry(config executor.Config) error {
 		log.ErrorLevel,
 	})
 	if err != nil {
-		return fmt.Errorf("Unable to setup sentry hook for logger: %s", err)
+		return fmt.Errorf("unable to setup sentry hook for logger: %s", err)
 	}
 	sentryHook.Timeout = time.Second
 	log.AddHook(sentryHook)
diff --git a/executor.go b/executor.go
@@ -415,7 +415,7 @@ func (e *Executor) createOptionsForLogstashServiceLogScrapping(taskInfo mesos.Ta
 func (e *Executor) checkCert(cert *x509.Certificate) error {
 	certDuration := e.clock.Until(cert.NotAfter) - e.random.Duration(e.config.RandomExpirationRange)
 	if certDuration <= 0 {
-		return fmt.Errorf("Certificate valid period <= 0. Certificate invalid after %s", cert.NotAfter)
+		return fmt.Errorf("certificate valid period <= 0 - certificate invalid after %s", cert.NotAfter)
 	}
 
 	log.WithField("CertificateExpireDate", cert.NotAfter).Infof(
diff --git a/executor_test.go b/executor_test.go
@@ -58,7 +58,7 @@ func TestIfLaunchesCommandAndSendsStateUpdatesWhenTaskRequireCertButNoCertIsGive
 		mock.AnythingOfType("mesos.TaskID"),
 		mesos.TASK_FAILED,
 		mock.MatchedBy(func(info state.OptionalInfo) bool {
-			return "Cannot launch task: problem with certificate: Missing certificate" == *info.Message
+			return "Cannot launch task: problem with certificate: missing certificate" == *info.Message
 		})).Once()
 
 	exec := new(Executor)
@@ -303,7 +303,7 @@ func TestCertificateCheckReturnErrorIfKillWillBeScheduledInThePast(t *testing.T)
 
 	err := exec.checkCert(fakeCert)
 
-	assert.EqualError(t, err, "Certificate valid period <= 0. Certificate invalid after 0001-01-01 00:00:00 +0000 UTC")
+	assert.EqualError(t, err, "certificate valid period <= 0 - certificate invalid after 0001-01-01 00:00:00 +0000 UTC")
 	random.AssertExpectations(t)
 	clock.AssertExpectations(t)
 }
diff --git a/health_checker.go b/health_checker.go
@@ -100,12 +100,12 @@ func newHealthCheck(check mesos.HealthCheck) healthCheckFunction {
 		return func() error { return tcpHealthCheck(check) }
 	}
 
-	return func() error { return fmt.Errorf("Unknown health check type: %s", check.GetType()) }
+	return func() error { return fmt.Errorf("unknown health check type: %s", check.GetType()) }
 }
 
 func commandHealthCheck(checkDefinition mesos.HealthCheck) error {
 	if checkDefinition.GetCommand() == nil {
-		return errors.New("Command health check not defined")
+		return errors.New("command health check not defined")
 	}
 
 	timeout := mesosutils.Duration(checkDefinition.GetTimeoutSeconds())
@@ -144,9 +144,9 @@ func commandHealthCheck(checkDefinition mesos.HealthCheck) error {
 	if err := cmd.Run(); err != nil {
 		if ctx.Err() == context.DeadlineExceeded {
 			log.WithError(ctx.Err()).Info("Command health check timed out")
-			return fmt.Errorf("Command health check timed out after %s", timeout)
+			return fmt.Errorf("command health check timed out after %s", timeout)
 		}
-		return fmt.Errorf("Command health check errored: %s", err)
+		return fmt.Errorf("command health check errored: %s", err)
 	}
 	return nil
 }
@@ -183,7 +183,7 @@ func httpHealthCheck(checkDefinition mesos.HealthCheck) error {
 
 	response, err := client.Get(checkURL.String())
 	if err != nil {
-		return fmt.Errorf("Health check error: %s", err)
+		return fmt.Errorf("health check error: %s", err)
 	}
 	defer func() {
 		if err := response.Body.Close(); err != nil {
@@ -194,7 +194,7 @@ func httpHealthCheck(checkDefinition mesos.HealthCheck) error {
 	// Default executors treat return codes between 200 and 399 as success
 	// See: https://github.com/apache/mesos/blob/1.1.3/include/mesos/mesos.proto#L355-L357
 	if response.StatusCode < 200 || response.StatusCode >= 400 {
-		return fmt.Errorf("Health check error: received status code %d, but expected codes between 200 and 399", response.StatusCode)
+		return fmt.Errorf("health check error: received status code %d, but expected codes between 200 and 399", response.StatusCode)
 	}
 
 	return nil
diff --git a/health_checker_test.go b/health_checker_test.go
@@ -144,30 +144,30 @@ func TestNewHealthCheckShouldReturnNilWhenCheckPasses(t *testing.T) {
 func TestNewHealthCheckShouldReturnErrorOnUnknownCheck(t *testing.T) {
 	healthCheck := newHealthCheck(mesos.HealthCheck{})
 	err := healthCheck()
-	assert.EqualError(t, err, "Unknown health check type: UNKNOWN")
+	assert.EqualError(t, err, "unknown health check type: UNKNOWN")
 }
 
 func TestNewHealthCheckShouldReturnErrorOnUdefinedCommand(t *testing.T) {
 	commandType := mesos.HealthCheck_COMMAND
 	healthCheck := newHealthCheck(mesos.HealthCheck{Type: &commandType})
 	err := healthCheck()
-	assert.EqualError(t, err, "Unknown health check type: COMMAND")
+	assert.EqualError(t, err, "unknown health check type: COMMAND")
 }
 
 func TestCommandHealthCheckShouldReturnErrorOnEmptyCheck(t *testing.T) {
 	commandType := mesos.HealthCheck_COMMAND
 	check := mesos.HealthCheck{Type: &commandType}
 
 	err := commandHealthCheck(check)
-	assert.EqualError(t, err, "Command health check not defined")
+	assert.EqualError(t, err, "command health check not defined")
 }
 
 func TestCommandHealthCheckShouldReturnErrorOnInvalidCommand(t *testing.T) {
 	invalidCommand := "false"
 	command := mesos.CommandInfo{Value: &invalidCommand}
 	check := mesos.HealthCheck{Command: &command}
 	err := commandHealthCheck(check)
-	assert.EqualError(t, err, "Command health check errored: exit status 1")
+	assert.EqualError(t, err, "command health check errored: exit status 1")
 }
 
 func TestCommandHealthCheckShouldReturnErrorOnInvalidCheck(t *testing.T) {
@@ -193,7 +193,7 @@ func TestCommandHealthCheckShouldReturnErrorOnInvalidCommandForNonShell(t *testi
 	check := mesos.HealthCheck{Type: &commandType, Command: &command}
 
 	err := commandHealthCheck(check)
-	assert.EqualError(t, err, "Command health check errored: exec: \"(true)\": executable file not found in $PATH")
+	assert.EqualError(t, err, "command health check errored: exec: \"(true)\": executable file not found in $PATH")
 }
 
 func TestCommandHealthCheckShouldReturnErrorOnAfterTimeout(t *testing.T) {
@@ -203,7 +203,7 @@ func TestCommandHealthCheckShouldReturnErrorOnAfterTimeout(t *testing.T) {
 	timeout := 0.0
 	check := mesos.HealthCheck{Command: &command, TimeoutSeconds: &timeout}
 	err := commandHealthCheck(check)
-	assert.EqualError(t, err, "Command health check timed out after 0s")
+	assert.EqualError(t, err, "command health check timed out after 0s")
 }
 
 func TestIfTCPHealthCheckPassesWhenPortIsOpen(t *testing.T) {
@@ -278,7 +278,7 @@ func TestIfHTTPHealthCheckFailsWhenRequestIsInvalid(t *testing.T) {
 
 	err := httpHealthCheck(check)
 
-	assert.EqualError(t, err, "Health check error: received status code 400, but expected codes between 200 and 399")
+	assert.EqualError(t, err, "health check error: received status code 400, but expected codes between 200 and 399")
 }
 
 func TestIfHTTPHealthCheckFailsWhenServiceIsUnavailable(t *testing.T) {
@@ -290,7 +290,7 @@ func TestIfHTTPHealthCheckFailsWhenServiceIsUnavailable(t *testing.T) {
 
 	err := httpHealthCheck(check)
 
-	assert.EqualError(t, err, "Health check error: received status code 503, but expected codes between 200 and 399")
+	assert.EqualError(t, err, "health check error: received status code 503, but expected codes between 200 and 399")
 }
 
 func TestIfHTTPHealthCheckFailsWhenNoServiceIsListeningOnConfiguredPort(t *testing.T) {
diff --git a/hook/vaas/client.go b/hook/vaas/client.go
@@ -138,7 +138,7 @@ func (c *defaultClient) FindDirectorID(name string) (int, error) {
 		}
 	}
 
-	return 0, fmt.Errorf("No Director with name %s found", name)
+	return 0, fmt.Errorf("no Director with name %s found", name)
 }
 
 // AddBackend adds backend in VaaS director.
@@ -202,7 +202,7 @@ func (c *defaultClient) GetDC(name string) (*DC, error) {
 		}
 	}
 
-	return nil, fmt.Errorf("No DC with name %s found", name)
+	return nil, fmt.Errorf("no DC with name %s found", name)
 }
 
 func (c *defaultClient) TaskStatus(task *Task) error {
diff --git a/hook/vaas/hook.go b/hook/vaas/hook.go
@@ -112,7 +112,7 @@ func (sh *Hook) RegisterBackend(taskInfo mesosutils.TaskInfo) error {
 	if taskInfo.GetLabelValue(vaasAsyncLabelKey) == "true" {
 		taskURI, err := sh.client.AddBackend(backend, true)
 		if err != nil {
-			return fmt.Errorf("Could not register with VaaS director: %s", err)
+			return fmt.Errorf("could not register with VaaS director: %s", err)
 		}
 		log.Info("Waiting for successful Varnish configuration change...")
 		sh.backendID = backend.ID
@@ -123,7 +123,7 @@ func (sh *Hook) RegisterBackend(taskInfo mesosutils.TaskInfo) error {
 		}
 		err = sh.watchTaskStatus(task)
 		if err != nil {
-			return fmt.Errorf("Could not register with VaaS director: %s", err)
+			return fmt.Errorf("could not register with VaaS director: %s", err)
 		}
 	} else {
 		_, err := sh.client.AddBackend(backend, false)
@@ -187,7 +187,7 @@ func (sh *Hook) watchTaskStatus(task *Task) (err error) {
 
 			switch task.Status {
 			case StatusFailure:
-				return fmt.Errorf("Registration in VaaS failed: %s", err)
+				return fmt.Errorf("registration in VaaS failed: %s", err)
 			case StatusSuccess:
 				log.Info("Registered backend in VaaS")
 				return nil
diff --git a/mesosutils/taskinfo.go b/mesosutils/taskinfo.go
@@ -111,7 +111,7 @@ func (h TaskInfo) GetWeight() (int, error) {
 			return strconv.Atoi(strings.TrimPrefix(tags, weightPrefix))
 		}
 	}
-	return 0, fmt.Errorf("No weight defined")
+	return 0, fmt.Errorf("no weight defined")
 }
 
 // GetPorts returns a list of task ports
diff --git a/metrics/system.go b/metrics/system.go
@@ -16,7 +16,7 @@ func CPUTime() (float64, error) {
 	p := getExecutorProcess()
 	t, err := p.Times()
 	if err != nil {
-		return 0, fmt.Errorf("Unable to get CPU times: %s", err)
+		return 0, fmt.Errorf("unable to get CPU times: %s", err)
 	}
 
 	// We cannot use cpu.TimesStat struct Total function because it sums all values -
diff --git a/os/kill.go b/os/kill.go
@@ -24,15 +24,15 @@ func KillTree(signal syscall.Signal, pid int32) error {
 	curPid := syscall.Getpid()
 	curPgid, err := syscall.Getpgid(curPid)
 	if err != nil {
-		return fmt.Errorf("Error getting current process pgid: %s", err)
+		return fmt.Errorf("error getting current process pgid: %s", err)
 	}
 
 	var pgids []int
 	pgidsSeen := map[int]bool{}
 	for _, proc := range processes {
 		pgid, err := syscall.Getpgid(int(proc.Pid))
 		if err != nil {
-			return fmt.Errorf("Error getting child process pgid: %s", err)
+			return fmt.Errorf("error getting child process pgid: %s", err)
 		}
 		if pgid == curPgid {
 			continue
diff --git a/runenv/hostname_unix.go b/runenv/hostname_unix.go
@@ -36,7 +36,7 @@ func (execHostnameFqdn) Run() (string, error) {
 	err := cmd.Run()
 
 	if err != nil {
-		return "", fmt.Errorf("Couldn't run 'hostname -f': %s", err)
+		return "", fmt.Errorf("couldn't run 'hostname -f': %s", err)
 	}
 
 	return out.String(), nil
diff --git a/runenv/runenv.go b/runenv/runenv.go
@@ -109,5 +109,5 @@ func getEnvVarIfSet(name string) (string, error) {
 	if os.Getenv(name) != "" {
 		return os.Getenv(name), nil
 	}
-	return "", fmt.Errorf("No %s environment variable set", name)
+	return "", fmt.Errorf("no %s environment variable set", name)
 }
diff --git a/state/state.go b/state/state.go
@@ -119,7 +119,7 @@ func (u *bufferedUpdater) Wait(timeout time.Duration) error {
 		if len(u.buffer) == 0 && len(u.GetUnacknowledged()) == 0 {
 			return nil
 		} else if time.Since(start) >= timeout {
-			return fmt.Errorf("Timeout during state update buffer cleaning, %d events remained, %d events unacknowledged",
+			return fmt.Errorf("timeout during state update buffer cleaning, %d events remained, %d events unacknowledged",
 				len(u.buffer), len(u.GetUnacknowledged()))
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ func GetCertFromEnvVariables(env []string) (*x509.Certificate, error) {`
`18`	`18`	`p, _ := pem.Decode(pemEncoded)`
`19`	`19`
`20`	`20`	`if p == nil {`
`21`		`- return nil, errors.New("Missing certificate data")`
	`21`	`+ return nil, errors.New("missing certificate data")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`cert, err := x509.ParseCertificate(p.Bytes)`
`25`	`25`	`if err != nil {`
`26`		`- return nil, fmt.Errorf("Certificate is invalid: %s", err)`
	`26`	`+ return nil, fmt.Errorf("certificate is invalid: %s", err)`
`27`	`27`	`}`
`28`	`28`	`return cert, nil`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`- return nil, errors.New("Missing certificate")`
	`31`	`+ return nil, errors.New("missing certificate")`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ func (e *Executor) createOptionsForLogstashServiceLogScrapping(taskInfo mesos.Ta`
`415`	`415`	`func (e Executor) checkCert(cert x509.Certificate) error {`
`416`	`416`	`certDuration := e.clock.Until(cert.NotAfter) - e.random.Duration(e.config.RandomExpirationRange)`
`417`	`417`	`if certDuration <= 0 {`
`418`		`- return fmt.Errorf("Certificate valid period <= 0. Certificate invalid after %s", cert.NotAfter)`
	`418`	`+ return fmt.Errorf("certificate valid period <= 0 - certificate invalid after %s", cert.NotAfter)`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`log.WithField("CertificateExpireDate", cert.NotAfter).Infof(`
Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,12 @@ func newHealthCheck(check mesos.HealthCheck) healthCheckFunction {`
`100`	`100`	`return func() error { return tcpHealthCheck(check) }`
`101`	`101`	`}`
`102`	`102`
`103`		`- return func() error { return fmt.Errorf("Unknown health check type: %s", check.GetType()) }`
	`103`	`+ return func() error { return fmt.Errorf("unknown health check type: %s", check.GetType()) }`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func commandHealthCheck(checkDefinition mesos.HealthCheck) error {`
`107`	`107`	`if checkDefinition.GetCommand() == nil {`
`108`		`- return errors.New("Command health check not defined")`
	`108`	`+ return errors.New("command health check not defined")`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`timeout := mesosutils.Duration(checkDefinition.GetTimeoutSeconds())`
`@@ -144,9 +144,9 @@ func commandHealthCheck(checkDefinition mesos.HealthCheck) error {`
`144`	`144`	`if err := cmd.Run(); err != nil {`
`145`	`145`	`if ctx.Err() == context.DeadlineExceeded {`
`146`	`146`	`log.WithError(ctx.Err()).Info("Command health check timed out")`
`147`		`- return fmt.Errorf("Command health check timed out after %s", timeout)`
	`147`	`+ return fmt.Errorf("command health check timed out after %s", timeout)`
`148`	`148`	`}`
`149`		`- return fmt.Errorf("Command health check errored: %s", err)`
	`149`	`+ return fmt.Errorf("command health check errored: %s", err)`
`150`	`150`	`}`
`151`	`151`	`return nil`
`152`	`152`	`}`
`@@ -183,7 +183,7 @@ func httpHealthCheck(checkDefinition mesos.HealthCheck) error {`
`183`	`183`
`184`	`184`	`response, err := client.Get(checkURL.String())`
`185`	`185`	`if err != nil {`
`186`		`- return fmt.Errorf("Health check error: %s", err)`
	`186`	`+ return fmt.Errorf("health check error: %s", err)`
`187`	`187`	`}`
`188`	`188`	`defer func() {`
`189`	`189`	`if err := response.Body.Close(); err != nil {`
`@@ -194,7 +194,7 @@ func httpHealthCheck(checkDefinition mesos.HealthCheck) error {`
`194`	`194`	`// Default executors treat return codes between 200 and 399 as success`
`195`	`195`	`// See: https://github.com/apache/mesos/blob/1.1.3/include/mesos/mesos.proto#L355-L357`
`196`	`196`	`if response.StatusCode < 200 \|\| response.StatusCode >= 400 {`
`197`		`- return fmt.Errorf("Health check error: received status code %d, but expected codes between 200 and 399", response.StatusCode)`
	`197`	`+ return fmt.Errorf("health check error: received status code %d, but expected codes between 200 and 399", response.StatusCode)`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func (c *defaultClient) FindDirectorID(name string) (int, error) {`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`- return 0, fmt.Errorf("No Director with name %s found", name)`
	`141`	`+ return 0, fmt.Errorf("no Director with name %s found", name)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// AddBackend adds backend in VaaS director.`
`@@ -202,7 +202,7 @@ func (c defaultClient) GetDC(name string) (DC, error) {`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
`205`		`- return nil, fmt.Errorf("No DC with name %s found", name)`
	`205`	`+ return nil, fmt.Errorf("no DC with name %s found", name)`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`func (c defaultClient) TaskStatus(task Task) error {`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (h TaskInfo) GetWeight() (int, error) {`
`111`	`111`	`return strconv.Atoi(strings.TrimPrefix(tags, weightPrefix))`
`112`	`112`	`}`
`113`	`113`	`}`
`114`		`- return 0, fmt.Errorf("No weight defined")`
	`114`	`+ return 0, fmt.Errorf("no weight defined")`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// GetPorts returns a list of task ports`