diff --git a/api/deserialization_test.go b/api/deserialization_test.go index 8a8766a2c..085f2e9b2 100644 --- a/api/deserialization_test.go +++ b/api/deserialization_test.go @@ -29,7 +29,7 @@ func assertErrorResponse(rr *httptest.ResponseRecorder, code int) error { ctypes := rr.HeaderMap["Content-Type"] expect := []string{"application/json"} if !reflect.DeepEqual(expect, ctypes) { - return fmt.Errorf("Expected Content-Type %v, got %v", expect, ctypes) + return fmt.Errorf("expected Content-Type %v, got %v", expect, ctypes) } var eresp errorResponse diff --git a/fleetctl/fleetctl.go b/fleetctl/fleetctl.go index 48150e08c..f01eb9b9f 100644 --- a/fleetctl/fleetctl.go +++ b/fleetctl/fleetctl.go @@ -819,7 +819,7 @@ func lazyCreateUnits(cCmd *cobra.Command, args []string) error { } if haserr { - return fmt.Errorf("One or more errors creating units") + return fmt.Errorf("one or more errors creating units") } return nil @@ -1030,10 +1030,10 @@ func assertUnitState(name string, js job.JobState, out io.Writer) bool { u, err := cAPI.Unit(name) if err != nil { - return fmt.Errorf("Error retrieving Unit(%s) from Registry: %v", name, err) + return fmt.Errorf("error retrieving Unit(%s) from Registry: %v", name, err) } if u == nil { - return fmt.Errorf("Unit %s not found", name) + return fmt.Errorf("unit %s not found", name) } // If this is a global unit, CurrentState will never be set. Instead, wait for DesiredState. @@ -1044,7 +1044,7 @@ func assertUnitState(name string, js job.JobState, out io.Writer) bool { } if job.JobState(state) != js { - return fmt.Errorf("Waiting for Unit(%s) state(%s) to be %s", name, job.JobState(state), js) + return fmt.Errorf("waiting for Unit(%s) state(%s) to be %s", name, job.JobState(state), js) } msg := fmt.Sprintf("Unit %s %s", name, u.CurrentState) @@ -1139,19 +1139,19 @@ func assertSystemdActiveState(unitName string) error { fetchSystemdActiveState := func() error { us, err := cAPI.UnitState(unitName) if err != nil { - return fmt.Errorf("Error getting unit state of %s: %v", unitName, err) + return fmt.Errorf("error getting unit state of %s: %v", unitName, err) } // Get systemd state and check the state is active & loaded. if us.SystemdActiveState != "active" || us.SystemdLoadState != "loaded" { - return fmt.Errorf("Failed to find an active unit %s", unitName) + return fmt.Errorf("failed to find an active unit %s", unitName) } return nil } timeout, err := waitForState(fetchSystemdActiveState) if err != nil { - return fmt.Errorf("Failed to find an active unit %s within %v, err: %v", + return fmt.Errorf("failed to find an active unit %s within %v, err: %v", unitName, timeout, err) } @@ -1236,7 +1236,7 @@ func waitForState(stateCheckFunc func() error) (time.Duration, error) { for { select { case <-alarm: - return timeout, fmt.Errorf("Failed to fetch states within %v", timeout) + return timeout, fmt.Errorf("failed to fetch states within %v", timeout) case <-ticker: err := stateCheckFunc() if err == nil { @@ -1270,7 +1270,7 @@ func cmdGlobalMachineState(cCmd *cobra.Command, globalUnits []schema.Unit) (err for id, name := range resultIDs { // run a correspondent systemctl command if exitVal := runCommand(cCmd, id, "systemctl", cmd, name); exitVal != 0 { - err = fmt.Errorf("Error running systemctl %s. machine id=%v, unit name=%s", + err = fmt.Errorf("error running systemctl %s. machine id=%v, unit name=%s", cmd, id, name) break } diff --git a/fleetctl/load_test.go b/fleetctl/load_test.go index 17d2935de..03be7768d 100644 --- a/fleetctl/load_test.go +++ b/fleetctl/load_test.go @@ -26,12 +26,12 @@ import ( func checkLoadUnitState(unit schema.Unit, loadRet int, errchan chan error) { if loadRet == 0 { if job.JobState(unit.DesiredState) != job.JobStateLoaded { - errchan <- fmt.Errorf("Error: unit %s was not loaded as requested", unit.Name) + errchan <- fmt.Errorf("error: unit %s was not loaded as requested", unit.Name) } } else if unit.DesiredState != "" { // if the whole load operation failed, then no unit // should have a DesiredState set - errchan <- fmt.Errorf("Error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) + errchan <- fmt.Errorf("error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) } } diff --git a/fleetctl/restart_test.go b/fleetctl/restart_test.go index cffb2ba2f..30f44346a 100644 --- a/fleetctl/restart_test.go +++ b/fleetctl/restart_test.go @@ -26,7 +26,7 @@ func checkRestartUnitState(unit schema.Unit, restartRet int, errchan chan error) if restartRet != 0 && unit.DesiredState != "" { // if the whole restart operation failed, then no unit // should have a DesiredState set - errchan <- fmt.Errorf("Error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) + errchan <- fmt.Errorf("error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) } } diff --git a/fleetctl/start_test.go b/fleetctl/start_test.go index a281c11cb..f3b0836fa 100644 --- a/fleetctl/start_test.go +++ b/fleetctl/start_test.go @@ -26,12 +26,12 @@ import ( func checkStartUnitState(unit schema.Unit, startRet int, errchan chan error) { if startRet == 0 { if job.JobState(unit.DesiredState) != job.JobStateLaunched { - errchan <- fmt.Errorf("Error: unit %s was not started as requested", unit.Name) + errchan <- fmt.Errorf("error: unit %s was not started as requested", unit.Name) } } else if unit.DesiredState != "" { // if the whole start operation failed, then no unit // should have a DesiredState set - errchan <- fmt.Errorf("Error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) + errchan <- fmt.Errorf("error: Unit(%s) DesiredState was set to (%s)", unit.Name, unit.DesiredState) } } diff --git a/fleetctl/stop_test.go b/fleetctl/stop_test.go index 185025856..d895d6816 100644 --- a/fleetctl/stop_test.go +++ b/fleetctl/stop_test.go @@ -39,7 +39,7 @@ func doStopUnits(t *testing.T, r commandTestResults, errchan chan error) { // We assume that we reached the desired state for _, v := range real_units { if job.JobState(v.DesiredState) != job.JobStateLoaded { - errchan <- fmt.Errorf("Error: unit %s was not stopped as requested", v.Name) + errchan <- fmt.Errorf("error: unit %s was not stopped as requested", v.Name) } } } diff --git a/fleetctl/unload_test.go b/fleetctl/unload_test.go index 050b2e1a3..acc978404 100644 --- a/fleetctl/unload_test.go +++ b/fleetctl/unload_test.go @@ -39,7 +39,7 @@ func doUnloadUnits(t *testing.T, r commandTestResults, errchan chan error) { // We assume that we reached the desired state for _, v := range real_units { if job.JobState(v.DesiredState) != job.JobStateInactive { - errchan <- fmt.Errorf("Error: unit %s was not unloaded as requested", v.Name) + errchan <- fmt.Errorf("error: unit %s was not unloaded as requested", v.Name) } } } diff --git a/functional/machines_test.go b/functional/machines_test.go index fd4cc2cc5..03fb70144 100644 --- a/functional/machines_test.go +++ b/functional/machines_test.go @@ -453,16 +453,16 @@ func TestMachinesPatchBad(t *testing.T) { func getHTTPResponse(method string, urlPath string, val string) (*http.Response, error) { req, err := http.NewRequest(method, urlPath, strings.NewReader(val)) if err != nil { - return nil, fmt.Errorf("Failed creating http.Request: %v", err) + return nil, fmt.Errorf("failed creating http.Request: %v", err) } cl := http.Client{} resp, err := cl.Do(req) if err != nil { - return nil, fmt.Errorf("Failed to run client.Do: %v", err) + return nil, fmt.Errorf("failed to run client.Do: %v", err) } if resp.Body == nil { - return nil, fmt.Errorf("Got HTTP response nil body") + return nil, fmt.Errorf("got HTTP response nil body") } return resp, nil @@ -471,9 +471,9 @@ func getHTTPResponse(method string, urlPath string, val string) (*http.Response, func checkContentType(resp *http.Response) error { ct := resp.Header.Get("Content-Type") if len(ct) == 0 { - return fmt.Errorf("Response has wrong number of Content-Type values: %v", ct) + return fmt.Errorf("response has wrong number of Content-Type values: %v", ct) } else if !strings.Contains(ct, "application/json") { - return fmt.Errorf("Expected application/json, got %v", ct) + return fmt.Errorf("expected application/json, got %v", ct) } return nil } diff --git a/functional/node_test.go b/functional/node_test.go index 3192f2516..fb25e1120 100644 --- a/functional/node_test.go +++ b/functional/node_test.go @@ -119,16 +119,16 @@ func TestDetectMachineId(t *testing.T) { restartFleetService := func(m platform.Member) error { stdout, stderr, err := cluster.MemberCommand(m, "sudo", "systemctl", "restart", "fleet.service") if err != nil { - return fmt.Errorf("Failed to restart fleet service\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) + return fmt.Errorf("failed to restart fleet service\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) } stdout, stderr, err = cluster.MemberCommand(m, "systemctl", "show", "--property=ActiveState", "fleet") if strings.TrimSpace(stdout) != "ActiveState=active" { - return fmt.Errorf("Fleet unit not reported as active:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) + return fmt.Errorf("fleet unit not reported as active:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) } stdout, stderr, err = cluster.MemberCommand(m, "systemctl", "show", "--property=Result", "fleet") if strings.TrimSpace(stdout) != "Result=success" { - return fmt.Errorf("Result for fleet unit not reported as success:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) + return fmt.Errorf("result for fleet unit not reported as success:\nstdout: %s\nstderr: %s\nerr: %v", stdout, stderr, err) } return nil } diff --git a/functional/platform/nspawn.go b/functional/platform/nspawn.go index 59b5b2b98..9bdce1feb 100644 --- a/functional/platform/nspawn.go +++ b/functional/platform/nspawn.go @@ -544,7 +544,7 @@ func (nc *nspawnCluster) createMember(id string) (m Member, err error) { for { select { case <-alarm: - err = fmt.Errorf("Timed out waiting for machine to start") + err = fmt.Errorf("timed out waiting for machine to start") log.Printf("Starting %s%s failed: %v", nc.name, nm.ID(), err) return default: diff --git a/functional/server_test.go b/functional/server_test.go index 1a54044c6..bcbb93842 100644 --- a/functional/server_test.go +++ b/functional/server_test.go @@ -126,14 +126,14 @@ func waitForReloadConfig(cluster platform.Cluster, m0 platform.Member) (err erro stdout, _, _ := cluster.MemberCommand(m0, "sudo", "journalctl --priority=info _PID=$(pidof fleetd)") journalfleet := strings.TrimSpace(stdout) if !strings.Contains(journalfleet, "Reloading configuration") { - fmt.Errorf("Fleetd is not fully reconfigured, retrying... entire fleet journal:\n%v", journalfleet) + fmt.Errorf("fleetd is not fully reconfigured, retrying... entire fleet journal:\n%v", journalfleet) return false } return true }, ) if err != nil { - return fmt.Errorf("Reloading configuration log not found: %v", err) + return fmt.Errorf("reloading configuration log not found: %v", err) } return nil @@ -146,14 +146,14 @@ func waitForFleetdSocket(cluster platform.Cluster, m0 platform.Member) (err erro func() bool { stdout, _, _ := cluster.MemberCommand(m0, "test -S /var/run/fleet.sock && echo 1") if strings.TrimSpace(stdout) == "" { - fmt.Errorf("Fleetd is not fully started, retrying...") + fmt.Errorf("fleetd is not fully started, retrying") return false } return true }, ) if err != nil { - return fmt.Errorf("Fleetd socket not found: %v", err) + return fmt.Errorf("fleetd socket not found: %v", err) } return nil diff --git a/functional/systemd_test.go b/functional/systemd_test.go index d1a37448e..f47556215 100644 --- a/functional/systemd_test.go +++ b/functional/systemd_test.go @@ -110,7 +110,7 @@ func waitForUnitState(mgr unit.UnitManager, name string, want unit.UnitState) er for { select { case <-timeout: - return fmt.Errorf("Timed out waiting for state of %s to match %#v", name, want) + return fmt.Errorf("timed out waiting for state of %s to match %#v", name, want) default: } diff --git a/functional/unit_action_test.go b/functional/unit_action_test.go index 602e5cc42..e1bb0c368 100644 --- a/functional/unit_action_test.go +++ b/functional/unit_action_test.go @@ -485,13 +485,13 @@ func replaceUnitCommon(t *testing.T, cmd string, numRUnits int) error { tmpHelloFixture := fmt.Sprintf("/tmp/fixtures/hello@%d.service", i) err = util.CopyFile(tmpHelloFixture, fxtHelloService) if err != nil { - return nil, fmt.Errorf("Failed to copy a temp fleet service: %v", err) + return nil, fmt.Errorf("failed to copy a temp fleet service: %v", err) } // retrieve content of hello.service, and append to bodiesOrig[] bodyCur, stderr, err := cluster.Fleetctl(m, "cat", helloFilename) if err != nil { - return nil, fmt.Errorf("Failed to run cat %s: %v\nstderr: %s", helloFilename, err, stderr) + return nil, fmt.Errorf("failed to run cat %s: %v\nstderr: %s", helloFilename, err, stderr) } bodiesOrig = append(bodiesOrig, bodyCur) @@ -499,7 +499,7 @@ func replaceUnitCommon(t *testing.T, cmd string, numRUnits int) error { curHelloService := path.Join("/tmp", helloFilename) err = util.GenNewFleetService(curHelloService, fxtHelloService, "sleep 2", "sleep 1") if err != nil { - return nil, fmt.Errorf("Failed to generate a temp fleet service: %v", err) + return nil, fmt.Errorf("failed to generate a temp fleet service: %v", err) } } return bodiesOrig, nil @@ -511,21 +511,21 @@ func replaceUnitCommon(t *testing.T, cmd string, numRUnits int) error { // replace the unit and assert it shows up if stdout, stderr, err := cluster.Fleetctl(m, cmd, "--replace", curHelloService); err != nil { - return fmt.Errorf("Unable to replace fleet unit: %v\nstdout: %s\nstderr: %s", err, stdout, stderr) + return fmt.Errorf("unable to replace fleet unit: %v\nstdout: %s\nstderr: %s", err, stdout, stderr) } if err := waitForNUnitsCmd(cluster, m, cmd, numUnits); err != nil { - return fmt.Errorf("Did not find %d units in cluster", numUnits) + return fmt.Errorf("did not find %d units in cluster", numUnits) } // retrieve content of hello.service, and compare it with the // correspondent entry in bodiesOrig[] bodyCur, stderr, err := cluster.Fleetctl(m, "cat", helloFilename) if err != nil { - return fmt.Errorf("Failed to run cat %s: %v\nstderr: %s", helloFilename, err, stderr) + return fmt.Errorf("failed to run cat %s: %v\nstderr: %s", helloFilename, err, stderr) } if bodiesOrig[i] == bodyCur { - return fmt.Errorf("Error. the unit %s has not been replaced.", helloFilename) + return fmt.Errorf("error. the unit %s has not been replaced", helloFilename) } } @@ -539,7 +539,7 @@ func replaceUnitCommon(t *testing.T, cmd string, numRUnits int) error { return err } if err := waitForNUnitsCmd(cluster, m, cmd, numRUnits); err != nil { - return fmt.Errorf("Did not find %d units in cluster", numRUnits) + return fmt.Errorf("did not find %d units in cluster", numRUnits) } // Before starting comparison, prepare a slice of unit bodies of each @@ -566,7 +566,7 @@ func replaceUnitCommon(t *testing.T, cmd string, numRUnits int) error { } if err := waitForNUnitsCmd(cluster, m, cmd, 0); err != nil { - return fmt.Errorf("Failed to get every unit to be cleaned up: %v", err) + return fmt.Errorf("failed to get every unit to be cleaned up: %v", err) } os.Remove(tmpFixtures) @@ -584,11 +584,11 @@ func launchUnitsCmd(cluster platform.Cluster, m platform.Member, cmd string, num if stdout, stderr, err := cluster.Fleetctl(m, args...); err != nil { return nil, - fmt.Errorf("Unable to %s batch of units: \nstdout: %s\nstderr: %s\nerr: %v", + fmt.Errorf("unable to %s batch of units: \nstdout: %s\nstderr: %s\nerr: %v", cmd, stdout, stderr, err) } else if strings.Contains(stderr, "Error") { return nil, - fmt.Errorf("Failed to correctly %s batch of units: \nstdout: %s\nstderr: %s\nerr: %v", + fmt.Errorf("failed to correctly %s batch of units: \nstdout: %s\nstderr: %s\nerr: %v", cmd, stdout, stderr, err) } @@ -598,7 +598,7 @@ func launchUnitsCmd(cluster platform.Cluster, m platform.Member, cmd string, num func cleanUnits(cl platform.Cluster, m platform.Member, cmd string, ufs []string, nu int) (err error) { for i := 0; i < nu; i++ { if stdout, stderr, err := cl.Fleetctl(m, cmd, ufs[i]); err != nil { - return fmt.Errorf("Failed to %s unit: %v\nstdout: %s\nstderr: %s", cmd, err, stdout, stderr) + return fmt.Errorf("failed to %s unit: %v\nstdout: %s\nstderr: %s", cmd, err, stdout, stderr) } } return nil @@ -624,11 +624,11 @@ func checkListUnits(cl platform.Cluster, m platform.Member, cmd string, ufs []st lenLists = len(lus) break default: - return fmt.Errorf("Failed to run an invalid cmd %s", cmd) + return fmt.Errorf("failed to run an invalid cmd %s", cmd) } if nu == 0 && lenLists != 0 { - return fmt.Errorf("Failed to get an empty unit list") + return fmt.Errorf("failed to get an empty unit list") } // given unit name must be there in list-unit-files @@ -640,7 +640,7 @@ func checkListUnits(cl platform.Cluster, m platform.Member, cmd string, ufs []st _, found = lus[ufs[i]] } if lenLists != nu || !found { - return fmt.Errorf("Expected %s to be unit file", ufs[i]) + return fmt.Errorf("expected %s to be unit file", ufs[i]) } } return err @@ -650,7 +650,7 @@ func waitForNUnitsSubmit(cl platform.Cluster, m platform.Member, nu int) (map[st // wait until the unit gets processed up to 15 seconds listUnitStates, err := cl.WaitForNUnitFiles(m, nu) if err != nil { - return nil, fmt.Errorf("Failed to run list-unit-files: %v", err) + return nil, fmt.Errorf("failed to run list-unit-files: %v", err) } return listUnitStates, nil } @@ -658,7 +658,7 @@ func waitForNUnitsSubmit(cl platform.Cluster, m platform.Member, nu int) (map[st func waitForNUnitsLoad(cl platform.Cluster, m platform.Member, nu int) (map[string][]util.UnitState, error) { listUnitStates, err := cl.WaitForNUnits(m, nu) if err != nil { - return nil, fmt.Errorf("Failed to run list-units: %v", err) + return nil, fmt.Errorf("failed to run list-units: %v", err) } return listUnitStates, nil } @@ -666,7 +666,7 @@ func waitForNUnitsLoad(cl platform.Cluster, m platform.Member, nu int) (map[stri func waitForNUnitsStart(cl platform.Cluster, m platform.Member, nu int) (map[string][]util.UnitState, error) { listUnitStates, err := cl.WaitForNActiveUnits(m, nu) if err != nil { - return nil, fmt.Errorf("Failed to run list-units: %v", err) + return nil, fmt.Errorf("failed to run list-units: %v", err) } return listUnitStates, nil } @@ -685,7 +685,7 @@ func waitForNUnitsCmd(cl platform.Cluster, m platform.Member, cmd string, nu int _, err = waitForNUnitsStart(cl, m, nu) break default: - return fmt.Errorf("Failed to run an invalid cmd %s", cmd) + return fmt.Errorf("failed to run an invalid cmd %s", cmd) } return err } diff --git a/functional/util/util.go b/functional/util/util.go index 7e690f6f2..2711605f4 100644 --- a/functional/util/util.go +++ b/functional/util/util.go @@ -164,7 +164,7 @@ func WaitForState(stateCheckFunc func() bool) (time.Duration, error) { select { case <-alarm: // Generic message. Callers can build more specific ones using the returned timeout value. - return timeout, fmt.Errorf("Failed to reach expected state within %v.", timeout) + return timeout, fmt.Errorf("failed to reach expected state within %v", timeout) case <-ticker: if stateCheckFunc() { return timeout, nil diff --git a/registry/fake.go b/registry/fake.go index 7738ddd8a..9728a51c0 100644 --- a/registry/fake.go +++ b/registry/fake.go @@ -302,7 +302,7 @@ func (f *FakeRegistry) UnitState(unitName string) (*unit.UnitState, error) { } if us == nil { - return nil, fmt.Errorf("Cannot find unit(%s) from fakeRegistry", unitName) + return nil, fmt.Errorf("cannot find unit(%s) from fakeRegistry", unitName) } return us, nil diff --git a/systemd/manager.go b/systemd/manager.go index cab4ed55c..91834ba80 100644 --- a/systemd/manager.go +++ b/systemd/manager.go @@ -113,7 +113,7 @@ func (m *systemdUnitManager) Load(name string, u unit.UnitFile) error { ok, err := m.enableUnit(name) if err != nil || !ok { m.removeUnit(name) - return fmt.Errorf("Failed to enable systemd unit %s: %v", name, err) + return fmt.Errorf("failed to enable systemd unit %s: %v", name, err) } } m.hashes[name] = u.Hash()