From ea960711ff17feae543ae439426245586df4c2ff Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 20 Nov 2014 18:00:36 +0800 Subject: [PATCH] Clean up error logs. Use %v for errors, tidy some messages, make error messages start lowe-case (as per go guidelines). Just accumulated nits. --- cmd/integration/integration.go | 6 ++--- contrib/enscope/enscope.go | 10 +++---- contrib/simplegen/simplegen.go | 12 ++++----- contrib/srvexpand/srvexpand.go | 12 ++++----- pkg/api/errors/errors.go | 4 +-- pkg/api/meta/meta.go | 4 +-- pkg/api/validation/validation.go | 4 +-- pkg/api/validation/validation_test.go | 2 +- pkg/apiserver/apiserver.go | 2 +- pkg/client/client.go | 4 +-- pkg/client/request.go | 4 +-- pkg/cloudprovider/aws/aws.go | 20 +++++++------- pkg/cloudprovider/gce/gce.go | 6 ++--- pkg/cloudprovider/openstack/openstack.go | 2 +- pkg/cloudprovider/plugins.go | 2 +- pkg/cloudprovider/vagrant/vagrant.go | 2 +- pkg/controller/replication_controller.go | 2 +- pkg/conversion/converter.go | 6 ++--- pkg/conversion/decode.go | 2 +- pkg/conversion/scheme.go | 6 ++--- pkg/credentialprovider/gcp/metadata_test.go | 2 +- pkg/health/exec.go | 2 +- pkg/kubecfg/kubecfg.go | 8 +++--- pkg/kubecfg/resource_printer.go | 8 +++--- pkg/kubectl/cmd/cmd.go | 2 +- pkg/kubectl/cmd/get.go | 2 +- pkg/kubectl/cmd/helpers.go | 10 +++---- pkg/kubectl/cmd/resource.go | 6 ++--- pkg/kubelet/config/http.go | 2 +- pkg/kubelet/dockertools/docker.go | 8 +++--- pkg/kubelet/kubelet.go | 30 ++++++++++----------- pkg/kubelet/server.go | 2 +- pkg/master/publish.go | 2 +- pkg/proxy/config/etcd.go | 6 ++--- pkg/proxy/proxier.go | 24 ++++++++--------- pkg/proxy/udp_server.go | 2 +- pkg/registry/binding/rest.go | 2 +- pkg/registry/etcd/etcd.go | 8 +++--- pkg/registry/minion/healthy_registry.go | 2 +- pkg/registry/pod/rest.go | 6 ++--- pkg/registry/service/rest.go | 8 +++--- pkg/registry/service/rest_test.go | 4 +-- pkg/service/endpoints_controller.go | 4 +-- pkg/tools/etcd_tools.go | 2 +- pkg/tools/etcd_tools_watch.go | 2 +- pkg/ui/datafile.go | 10 +++---- pkg/util/exec/exec_test.go | 2 +- pkg/util/fake_handler.go | 2 +- pkg/util/iptables/iptables.go | 14 +++++----- pkg/util/iptables/iptables_test.go | 18 ++++++------- pkg/volume/volume.go | 10 +++---- pkg/volume/volume_test.go | 2 +- pkg/watch/json/types.go | 2 +- 53 files changed, 163 insertions(+), 163 deletions(-) diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 3825b26c792..c4acaaa6d28 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -248,16 +248,16 @@ func podExists(c *client.Client, podNamespace string, podID string) wait.Conditi func runReplicationControllerTest(c *client.Client) { data, err := ioutil.ReadFile("api/examples/controller.json") if err != nil { - glog.Fatalf("Unexpected error: %#v", err) + glog.Fatalf("Unexpected error: %v", err) } var controller api.ReplicationController if err := api.Scheme.DecodeInto(data, &controller); err != nil { - glog.Fatalf("Unexpected error: %#v", err) + glog.Fatalf("Unexpected error: %v", err) } glog.Infof("Creating replication controllers") if _, err := c.ReplicationControllers(api.NamespaceDefault).Create(&controller); err != nil { - glog.Fatalf("Unexpected error: %#v", err) + glog.Fatalf("Unexpected error: %v", err) } glog.Infof("Done creating replication controllers") diff --git a/contrib/enscope/enscope.go b/contrib/enscope/enscope.go index dfebbb50283..89f75c5fc20 100644 --- a/contrib/enscope/enscope.go +++ b/contrib/enscope/enscope.go @@ -146,7 +146,7 @@ func enscope(parent string, spec EnscopeSpec, in interface{}) (out interface{}, func ReadConfigData(location string) ([]byte, error) { if len(location) == 0 { - return nil, fmt.Errorf("Location given but empty") + return nil, fmt.Errorf("location given but empty") } if location == "-" { @@ -172,21 +172,21 @@ func readConfigDataFromLocation(location string) ([]byte, error) { if strings.Index(location, "http://") == 0 || strings.Index(location, "https://") == 0 { resp, err := http.Get(location) if err != nil { - return nil, fmt.Errorf("Unable to access URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to access URL %s: %v\n", location, err) } defer resp.Body.Close() if resp.StatusCode != 200 { - return nil, fmt.Errorf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) + return nil, fmt.Errorf("unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) } data, err := ioutil.ReadAll(resp.Body) if err != nil { - return nil, fmt.Errorf("Unable to read URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read URL %s: %v\n", location, err) } return data, nil } else { data, err := ioutil.ReadFile(location) if err != nil { - return nil, fmt.Errorf("Unable to read %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read %s: %v\n", location, err) } return data, nil } diff --git a/contrib/simplegen/simplegen.go b/contrib/simplegen/simplegen.go index ea17cb4967f..aa569d07b94 100644 --- a/contrib/simplegen/simplegen.go +++ b/contrib/simplegen/simplegen.go @@ -175,7 +175,7 @@ func portsFromString(spec string) (servicePort int, containerPort int, err error pieces := strings.Split(spec, ":") if len(pieces) != 2 { glog.Infof("Bad port spec: %s", spec) - return 0, 0, fmt.Errorf("Bad port spec: %s", spec) + return 0, 0, fmt.Errorf("bad port spec: %s", spec) } servicePort, err = strconv.Atoi(pieces[0]) if err != nil { @@ -207,7 +207,7 @@ func portsFromString(spec string) (servicePort int, containerPort int, err error func ReadConfigData(location string) ([]byte, error) { if len(location) == 0 { - return nil, fmt.Errorf("Location given but empty") + return nil, fmt.Errorf("location given but empty") } if location == "-" { @@ -233,21 +233,21 @@ func readConfigDataFromLocation(location string) ([]byte, error) { if strings.Index(location, "http://") == 0 || strings.Index(location, "https://") == 0 { resp, err := http.Get(location) if err != nil { - return nil, fmt.Errorf("Unable to access URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to access URL %s: %v\n", location, err) } defer resp.Body.Close() if resp.StatusCode != 200 { - return nil, fmt.Errorf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) + return nil, fmt.Errorf("unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) } data, err := ioutil.ReadAll(resp.Body) if err != nil { - return nil, fmt.Errorf("Unable to read URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read URL %s: %v\n", location, err) } return data, nil } else { data, err := ioutil.ReadFile(location) if err != nil { - return nil, fmt.Errorf("Unable to read %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read %s: %v\n", location, err) } return data, nil } diff --git a/contrib/srvexpand/srvexpand.go b/contrib/srvexpand/srvexpand.go index dbb2dc3d69f..1aeb61e3a0b 100644 --- a/contrib/srvexpand/srvexpand.go +++ b/contrib/srvexpand/srvexpand.go @@ -234,7 +234,7 @@ func portsFromString(spec string) (servicePort int, containerPort int, err error pieces := strings.Split(spec, ":") if len(pieces) != 2 { glog.Infof("Bad port spec: %s", spec) - return 0, 0, fmt.Errorf("Bad port spec: %s", spec) + return 0, 0, fmt.Errorf("bad port spec: %s", spec) } servicePort, err = strconv.Atoi(pieces[0]) if err != nil { @@ -266,7 +266,7 @@ func portsFromString(spec string) (servicePort int, containerPort int, err error func ReadConfigData(location string) ([]byte, error) { if len(location) == 0 { - return nil, fmt.Errorf("Location given but empty") + return nil, fmt.Errorf("location given but empty") } if location == "-" { @@ -292,21 +292,21 @@ func readConfigDataFromLocation(location string) ([]byte, error) { if strings.Index(location, "http://") == 0 || strings.Index(location, "https://") == 0 { resp, err := http.Get(location) if err != nil { - return nil, fmt.Errorf("Unable to access URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to access URL %s: %v\n", location, err) } defer resp.Body.Close() if resp.StatusCode != 200 { - return nil, fmt.Errorf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) + return nil, fmt.Errorf("unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) } data, err := ioutil.ReadAll(resp.Body) if err != nil { - return nil, fmt.Errorf("Unable to read URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read URL %s: %v\n", location, err) } return data, nil } else { data, err := ioutil.ReadFile(location) if err != nil { - return nil, fmt.Errorf("Unable to read %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read %s: %v\n", location, err) } return data, nil } diff --git a/pkg/api/errors/errors.go b/pkg/api/errors/errors.go index b8ef1c9ab13..d1172d03fa9 100644 --- a/pkg/api/errors/errors.go +++ b/pkg/api/errors/errors.go @@ -99,7 +99,7 @@ func NewConflict(kind, name string, err error) error { Kind: kind, ID: name, }, - Message: fmt.Sprintf("%s %q cannot be updated: %s", kind, name, err), + Message: fmt.Sprintf("%s %q cannot be updated: %v", kind, name, err), }} } @@ -124,7 +124,7 @@ func NewInvalid(kind, name string, errs ValidationErrorList) error { ID: name, Causes: causes, }, - Message: fmt.Sprintf("%s %q is invalid: %s", kind, name, errs.ToError()), + Message: fmt.Sprintf("%s %q is invalid: %v", kind, name, errs.ToError()), }} } diff --git a/pkg/api/meta/meta.go b/pkg/api/meta/meta.go index 89a6e672b4f..1ecb441f7c5 100644 --- a/pkg/api/meta/meta.go +++ b/pkg/api/meta/meta.go @@ -294,7 +294,7 @@ func (a genericAccessor) SetSelfLink(selfLink string) { func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error { field := v.FieldByName(fieldName) if !field.IsValid() { - return fmt.Errorf("Couldn't find %v field in %#v", fieldName, v.Interface()) + return fmt.Errorf("couldn't find %v field in %#v", fieldName, v.Interface()) } v, err := conversion.EnforcePtr(dest) if err != nil { @@ -309,7 +309,7 @@ func fieldPtr(v reflect.Value, fieldName string, dest interface{}) error { v.Set(field.Convert(v.Type())) return nil } - return fmt.Errorf("Couldn't assign/convert %v to %v", field.Type(), v.Type()) + return fmt.Errorf("couldn't assign/convert %v to %v", field.Type(), v.Type()) } // extractFromTypeMeta extracts pointers to version and kind fields from an object diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 13358066f5d..aa38712e600 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -434,7 +434,7 @@ func ValidateService(service *api.Service, lister ServiceLister, ctx api.Context if services.Items[i].Name != service.Name && services.Items[i].Spec.CreateExternalLoadBalancer && services.Items[i].Spec.Port == service.Spec.Port { - allErrs = append(allErrs, errs.NewConflict("service", service.Name, fmt.Errorf("Port: %d is already in use", service.Spec.Port))) + allErrs = append(allErrs, errs.NewConflict("service", service.Name, fmt.Errorf("port: %d is already in use", service.Spec.Port))) break } } @@ -548,7 +548,7 @@ func ValidateMinionUpdate(oldMinion *api.Minion, minion *api.Minion) errs.Valida oldMinion.Labels = minion.Labels oldMinion.ObjectMeta.Labels = minion.ObjectMeta.Labels if !reflect.DeepEqual(oldMinion, minion) { - allErrs = append(allErrs, fmt.Errorf("Update contains more than labels changes")) + allErrs = append(allErrs, fmt.Errorf("update contains more than labels changes")) } return allErrs } diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 6e92c37dcb5..74e1af88150 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -805,7 +805,7 @@ func TestValidateService(t *testing.T) { registry.List = tc.existing errs := ValidateService(&tc.svc, registry, api.NewDefaultContext()) if len(errs) != tc.numErrs { - t.Errorf("Unexpected error list for case %q: %+v", tc.name, errs) + t.Errorf("Unexpected error list for case %q: %v", tc.name, errs.ToError()) } } diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 49249e24373..ae1a32bcfe7 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -315,7 +315,7 @@ func parseTimeout(str string) time.Duration { if err == nil { return timeout } - glog.Errorf("Failed to parse: %#v '%s'", err, str) + glog.Errorf("Failed to parse %q: %v", str, err) } return 30 * time.Second } diff --git a/pkg/client/client.go b/pkg/client/client.go index 87a3586ea5a..ee90d5af0ff 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -86,7 +86,7 @@ func (c *Client) ServerVersion() (*version.Info, error) { var info version.Info err = json.Unmarshal(body, &info) if err != nil { - return nil, fmt.Errorf("Got '%s': %v", string(body), err) + return nil, fmt.Errorf("got '%s': %v", string(body), err) } return &info, nil } @@ -100,7 +100,7 @@ func (c *Client) ServerAPIVersions() (*api.APIVersions, error) { var v api.APIVersions err = json.Unmarshal(body, &v) if err != nil { - return nil, fmt.Errorf("Got '%s': %v", string(body), err) + return nil, fmt.Errorf("got '%s': %v", string(body), err) } return &v, nil } diff --git a/pkg/client/request.go b/pkg/client/request.go index ce99ce99d3a..1e16b98eeaf 100644 --- a/pkg/client/request.go +++ b/pkg/client/request.go @@ -241,7 +241,7 @@ func (r *Request) Body(obj interface{}) *Request { } r.body = bytes.NewBuffer(data) default: - r.err = fmt.Errorf("Unknown type used for body: %#v", obj) + r.err = fmt.Errorf("unknown type used for body: %#v", obj) } return r } @@ -305,7 +305,7 @@ func (r *Request) Watch() (watch.Interface, error) { if resp.Body != nil { body, _ = ioutil.ReadAll(resp.Body) } - return nil, fmt.Errorf("For request '%v', got status: %v\nbody: %v", req.URL, resp.StatusCode, string(body)) + return nil, fmt.Errorf("for request '%v', got status: %v\nbody: %v", req.URL, resp.StatusCode, string(body)) } return watch.NewStreamWatcher(watchjson.NewDecoder(resp.Body, r.codec)), nil } diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index 8a9cefa7111..fda91ee960e 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -61,7 +61,7 @@ func getAuth() (auth aws.Auth, err error) { // readAWSCloudConfig reads an instance of AWSCloudConfig from config reader. func readAWSCloudConfig(config io.Reader) (*AWSCloudConfig, error) { if config == nil { - return nil, fmt.Errorf("No AWS cloud provider config file given") + return nil, fmt.Errorf("no AWS cloud provider config file given") } var cfg AWSCloudConfig @@ -71,7 +71,7 @@ func readAWSCloudConfig(config io.Reader) (*AWSCloudConfig, error) { } if cfg.Global.Region == "" { - return nil, fmt.Errorf("No region specified in configuration file") + return nil, fmt.Errorf("no region specified in configuration file") } return &cfg, nil @@ -81,7 +81,7 @@ func readAWSCloudConfig(config io.Reader) (*AWSCloudConfig, error) { func newAWSCloud(config io.Reader, authFunc AuthFunc) (*AWSCloud, error) { cfg, err := readAWSCloudConfig(config) if err != nil { - return nil, fmt.Errorf("Unable to read AWS cloud provider config file: %s", err) + return nil, fmt.Errorf("unable to read AWS cloud provider config file: %v", err) } auth, err := authFunc() @@ -91,7 +91,7 @@ func newAWSCloud(config io.Reader, authFunc AuthFunc) (*AWSCloud, error) { region, ok := aws.Regions[cfg.Global.Region] if !ok { - return nil, fmt.Errorf("Not a valid AWS region: %s", cfg.Global.Region) + return nil, fmt.Errorf("not a valid AWS region: %s", cfg.Global.Region) } ec2 := ec2.New(auth, region) @@ -130,22 +130,22 @@ func (aws *AWSCloud) IPAddress(name string) (net.IP, error) { return nil, err } if len(resp.Reservations) == 0 { - return nil, fmt.Errorf("No reservations found for host: %s", name) + return nil, fmt.Errorf("no reservations found for host: %s", name) } if len(resp.Reservations) > 1 { - return nil, fmt.Errorf("Multiple reservations found for host: %s", name) + return nil, fmt.Errorf("multiple reservations found for host: %s", name) } if len(resp.Reservations[0].Instances) == 0 { - return nil, fmt.Errorf("No instances found for host: %s", name) + return nil, fmt.Errorf("no instances found for host: %s", name) } if len(resp.Reservations[0].Instances) > 1 { - return nil, fmt.Errorf("Multiple instances found for host: %s", name) + return nil, fmt.Errorf("multiple instances found for host: %s", name) } ipAddress := resp.Reservations[0].Instances[0].PrivateIpAddress ip := net.ParseIP(ipAddress) if ip == nil { - return nil, fmt.Errorf("Invalid network IP: %s", ipAddress) + return nil, fmt.Errorf("invalid network IP: %s", ipAddress) } return ip, nil } @@ -157,7 +157,7 @@ func (aws *AWSCloud) getInstancesByRegex(regex string) ([]string, error) { return []string{}, err } if resp == nil { - return []string{}, fmt.Errorf("No InstanceResp returned") + return []string{}, fmt.Errorf("no InstanceResp returned") } re, err := regexp.Compile(regex) diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go index bcff8148320..a3fde21749e 100644 --- a/pkg/cloudprovider/gce/gce.go +++ b/pkg/cloudprovider/gce/gce.go @@ -78,7 +78,7 @@ func getProjectAndZone() (string, string, error) { } parts := strings.Split(result, "/") if len(parts) != 4 { - return "", "", fmt.Errorf("Unexpected response: %s", result) + return "", "", fmt.Errorf("unexpected response: %s", result) } return parts[1], parts[3], nil } @@ -91,7 +91,7 @@ func getInstanceID() (string, error) { } parts := strings.Split(result, ".") if len(parts) == 0 { - return "", fmt.Errorf("Unexpected response: %s", result) + return "", fmt.Errorf("unexpected response: %s", result) } return parts[0], nil } @@ -266,7 +266,7 @@ func (gce *GCECloud) IPAddress(instance string) (net.IP, error) { } ip := net.ParseIP(res.NetworkInterfaces[0].AccessConfigs[0].NatIP) if ip == nil { - return nil, fmt.Errorf("Invalid network IP: %s", res.NetworkInterfaces[0].AccessConfigs[0].NatIP) + return nil, fmt.Errorf("invalid network IP: %s", res.NetworkInterfaces[0].AccessConfigs[0].NatIP) } return ip, nil } diff --git a/pkg/cloudprovider/openstack/openstack.go b/pkg/cloudprovider/openstack/openstack.go index 06bd07ddd43..bc2748acaf1 100644 --- a/pkg/cloudprovider/openstack/openstack.go +++ b/pkg/cloudprovider/openstack/openstack.go @@ -79,7 +79,7 @@ func (cfg Config) toAuthOptions() gophercloud.AuthOptions { func readConfig(config io.Reader) (Config, error) { if config == nil { - err := fmt.Errorf("No OpenStack cloud provider config file given") + err := fmt.Errorf("no OpenStack cloud provider config file given") return Config{}, err } diff --git a/pkg/cloudprovider/plugins.go b/pkg/cloudprovider/plugins.go index f982069a255..c8adb564ba8 100644 --- a/pkg/cloudprovider/plugins.go +++ b/pkg/cloudprovider/plugins.go @@ -85,7 +85,7 @@ func InitCloudProvider(name string, configFilePath string) Interface { cloud, err := GetCloudProvider(name, config) if err != nil { - glog.Fatalf("Couldn't init cloud provider %q: %#v", name, err) + glog.Fatalf("Couldn't init cloud provider %q: %v", name, err) } if cloud == nil { glog.Fatalf("Unknown cloud provider: %s", name) diff --git a/pkg/cloudprovider/vagrant/vagrant.go b/pkg/cloudprovider/vagrant/vagrant.go index 29cb8fa4a63..a15c1325170 100644 --- a/pkg/cloudprovider/vagrant/vagrant.go +++ b/pkg/cloudprovider/vagrant/vagrant.go @@ -116,7 +116,7 @@ func (v *VagrantCloud) IPAddress(instance string) (net.IP, error) { return net.ParseIP(minion.IP), nil } } - return nil, fmt.Errorf("Unable to find IP address for instance: %s", instance) + return nil, fmt.Errorf("unable to find IP address for instance: %s", instance) } // saltMinionsByRole filters a list of minions that have a matching role. diff --git a/pkg/controller/replication_controller.go b/pkg/controller/replication_controller.go index 666d3ac3dd2..0fdae06b179 100644 --- a/pkg/controller/replication_controller.go +++ b/pkg/controller/replication_controller.go @@ -204,7 +204,7 @@ func (rm *ReplicationManager) synchronize() { glog.V(4).Infof("periodic sync of %v", controllers[ix].Name) err := rm.syncHandler(controllers[ix]) if err != nil { - glog.Errorf("Error synchronizing: %#v", err) + glog.Errorf("Error synchronizing: %v", err) } }(ix) } diff --git a/pkg/conversion/converter.go b/pkg/conversion/converter.go index 7275a742e41..f66c866d804 100644 --- a/pkg/conversion/converter.go +++ b/pkg/conversion/converter.go @@ -218,7 +218,7 @@ func (c *Converter) Convert(src, dest interface{}, flags FieldMatchingFlags, met return err } if !dv.CanAddr() { - return fmt.Errorf("Can't write to dest") + return fmt.Errorf("can't write to dest") } sv, err := EnforcePtr(src) if err != nil { @@ -252,7 +252,7 @@ func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error { } if !scope.flags.IsSet(AllowDifferentFieldTypeNames) && c.NameFunc(dt) != c.NameFunc(st) { - return fmt.Errorf("Can't convert %v to %v because type names don't match (%v, %v).", st, dt, c.NameFunc(st), c.NameFunc(dt)) + return fmt.Errorf("can't convert %v to %v because type names don't match (%v, %v).", st, dt, c.NameFunc(st), c.NameFunc(dt)) } // This should handle all simple types. @@ -346,7 +346,7 @@ func (c *Converter) convert(sv, dv reflect.Value, scope *scope) error { dv.SetMapIndex(dk, dkv) } default: - return fmt.Errorf("Couldn't copy '%v' into '%v'", st, dt) + return fmt.Errorf("couldn't copy '%v' into '%v'", st, dt) } return nil } diff --git a/pkg/conversion/decode.go b/pkg/conversion/decode.go index 7d17c05d220..bf5dc16c5b9 100644 --- a/pkg/conversion/decode.go +++ b/pkg/conversion/decode.go @@ -115,7 +115,7 @@ func (s *Scheme) DecodeInto(data []byte, obj interface{}) error { } else { external, err := s.NewObject(dataVersion, dataKind) if err != nil { - return fmt.Errorf("Unable to create new object of type ('%s', '%s')", dataVersion, dataKind) + return fmt.Errorf("unable to create new object of type ('%s', '%s')", dataVersion, dataKind) } // yaml is a superset of json, so we use it to decode here. That way, // we understand both. diff --git a/pkg/conversion/scheme.go b/pkg/conversion/scheme.go index 9a3b005c6c2..f93ef42ca17 100644 --- a/pkg/conversion/scheme.go +++ b/pkg/conversion/scheme.go @@ -148,9 +148,9 @@ func (s *Scheme) NewObject(versionName, typeName string) (interface{}, error) { if t, ok := types[typeName]; ok { return reflect.New(t).Interface(), nil } - return nil, fmt.Errorf("No type '%v' for version '%v'", typeName, versionName) + return nil, fmt.Errorf("no type '%v' for version '%v'", typeName, versionName) } - return nil, fmt.Errorf("No version '%v'", versionName) + return nil, fmt.Errorf("no version '%v'", versionName) } // AddConversionFuncs adds functions to the list of conversion functions. The given @@ -276,7 +276,7 @@ func (s *Scheme) ObjectVersionAndKind(obj interface{}) (apiVersion, kind string, version, vOK := s.typeToVersion[t] kinds, kOK := s.typeToKind[t] if !vOK || !kOK { - return "", "", fmt.Errorf("Unregistered type: %v", t) + return "", "", fmt.Errorf("unregistered type: %v", t) } apiVersion = version kind = kinds[0] diff --git a/pkg/credentialprovider/gcp/metadata_test.go b/pkg/credentialprovider/gcp/metadata_test.go index e363e53a0df..9efccb139ee 100644 --- a/pkg/credentialprovider/gcp/metadata_test.go +++ b/pkg/credentialprovider/gcp/metadata_test.go @@ -184,7 +184,7 @@ func TestContainerRegistryBasics(t *testing.T) { w.Header().Set("Content-Type", "application/json") bytes, err := json.Marshal(token) if err != nil { - t.Fatalf("unexpected error: %+v", err) + t.Fatalf("unexpected error: %v", err) } fmt.Fprintln(w, string(bytes)) } else { diff --git a/pkg/health/exec.go b/pkg/health/exec.go index b14c5a66b61..352f09844de 100644 --- a/pkg/health/exec.go +++ b/pkg/health/exec.go @@ -40,7 +40,7 @@ func NewExecHealthChecker(runner CommandRunner) HealthChecker { func (e *ExecHealthChecker) HealthCheck(podFullName, podUUID string, currentState api.PodState, container api.Container) (Status, error) { if container.LivenessProbe.Exec == nil { - return Unknown, fmt.Errorf("Missing exec parameters") + return Unknown, fmt.Errorf("missing exec parameters") } data, err := e.runner.RunInContainer(podFullName, podUUID, container.Name, container.LivenessProbe.Exec.Command) glog.V(1).Infof("container %s failed health check: %s", podFullName, string(data)) diff --git a/pkg/kubecfg/kubecfg.go b/pkg/kubecfg/kubecfg.go index 26ee248d578..dd120b58bc2 100644 --- a/pkg/kubecfg/kubecfg.go +++ b/pkg/kubecfg/kubecfg.go @@ -40,7 +40,7 @@ import ( func GetServerVersion(client *client.Client) (*version.Info, error) { info, err := client.ServerVersion() if err != nil { - return nil, fmt.Errorf("Got error: %v", err) + return nil, err } return info, nil } @@ -100,7 +100,7 @@ func LoadNamespaceInfo(path string) (*NamespaceInfo, error) { // SaveNamespaceInfo saves a NamespaceInfo object at the specified file path. func SaveNamespaceInfo(path string, ns *NamespaceInfo) error { if !util.IsDNSLabel(ns.Namespace) { - return fmt.Errorf("Namespace %s is not a valid DNS Label", ns.Namespace) + return fmt.Errorf("namespace %s is not a valid DNS Label", ns.Namespace) } data, err := json.Marshal(ns) err = ioutil.WriteFile(path, data, 0600) @@ -193,7 +193,7 @@ func portsFromString(spec string) ([]api.Port, error) { pieces := strings.Split(part, ":") if len(pieces) < 1 || len(pieces) > 2 { glog.Infof("Bad port spec: %s", part) - return nil, fmt.Errorf("Bad port spec: %s", part) + return nil, fmt.Errorf("bad port spec: %s", part) } host := 0 container := 0 @@ -230,7 +230,7 @@ func portsFromString(spec string) ([]api.Port, error) { func RunController(ctx api.Context, image, name string, replicas int, client client.Interface, portSpec string, servicePort int) error { // TODO replace ctx with a namespace string if servicePort > 0 && !util.IsDNSLabel(name) { - return fmt.Errorf("Service creation requested, but an invalid name for a service was provided (%s). Service names must be valid DNS labels.", name) + return fmt.Errorf("service creation requested, but an invalid name for a service was provided (%s). Service names must be valid DNS labels.", name) } ports, err := portsFromString(portSpec) if err != nil { diff --git a/pkg/kubecfg/resource_printer.go b/pkg/kubecfg/resource_printer.go index 4b3ce61b7ef..1b445317358 100644 --- a/pkg/kubecfg/resource_printer.go +++ b/pkg/kubecfg/resource_printer.go @@ -123,16 +123,16 @@ func (h *HumanReadablePrinter) Handler(columns []string, printFunc interface{}) func (h *HumanReadablePrinter) validatePrintHandlerFunc(printFunc reflect.Value) error { if printFunc.Kind() != reflect.Func { - return fmt.Errorf("Invalid print handler. %#v is not a function.", printFunc) + return fmt.Errorf("invalid print handler. %#v is not a function.", printFunc) } funcType := printFunc.Type() if funcType.NumIn() != 2 || funcType.NumOut() != 1 { - return fmt.Errorf("Invalid print handler." + + return fmt.Errorf("invalid print handler." + "Must accept 2 parameters and return 1 value.") } if funcType.In(1) != reflect.TypeOf((*io.Writer)(nil)).Elem() || funcType.Out(0) != reflect.TypeOf((*error)(nil)).Elem() { - return fmt.Errorf("Invalid print handler. The expected signature is: "+ + return fmt.Errorf("invalid print handler. The expected signature is: "+ "func handler(obj %v, w io.Writer) error", funcType.In(0)) } return nil @@ -321,7 +321,7 @@ func (h *HumanReadablePrinter) PrintObj(obj runtime.Object, output io.Writer) er return resultValue.Interface().(error) } } else { - return fmt.Errorf("Error: unknown type %#v", obj) + return fmt.Errorf("unknown type %#v", obj) } } diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 67d5e779181..fe1bc246346 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -52,7 +52,7 @@ func NewFactory() *Factory { Describer: func(cmd *cobra.Command, mapping *meta.RESTMapping) (kubectl.Describer, error) { describer, ok := kubectl.DescriberFor(mapping.Kind, getKubeClient(cmd)) if !ok { - return nil, fmt.Errorf("No description has been implemented for %q", mapping.Kind) + return nil, fmt.Errorf("no description has been implemented for %q", mapping.Kind) } return describer, nil }, diff --git a/pkg/kubectl/cmd/get.go b/pkg/kubectl/cmd/get.go index 228ac8629b8..dcd4aca7a5c 100644 --- a/pkg/kubectl/cmd/get.go +++ b/pkg/kubectl/cmd/get.go @@ -79,7 +79,7 @@ Examples: // print the current object if !isWatchOnly { if err := printer.PrintObj(obj, out); err != nil { - checkErr(fmt.Errorf("Unable to output the provided object: %v", err)) + checkErr(fmt.Errorf("unable to output the provided object: %v", err)) } } diff --git a/pkg/kubectl/cmd/helpers.go b/pkg/kubectl/cmd/helpers.go index 9e7b6fd2106..a460c5e06ee 100644 --- a/pkg/kubectl/cmd/helpers.go +++ b/pkg/kubectl/cmd/helpers.go @@ -112,7 +112,7 @@ func GetFilesFromDir(directory string, fileType string) []string { // location or from stdin if location == "-". func ReadConfigData(location string) ([]byte, error) { if len(location) == 0 { - return nil, fmt.Errorf("Location given but empty") + return nil, fmt.Errorf("location given but empty") } if location == "-" { @@ -138,21 +138,21 @@ func ReadConfigDataFromLocation(location string) ([]byte, error) { if strings.Index(location, "http://") == 0 || strings.Index(location, "https://") == 0 { resp, err := http.Get(location) if err != nil { - return nil, fmt.Errorf("Unable to access URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to access URL %s: %v\n", location, err) } defer resp.Body.Close() if resp.StatusCode != 200 { - return nil, fmt.Errorf("Unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) + return nil, fmt.Errorf("unable to read URL, server reported %d %s", resp.StatusCode, resp.Status) } data, err := ioutil.ReadAll(resp.Body) if err != nil { - return nil, fmt.Errorf("Unable to read URL %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read URL %s: %v\n", location, err) } return data, nil } else { data, err := ioutil.ReadFile(location) if err != nil { - return nil, fmt.Errorf("Unable to read %s: %v\n", location, err) + return nil, fmt.Errorf("unable to read %s: %v\n", location, err) } return data, nil } diff --git a/pkg/kubectl/cmd/resource.go b/pkg/kubectl/cmd/resource.go index 8edaa2fd198..8072a47a362 100644 --- a/pkg/kubectl/cmd/resource.go +++ b/pkg/kubectl/cmd/resource.go @@ -60,7 +60,7 @@ func ResourceFromArgsOrFile(cmd *cobra.Command, args []string, filename string, mapping, namespace, name, _ = ResourceFromFile(filename, typer, mapper) if len(name) == 0 { - checkErr(fmt.Errorf("The resource in the provided file has no name (or ID) defined")) + checkErr(fmt.Errorf("the resource in the provided file has no name (or ID) defined")) } return @@ -132,7 +132,7 @@ func ResourceFromFile(filename string, typer runtime.ObjectTyper, mapper meta.RE // TODO: allow unversioned objects? if len(version) == 0 { - checkErr(fmt.Errorf("The resource in the provided file has no apiVersion defined")) + checkErr(fmt.Errorf("the resource in the provided file has no apiVersion defined")) } mapping, err = mapper.RESTMapping(version, kind) @@ -156,7 +156,7 @@ func ResourceFromFile(filename string, typer runtime.ObjectTyper, mapper meta.RE func CompareNamespaceFromFile(cmd *cobra.Command, namespace string) error { defaultNamespace := getKubeNamespace(cmd) if defaultNamespace != namespace { - return fmt.Errorf("The namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace) + return fmt.Errorf("the namespace from the provided file %q does not match the namespace %q. You must pass '--namespace=%s' to perform this operation.", namespace, defaultNamespace, namespace) } return nil } diff --git a/pkg/kubelet/config/http.go b/pkg/kubelet/config/http.go index 4ca0e9c3959..048f181c793 100644 --- a/pkg/kubelet/config/http.go +++ b/pkg/kubelet/config/http.go @@ -52,7 +52,7 @@ func NewSourceURL(url string, period time.Duration, updates chan<- interface{}) func (s *SourceURL) run() { if err := s.extractFromURL(); err != nil { - glog.Errorf("Failed to read URL: %s", err) + glog.Errorf("Failed to read URL: %v", err) } } diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index f14cb616168..2eef06aac36 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -99,7 +99,7 @@ var dockerVersionWithExec = []uint{1, 1, 3} func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error) { env, err := d.client.Version() if err != nil { - return nil, fmt.Errorf("failed to get docker server version - %s", err) + return nil, fmt.Errorf("failed to get docker server version - %v", err) } version := []uint{} for _, entry := range *env { @@ -108,7 +108,7 @@ func (d *dockerContainerCommandRunner) getDockerServerVersion() ([]uint, error) for _, elem := range elems { val, err := strconv.ParseUint(elem, 10, 32) if err != nil { - return nil, fmt.Errorf("failed to parse docker server version (%s) - %s", entry, err) + return nil, fmt.Errorf("failed to parse docker server version %q: %v", entry, err) } version = append(version, uint(val)) } @@ -169,7 +169,7 @@ func (d *dockerContainerCommandRunner) RunInContainer(containerID string, cmd [] } execObj, err := d.client.CreateExec(createOpts) if err != nil { - return nil, fmt.Errorf("failed to run in container - Exec setup failed - %s", err) + return nil, fmt.Errorf("failed to run in container - Exec setup failed - %v", err) } var buf bytes.Buffer wrBuf := bufio.NewWriter(&buf) @@ -403,7 +403,7 @@ func inspectContainer(client DockerInterface, dockerID, containerName, tPath str if found { data, err := ioutil.ReadFile(path) if err != nil { - glog.Errorf("Error on reading termination-log %s(%v)", path, err) + glog.Errorf("Error on reading termination-log %s: %v", path, err) } else { containerStatus.State.Termination.Message = string(data) } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 41030e9e828..6a248558562 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -479,12 +479,12 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod if len(container.TerminationMessagePath) != 0 { p := path.Join(kl.rootDirectory, pod.Name, container.Name) if err := os.MkdirAll(p, 0750); err != nil { - glog.Errorf("Error on creating %s(%v)", p, err) + glog.Errorf("Error on creating %s: %v", p, err) } else { containerLogPath := path.Join(p, dockerContainer.ID) fs, err := os.Create(containerLogPath) if err != nil { - glog.Errorf("Error on creating termination-log file: %s(%v)", containerLogPath, err) + glog.Errorf("Error on creating termination-log file %s: %v", containerLogPath, err) } defer fs.Close() b := fmt.Sprintf("%s:%s", containerLogPath, container.TerminationMessagePath) @@ -495,7 +495,7 @@ func (kl *Kubelet) runContainer(pod *api.BoundPod, container *api.Container, pod if capabilities.Get().AllowPrivileged { privileged = container.Privileged } else if container.Privileged { - return "", fmt.Errorf("Container requested privileged mode, but it is disallowed globally.") + return "", fmt.Errorf("container requested privileged mode, but it is disallowed globally.") } err = kl.dockerClient.StartContainer(dockerContainer.ID, &docker.HostConfig{ PortBindings: portBindings, @@ -606,7 +606,7 @@ func (kl *Kubelet) killContainersInPod(pod *api.BoundPod, dockerContainers docke go func() { err := kl.killContainer(dockerContainer) if err != nil { - glog.Errorf("Failed to delete container. (%v) Skipping pod %s", err, podFullName) + glog.Errorf("Failed to delete container: %v; Skipping pod %s", err, podFullName) errs <- err } wg.Done() @@ -645,7 +645,7 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, dockerContainers dockertools.Docke } netID, err = kl.createNetworkContainer(pod) if err != nil { - glog.Errorf("Failed to introspect network container. (%v) Skipping pod %s", err, podFullName) + glog.Errorf("Failed to introspect network container: %v; Skipping pod %s", err, podFullName) return err } if count > 0 { @@ -661,7 +661,7 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, dockerContainers dockertools.Docke podVolumes, err := kl.mountExternalVolumes(pod) if err != nil { - glog.Errorf("Unable to mount volumes for pod %s: (%v), skipping pod", podFullName, err) + glog.Errorf("Unable to mount volumes for pod %s: %v; skipping pod", podFullName, err) return err } @@ -748,7 +748,7 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, dockerContainers dockertools.Docke if ref != nil { record.Eventf(ref, "failed", "failed", "Failed to inspect image %s", container.Image) } - glog.Errorf("Failed to inspect image: %s: %#v skipping pod %s container %s", container.Image, err, podFullName, container.Name) + glog.Errorf("Failed to inspect image %s: %v; skipping pod %s container %s", container.Image, err, podFullName, container.Name) continue } if api.IsPullAlways(container.ImagePullPolicy) || @@ -758,7 +758,7 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, dockerContainers dockertools.Docke record.Eventf(ref, "failed", "failed", "Failed to pull image %s", container.Image) } - glog.Errorf("Failed to pull image %s: %v skipping pod %s container %s.", container.Image, err, podFullName, container.Name) + glog.Errorf("Failed to pull image %s: %v; skipping pod %s container %s.", container.Image, err, podFullName, container.Name) continue } if ref != nil { @@ -828,7 +828,7 @@ func (kl *Kubelet) reconcileVolumes(pods []api.BoundPod) error { //TODO (jonesdl) This should not block other kubelet synchronization procedures err := vol.TearDown() if err != nil { - glog.Errorf("Could not tear down volume %s (%s)", name, err) + glog.Errorf("Could not tear down volume %s: %v", name, err) } } } @@ -865,7 +865,7 @@ func (kl *Kubelet) SyncPods(pods []api.BoundPod) error { kl.podWorkers.Run(podFullName, func() { err := kl.syncPod(pod, dockerContainers) if err != nil { - glog.Errorf("Error syncing pod, skipping: %s", err) + glog.Errorf("Error syncing pod, skipping: %v", err) } }) } @@ -883,7 +883,7 @@ func (kl *Kubelet) SyncPods(pods []api.BoundPod) error { glog.V(1).Infof("Killing unwanted container %+v", pc) err = kl.killContainer(container) if err != nil { - glog.Errorf("Error killing container %+v: %s", pc, err) + glog.Errorf("Error killing container %+v: %v", pc, err) } } } @@ -924,7 +924,7 @@ func filterHostPortConflicts(pods []api.BoundPod) []api.BoundPod { for i := range pods { pod := &pods[i] if errs := validation.AccumulateUniquePorts(pod.Spec.Containers, ports, extract); len(errs) != 0 { - glog.Warningf("Pod %s: HostPort is already allocated, ignoring: %s", GetPodFullName(pod), errs) + glog.Warningf("Pod %s: HostPort is already allocated, ignoring: %v", GetPodFullName(pod), errs) continue } filtered = append(filtered, *pod) @@ -964,7 +964,7 @@ func (kl *Kubelet) syncLoop(updates <-chan PodUpdate, handler SyncHandler) { err := handler.SyncPods(kl.pods) if err != nil { - glog.Errorf("Couldn't sync containers: %s", err) + glog.Errorf("Couldn't sync containers: %v", err) } } } @@ -974,7 +974,7 @@ func (kl *Kubelet) syncLoop(updates <-chan PodUpdate, handler SyncHandler) { func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName, tail string, follow bool, stdout, stderr io.Writer) error { _, err := kl.GetPodInfo(podFullName, "") if err == dockertools.ErrNoContainersInPod { - return fmt.Errorf("Pod not found (%s)\n", podFullName) + return fmt.Errorf("pod not found (%s)\n", podFullName) } dockerContainers, err := dockertools.GetKubeletDockerContainers(kl.dockerClient, true) if err != nil { @@ -982,7 +982,7 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName, tail stri } dockerContainer, found, _ := dockerContainers.FindPodContainer(podFullName, "", containerName) if !found { - return fmt.Errorf("Container not found (%s)\n", containerName) + return fmt.Errorf("container not found (%s)\n", containerName) } return dockertools.GetKubeletDockerContainerLogs(kl.dockerClient, dockerContainer.ID, tail, follow, stdout, stderr) } diff --git a/pkg/kubelet/server.go b/pkg/kubelet/server.go index 784e48db683..b77f6ca2526 100644 --- a/pkg/kubelet/server.go +++ b/pkg/kubelet/server.go @@ -218,7 +218,7 @@ func (s *Server) handleContainerLogs(w http.ResponseWriter, req *http.Request) { if flusher, ok := fw.writer.(http.Flusher); ok { fw.flusher = flusher } else { - s.error(w, fmt.Errorf("Unable to convert %v into http.Flusher", fw)) + s.error(w, fmt.Errorf("unable to convert %v into http.Flusher", fw)) } w.Header().Set("Transfer-Encoding", "chunked") w.WriteHeader(http.StatusOK) diff --git a/pkg/master/publish.go b/pkg/master/publish.go index a7f7154cebb..912656422da 100644 --- a/pkg/master/publish.go +++ b/pkg/master/publish.go @@ -102,7 +102,7 @@ func (m *Master) createMasterServiceIfNeeded(serviceName string, port int) error // If all worked, we get back an *api.Service object. return nil } - return fmt.Errorf("Unexpected response: %#v", resp) + return fmt.Errorf("unexpected response: %#v", resp) } // ensureEndpointsContain sets the endpoints for the given service. Also removes diff --git a/pkg/proxy/config/etcd.go b/pkg/proxy/config/etcd.go index 640c2845cfa..b03eb75753a 100644 --- a/pkg/proxy/config/etcd.go +++ b/pkg/proxy/config/etcd.go @@ -135,7 +135,7 @@ func (s ConfigSourceEtcd) decodeServices(node *etcd.Node, retServices []api.Serv var svc api.Service err := latest.Codec.DecodeInto([]byte(node.Value), &svc) if err != nil { - glog.Errorf("Failed to load Service: %s (%#v)", node.Value, err) + glog.Errorf("Failed to load Service: %s (%v)", node.Value, err) } else { // so we got a service we can handle, and now get endpoints retServices = append(retServices, svc) @@ -182,7 +182,7 @@ func (s ConfigSourceEtcd) GetEndpoints(namespace, service string) (api.Endpoints key := path.Join(registryRoot, "endpoints", namespace, service) response, err := s.client.Get(key, true, false) if err != nil { - glog.Errorf("Failed to get the key: %s %v", key, err) + glog.Errorf("Failed to get the key %q: %v", key, err) return api.Endpoints{}, err } // Parse all the endpoint specifications in this value. @@ -256,7 +256,7 @@ func (s ConfigSourceEtcd) ProcessEndpointResponse(response *etcd.Response) { var endpoints api.Endpoints err := latest.Codec.DecodeInto([]byte(response.Node.Value), &endpoints) if err != nil { - glog.Errorf("Failed to parse service out of etcd key: %v : %+v", response.Node.Value, err) + glog.Errorf("Failed to parse service out of etcd key: %v : %v", response.Node.Value, err) return } endpointsUpdate := EndpointsUpdate{Op: ADD, Endpoints: []api.Endpoints{endpoints}} diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go index 0e2ae60367f..48e9f9b0b70 100644 --- a/pkg/proxy/proxier.go +++ b/pkg/proxy/proxier.go @@ -82,7 +82,7 @@ func tryConnect(service string, srcAddr net.Addr, protocol string, proxier *Prox for _, retryTimeout := range endpointDialTimeout { endpoint, err := proxier.loadBalancer.NextEndpoint(service, srcAddr) if err != nil { - glog.Errorf("Couldn't find an endpoint for %s %v", service, err) + glog.Errorf("Couldn't find an endpoint for %s: %v", service, err) return nil, err } glog.V(3).Infof("Mapped service %q to endpoint %s", service, endpoint) @@ -296,7 +296,7 @@ func newProxySocket(protocol api.Protocol, ip net.IP, port int) (proxySocket, er } return &udpProxySocket{conn}, nil } - return nil, fmt.Errorf("Unknown protocol %q", protocol) + return nil, fmt.Errorf("unknown protocol %q", protocol) } // Proxier is a simple proxy for TCP connections between a localhost:lport @@ -316,13 +316,13 @@ func NewProxier(loadBalancer LoadBalancer, listenAddress net.IP, iptables iptabl glog.Infof("Initializing iptables") // Set up the iptables foundations we need. if err := iptablesInit(iptables); err != nil { - glog.Errorf("Failed to initialize iptables: %s", err) + glog.Errorf("Failed to initialize iptables: %v", err) return nil } // Flush old iptables rules (since the bound ports will be invalid after a restart). // When OnUpdate() is first called, the rules will be recreated. if err := iptablesFlush(iptables); err != nil { - glog.Errorf("Failed to flush iptables: %s", err) + glog.Errorf("Failed to flush iptables: %v", err) return nil } return &Proxier{ @@ -343,7 +343,7 @@ func (proxier *Proxier) SyncLoop() { case <-time.After(syncInterval): glog.V(2).Infof("Periodic sync") if err := iptablesInit(proxier.iptables); err != nil { - glog.Errorf("Failed to ensure iptables: %s", err) + glog.Errorf("Failed to ensure iptables: %v", err) } proxier.ensurePortals() } @@ -358,7 +358,7 @@ func (proxier *Proxier) ensurePortals() { for name, info := range proxier.serviceMap { err := proxier.openPortal(name, info) if err != nil { - glog.Errorf("Failed to ensure portal for %q: %s", name, err) + glog.Errorf("Failed to ensure portal for %q: %v", name, err) } } } @@ -449,17 +449,17 @@ func (proxier *Proxier) OnUpdate(services []api.Service) { glog.V(4).Infof("Something changed for service %q: stopping it", service.Name) err := proxier.closePortal(service.Name, info) if err != nil { - glog.Errorf("Failed to close portal for %q: %s", service.Name, err) + glog.Errorf("Failed to close portal for %q: %v", service.Name, err) } err = proxier.stopProxy(service.Name, info) if err != nil { - glog.Errorf("Failed to stop service %q: %s", service.Name, err) + glog.Errorf("Failed to stop service %q: %v", service.Name, err) } } glog.V(1).Infof("Adding new service %q at %s:%d/%s (local :%d)", service.Name, serviceIP, service.Spec.Port, service.Spec.Protocol, service.Spec.ProxyPort) info, err := proxier.addServiceOnPort(service.Name, service.Spec.Protocol, service.Spec.ProxyPort, udpIdleTimeout) if err != nil { - glog.Errorf("Failed to start proxy for %q: %+v", service.Name, err) + glog.Errorf("Failed to start proxy for %q: %v", service.Name, err) continue } info.portalIP = serviceIP @@ -469,7 +469,7 @@ func (proxier *Proxier) OnUpdate(services []api.Service) { } err = proxier.openPortal(service.Name, info) if err != nil { - glog.Errorf("Failed to open portal for %q: %s", service.Name, err) + glog.Errorf("Failed to open portal for %q: %v", service.Name, err) } } proxier.mu.Lock() @@ -479,11 +479,11 @@ func (proxier *Proxier) OnUpdate(services []api.Service) { glog.V(1).Infof("Stopping service %q", name) err := proxier.closePortal(name, info) if err != nil { - glog.Errorf("Failed to close portal for %q: %s", name, err) + glog.Errorf("Failed to close portal for %q: %v", name, err) } err = proxier.stopProxyInternal(name, info) if err != nil { - glog.Errorf("Failed to stop service %q: %s", name, err) + glog.Errorf("Failed to stop service %q: %v", name, err) } } } diff --git a/pkg/proxy/udp_server.go b/pkg/proxy/udp_server.go index c5489a49f20..b84eb4ddb09 100644 --- a/pkg/proxy/udp_server.go +++ b/pkg/proxy/udp_server.go @@ -31,7 +31,7 @@ func (r *udpEchoServer) Loop() { for { n, cliAddr, err := r.ReadFrom(buffer[0:]) if err != nil { - fmt.Printf("ReadFrom failed: %#v\n", err) + fmt.Printf("ReadFrom failed: %v\n", err) continue } r.WriteTo(buffer[0:n], cliAddr) diff --git a/pkg/registry/binding/rest.go b/pkg/registry/binding/rest.go index 47c40b6a295..4a2350f0f9d 100644 --- a/pkg/registry/binding/rest.go +++ b/pkg/registry/binding/rest.go @@ -76,5 +76,5 @@ func (b *REST) Create(ctx api.Context, obj runtime.Object) (<-chan apiserver.RES // Update returns an error-- this object may not be updated. func (b *REST) Update(ctx api.Context, obj runtime.Object) (<-chan apiserver.RESTResult, error) { - return nil, fmt.Errorf("Bindings may not be changed.") + return nil, fmt.Errorf("bindings may not be changed.") } diff --git a/pkg/registry/etcd/etcd.go b/pkg/registry/etcd/etcd.go index da23454ac1f..a5dcea616e4 100644 --- a/pkg/registry/etcd/etcd.go +++ b/pkg/registry/etcd/etcd.go @@ -77,10 +77,10 @@ func MakeEtcdItemKey(ctx api.Context, prefix string, id string) (string, error) key := MakeEtcdListKey(ctx, prefix) ns, ok := api.NamespaceFrom(ctx) if !ok || len(ns) == 0 { - return "", fmt.Errorf("Invalid request. Namespace parameter required.") + return "", fmt.Errorf("invalid request. Namespace parameter required.") } if len(id) == 0 { - return "", fmt.Errorf("Invalid request. Id parameter required.") + return "", fmt.Errorf("invalid request. Id parameter required.") } key = key + "/" + id return key, nil @@ -212,7 +212,7 @@ func (r *Registry) assignPod(ctx api.Context, podID string, machine string) erro boundPodList := in.(*api.BoundPods) boundPodList.Items = append(boundPodList.Items, *boundPod) if !constraint.Allowed(boundPodList.Items) { - return nil, fmt.Errorf("The assignment would cause a constraint violation") + return nil, fmt.Errorf("the assignment would cause a constraint violation") } return boundPodList, nil }) @@ -268,7 +268,7 @@ func (r *Registry) UpdatePod(ctx api.Context, pod *api.Pod) error { } // This really shouldn't happen glog.Warningf("Couldn't find: %s in %#v", pod.Name, boundPods) - return boundPods, fmt.Errorf("Failed to update pod, couldn't find %s in %#v", pod.Name, boundPods) + return boundPods, fmt.Errorf("failed to update pod, couldn't find %s in %#v", pod.Name, boundPods) }) } diff --git a/pkg/registry/minion/healthy_registry.go b/pkg/registry/minion/healthy_registry.go index ea6895806db..92b6900864c 100644 --- a/pkg/registry/minion/healthy_registry.go +++ b/pkg/registry/minion/healthy_registry.go @@ -75,7 +75,7 @@ func (r *HealthyRegistry) ListMinions(ctx api.Context) (currentMinions *api.Mini for _, minion := range list.Items { status, err := r.client.HealthCheck(minion.Name) if err != nil { - glog.V(1).Infof("%#v failed health check with error: %s", minion, err) + glog.V(1).Infof("%#v failed health check with error: %v", minion, err) continue } if status == health.Healthy { diff --git a/pkg/registry/pod/rest.go b/pkg/registry/pod/rest.go index ac7a8630aa6..416c8eab768 100644 --- a/pkg/registry/pod/rest.go +++ b/pkg/registry/pod/rest.go @@ -207,14 +207,14 @@ func (rs *REST) fillPodInfo(pod *api.Pod) { info, err := rs.podCache.GetPodInfo(pod.Status.Host, pod.Namespace, pod.Name) if err != nil { if err != client.ErrPodInfoNotAvailable { - glog.Errorf("Error getting container info from cache: %#v", err) + glog.Errorf("Error getting container info from cache: %v", err) } if rs.podInfoGetter != nil { info, err = rs.podInfoGetter.GetPodInfo(pod.Status.Host, pod.Namespace, pod.Name) } if err != nil { if err != client.ErrPodInfoNotAvailable { - glog.Errorf("Error getting fresh container info: %#v", err) + glog.Errorf("Error getting fresh container info: %v", err) } return } @@ -258,7 +258,7 @@ func getInstanceIPFromCloud(cloud cloudprovider.Interface, host string) string { } addr, err := instances.IPAddress(host) if err != nil { - glog.Errorf("Error getting instance IP for %q: %#v", host, err) + glog.Errorf("Error getting instance IP for %q: %v", host, err) return "" } return addr.String() diff --git a/pkg/registry/service/rest.go b/pkg/registry/service/rest.go index c0d236119c6..8b518be8e3e 100644 --- a/pkg/registry/service/rest.go +++ b/pkg/registry/service/rest.go @@ -65,7 +65,7 @@ func reloadIPsFromStorage(ipa *ipAllocator, registry Registry) { services, err := registry.ListServices(api.NewContext()) if err != nil { // This is really bad. - glog.Errorf("can't list services to init service REST: %s", err) + glog.Errorf("can't list services to init service REST: %v", err) return } for i := range services.Items { @@ -76,7 +76,7 @@ func reloadIPsFromStorage(ipa *ipAllocator, registry Registry) { } if err := ipa.Allocate(net.ParseIP(service.Spec.PortalIP)); err != nil { // This is really bad. - glog.Errorf("service %q PortalIP %s could not be allocated: %s", service.Name, service.Spec.PortalIP, err) + glog.Errorf("service %q PortalIP %s could not be allocated: %v", service.Name, service.Spec.PortalIP, err) } } } @@ -119,11 +119,11 @@ func (rs *REST) Create(ctx api.Context, obj runtime.Object) (<-chan apiserver.RE } balancer, ok := rs.cloud.TCPLoadBalancer() if !ok { - return nil, fmt.Errorf("The cloud provider does not support external TCP load balancers.") + return nil, fmt.Errorf("the cloud provider does not support external TCP load balancers.") } zones, ok := rs.cloud.Zones() if !ok { - return nil, fmt.Errorf("The cloud provider does not support zone enumeration.") + return nil, fmt.Errorf("the cloud provider does not support zone enumeration.") } hosts, err := rs.machines.ListMinions(ctx) if err != nil { diff --git a/pkg/registry/service/rest_test.go b/pkg/registry/service/rest_test.go index 843f059b4a0..9d8430c7d7d 100644 --- a/pkg/registry/service/rest_test.go +++ b/pkg/registry/service/rest_test.go @@ -711,7 +711,7 @@ func TestCreateServiceWithConflictingNamespace(t *testing.T) { if err == nil { t.Errorf("Expected an error, but we didn't get one") } else if strings.Index(err.Error(), "Service.Namespace does not match the provided context") == -1 { - t.Errorf("Expected 'Service.Namespace does not match the provided context' error, got '%v'", err.Error()) + t.Errorf("Expected 'Service.Namespace does not match the provided context' error, got '%s'", err.Error()) } } @@ -729,6 +729,6 @@ func TestUpdateServiceWithConflictingNamespace(t *testing.T) { if err == nil { t.Errorf("Expected an error, but we didn't get one") } else if strings.Index(err.Error(), "Service.Namespace does not match the provided context") == -1 { - t.Errorf("Expected 'Service.Namespace does not match the provided context' error, got '%v'", err.Error()) + t.Errorf("Expected 'Service.Namespace does not match the provided context' error, got '%s'", err.Error()) } } diff --git a/pkg/service/endpoints_controller.go b/pkg/service/endpoints_controller.go index 08fafa7de15..0ff355bff98 100644 --- a/pkg/service/endpoints_controller.go +++ b/pkg/service/endpoints_controller.go @@ -86,7 +86,7 @@ func (e *EndpointController) SyncServiceEndpoints() error { }, } } else { - glog.Errorf("Error getting endpoints: %#v", err) + glog.Errorf("Error getting endpoints: %v", err) continue } } @@ -106,7 +106,7 @@ func (e *EndpointController) SyncServiceEndpoints() error { _, err = e.client.Endpoints(service.Namespace).Update(newEndpoints) } if err != nil { - glog.Errorf("Error updating endpoints: %#v", err) + glog.Errorf("Error updating endpoints: %v", err) continue } } diff --git a/pkg/tools/etcd_tools.go b/pkg/tools/etcd_tools.go index c0dbf2bfcbf..89dec805fff 100644 --- a/pkg/tools/etcd_tools.go +++ b/pkg/tools/etcd_tools.go @@ -378,7 +378,7 @@ func checkEtcd(host string) error { return err } if !strings.HasPrefix("etcd", string(body)) { - return fmt.Errorf("Unknown server: %s", string(body)) + return fmt.Errorf("unknown server: %s", string(body)) } return nil } diff --git a/pkg/tools/etcd_tools_watch.go b/pkg/tools/etcd_tools_watch.go index 8921b921462..c736fec3059 100644 --- a/pkg/tools/etcd_tools_watch.go +++ b/pkg/tools/etcd_tools_watch.go @@ -167,7 +167,7 @@ func etcdGetInitialWatchState(client EtcdGetSet, key string, recursive bool, inc resp, err := client.Get(key, false, recursive) if err != nil { if !IsEtcdNotFound(err) { - glog.Errorf("watch was unable to retrieve the current index for the provided key: %v (%#v)", err, key) + glog.Errorf("watch was unable to retrieve the current index for the provided key (%q): %v", key, err) return resourceVersion, err } if index, ok := etcdErrorIndex(err); ok { diff --git a/pkg/ui/datafile.go b/pkg/ui/datafile.go index c89760cff3a..5e1c765cd8f 100644 --- a/pkg/ui/datafile.go +++ b/pkg/ui/datafile.go @@ -27,7 +27,7 @@ import ( func bindata_read(data []byte, name string) ([]byte, error) { gz, err := gzip.NewReader(bytes.NewBuffer(data)) if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } var buf bytes.Buffer @@ -35,7 +35,7 @@ func bindata_read(data []byte, name string) ([]byte, error) { gz.Close() if err != nil { - return nil, fmt.Errorf("Read %q: %v", name, err) + return nil, fmt.Errorf("read %q: %v", name, err) } return buf.Bytes(), nil @@ -2694,7 +2694,7 @@ func Asset(name string) ([]byte, error) { if f, ok := _bindata[cannonicalName]; ok { return f() } - return nil, fmt.Errorf("Asset %s not found", name) + return nil, fmt.Errorf("asset %s not found", name) } // AssetNames returns the names of the assets. @@ -2739,12 +2739,12 @@ func AssetDir(name string) ([]string, error) { for _, p := range pathList { node = node.Children[p] if node == nil { - return nil, fmt.Errorf("Asset %s not found", name) + return nil, fmt.Errorf("asset %s not found", name) } } } if node.Func != nil { - return nil, fmt.Errorf("Asset %s not found", name) + return nil, fmt.Errorf("asset %s not found", name) } rv := make([]string, 0, len(node.Children)) for name := range node.Children { diff --git a/pkg/util/exec/exec_test.go b/pkg/util/exec/exec_test.go index 41bc70a76a1..34b84297d8f 100644 --- a/pkg/util/exec/exec_test.go +++ b/pkg/util/exec/exec_test.go @@ -26,7 +26,7 @@ func TestExecutorNoArgs(t *testing.T) { cmd := ex.Command("true") out, err := cmd.CombinedOutput() if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if len(out) != 0 { t.Errorf("expected no output, got %q", string(out)) diff --git a/pkg/util/fake_handler.go b/pkg/util/fake_handler.go index c9041f5da46..4ec43b3bfb4 100644 --- a/pkg/util/fake_handler.go +++ b/pkg/util/fake_handler.go @@ -68,7 +68,7 @@ func (f *FakeHandler) ServeHTTP(response http.ResponseWriter, request *http.Requ bodyReceived, err := ioutil.ReadAll(request.Body) if err != nil && f.T != nil { - f.T.Logf("Received read error: %#v", err) + f.T.Logf("Received read error: %v", err) } f.RequestBody = string(bodyReceived) } diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index 96daac7b6f2..cdb4e11c865 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -89,7 +89,7 @@ func (runner *runner) EnsureChain(table Table, chain Chain) (bool, error) { return true, nil } } - return false, fmt.Errorf("error creating chain %q: %s: %s", chain, err, out) + return false, fmt.Errorf("error creating chain %q: %v: %s", chain, err, out) } return false, nil } @@ -103,7 +103,7 @@ func (runner *runner) FlushChain(table Table, chain Chain) error { out, err := runner.run(opFlushChain, fullArgs) if err != nil { - return fmt.Errorf("error flushing chain %q: %s: %s", chain, err, out) + return fmt.Errorf("error flushing chain %q: %v: %s", chain, err, out) } return nil } @@ -124,7 +124,7 @@ func (runner *runner) EnsureRule(table Table, chain Chain, args ...string) (bool } out, err := runner.run(opAppendRule, fullArgs) if err != nil { - return false, fmt.Errorf("error appending rule: %s: %s", err, out) + return false, fmt.Errorf("error appending rule: %v: %s", err, out) } return false, nil } @@ -145,7 +145,7 @@ func (runner *runner) DeleteRule(table Table, chain Chain, args ...string) error } out, err := runner.run(opDeleteRule, fullArgs) if err != nil { - return fmt.Errorf("error deleting rule: %s: %s", err, out) + return fmt.Errorf("error deleting rule: %v: %s", err, out) } return nil } @@ -191,7 +191,7 @@ func (runner *runner) checkRule(table Table, chain Chain, args ...string) (bool, func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) { out, err := runner.exec.Command("iptables-save", "-t", string(table)).CombinedOutput() if err != nil { - return false, fmt.Errorf("error checking rule: %s", err) + return false, fmt.Errorf("error checking rule: %v", err) } argset := util.NewStringSet(args...) @@ -225,7 +225,7 @@ func (runner *runner) checkRuleUsingCheck(args []string) (bool, error) { return false, nil } } - return false, fmt.Errorf("error checking rule: %s: %s", err, out) + return false, fmt.Errorf("error checking rule: %v: %s", err, out) } type operation string @@ -263,7 +263,7 @@ func extractIptablesVersion(str string) (int, int, int, error) { versionMatcher := regexp.MustCompile("v([0-9]+)\\.([0-9]+)\\.([0-9]+)") result := versionMatcher.FindStringSubmatch(str) if result == nil { - return 0, 0, 0, fmt.Errorf("No iptables version found in string: %s", str) + return 0, 0, 0, fmt.Errorf("no iptables version found in string: %s", str) } v1, err := strconv.Atoi(result[1]) diff --git a/pkg/util/iptables/iptables_test.go b/pkg/util/iptables/iptables_test.go index 30704eaffce..ed7dc26b204 100644 --- a/pkg/util/iptables/iptables_test.go +++ b/pkg/util/iptables/iptables_test.go @@ -55,7 +55,7 @@ func testEnsureChain(t *testing.T, protocol Protocol) { // Success. exists, err := runner.EnsureChain(TableNAT, Chain("FOOBAR")) if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if exists { t.Errorf("expected exists = false") @@ -70,7 +70,7 @@ func testEnsureChain(t *testing.T, protocol Protocol) { // Exists. exists, err = runner.EnsureChain(TableNAT, Chain("FOOBAR")) if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if !exists { t.Errorf("expected exists = true") @@ -109,7 +109,7 @@ func TestFlushChain(t *testing.T) { // Success. err := runner.FlushChain(TableNAT, Chain("FOOBAR")) if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if fcmd.CombinedOutputCalls != 1 { t.Errorf("expected 1 CombinedOutput() call, got %d", fcmd.CombinedOutputCalls) @@ -144,7 +144,7 @@ func TestEnsureRuleAlreadyExists(t *testing.T) { runner := New(&fexec, ProtocolIpv4) exists, err := runner.EnsureRule(TableNAT, ChainOutput, "abc", "123") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if !exists { t.Errorf("expected exists = true") @@ -180,7 +180,7 @@ func TestEnsureRuleNew(t *testing.T) { runner := New(&fexec, ProtocolIpv4) exists, err := runner.EnsureRule(TableNAT, ChainOutput, "abc", "123") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if exists { t.Errorf("expected exists = false") @@ -270,7 +270,7 @@ func TestDeleteRuleAlreadyExists(t *testing.T) { runner := New(&fexec, ProtocolIpv4) err := runner.DeleteRule(TableNAT, ChainOutput, "abc", "123") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if fcmd.CombinedOutputCalls != 2 { t.Errorf("expected 2 CombinedOutput() call, got %d", fcmd.CombinedOutputCalls) @@ -303,7 +303,7 @@ func TestDeleteRuleNew(t *testing.T) { runner := New(&fexec, ProtocolIpv4) err := runner.DeleteRule(TableNAT, ChainOutput, "abc", "123") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if fcmd.CombinedOutputCalls != 3 { t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls) @@ -488,7 +488,7 @@ COMMIT runner := &runner{exec: &fexec} exists, err := runner.checkRuleWithoutCheck(TableNAT, ChainPrerouting, "-m", "addrtype", "-j", "DOCKER", "--dst-type", "LOCAL") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if !exists { t.Errorf("expected exists = true") @@ -526,7 +526,7 @@ COMMIT runner := &runner{exec: &fexec} exists, err := runner.checkRuleWithoutCheck(TableNAT, ChainPrerouting, "-m", "addrtype", "-j", "DOCKER") if err != nil { - t.Errorf("expected success, got %+v", err) + t.Errorf("expected success, got %v", err) } if exists { t.Errorf("expected exists = false") diff --git a/pkg/volume/volume.go b/pkg/volume/volume.go index 24dfdcf5127..fcf53870f47 100644 --- a/pkg/volume/volume.go +++ b/pkg/volume/volume.go @@ -131,7 +131,7 @@ func (g *GitDir) SetUp() error { } if len(files) != 1 { - return fmt.Errorf("Unexpected directory contents: %v", files) + return fmt.Errorf("unexpected directory contents: %v", files) } dir := path.Join(g.GetPath(), files[0].Name()) if _, err := g.ExecCommand("git", []string{"checkout", g.Revision}, dir); err != nil { @@ -389,7 +389,7 @@ func GetCurrentVolumes(rootDirectory string) map[string]Cleaner { currentVolumes := make(map[string]Cleaner) podIDDirs, err := ioutil.ReadDir(rootDirectory) if err != nil { - glog.Errorf("Could not read directory: %s, (%s)", rootDirectory, err) + glog.Errorf("Could not read directory %s: %v", rootDirectory, err) } // Volume information is extracted from the directory structure: // (ROOT_DIR)/(POD_ID)/volumes/(VOLUME_KIND)/(VOLUME_NAME) @@ -404,14 +404,14 @@ func GetCurrentVolumes(rootDirectory string) map[string]Cleaner { } volumeKindDirs, err := ioutil.ReadDir(podIDPath) if err != nil { - glog.Errorf("Could not read directory: %s, (%s)", podIDPath, err) + glog.Errorf("Could not read directory %s: %v", podIDPath, err) } for _, volumeKindDir := range volumeKindDirs { volumeKind := volumeKindDir.Name() volumeKindPath := path.Join(podIDPath, volumeKind) volumeNameDirs, err := ioutil.ReadDir(volumeKindPath) if err != nil { - glog.Errorf("Could not read directory: %s, (%s)", volumeKindPath, err) + glog.Errorf("Could not read directory %s: %v", volumeKindPath, err) } for _, volumeNameDir := range volumeNameDirs { volumeName := volumeNameDir.Name() @@ -419,7 +419,7 @@ func GetCurrentVolumes(rootDirectory string) map[string]Cleaner { // TODO(thockin) This should instead return a reference to an extant volume object cleaner, err := CreateVolumeCleaner(volumeKind, volumeName, podID, rootDirectory) if err != nil { - glog.Errorf("Could not create volume cleaner: %s, (%s)", volumeNameDir.Name(), err) + glog.Errorf("Could not create volume cleaner for %s: %v", volumeNameDir.Name(), err) continue } currentVolumes[identifier] = cleaner diff --git a/pkg/volume/volume_test.go b/pkg/volume/volume_test.go index 7c150b52d4f..87bf22c65e4 100644 --- a/pkg/volume/volume_test.go +++ b/pkg/volume/volume_test.go @@ -150,7 +150,7 @@ func TestCreateVolumeCleaners(t *testing.T) { continue } if err != nil { - t.Errorf("Unexpected error occured: %s", err) + t.Errorf("Unexpected error occured: %v", err) } actualKind := reflect.TypeOf(vol).Elem().Name() if tt.kind == "empty" && actualKind != "EmptyDir" { diff --git a/pkg/watch/json/types.go b/pkg/watch/json/types.go index 0969abe8e89..0b0e7812b7b 100644 --- a/pkg/watch/json/types.go +++ b/pkg/watch/json/types.go @@ -41,7 +41,7 @@ type watchEvent struct { func Object(codec runtime.Codec, event *watch.Event) (interface{}, error) { obj, ok := event.Object.(runtime.Object) if !ok { - return nil, fmt.Errorf("The event object cannot be safely converted to JSON: %v", reflect.TypeOf(event.Object).Name()) + return nil, fmt.Errorf("the event object cannot be safely converted to JSON: %v", reflect.TypeOf(event.Object).Name()) } data, err := codec.Encode(obj) if err != nil {