From c85e567a3d06642736f462ab8fd6088e88516c29 Mon Sep 17 00:00:00 2001 From: wangyx1992 Date: Wed, 21 Apr 2021 11:28:39 +0800 Subject: [PATCH] cleanup: fix errors in wrapped format and log capitalization in proxy Signed-off-by: wangyx1992 --- pkg/proxy/endpointslicecache.go | 4 ++-- pkg/proxy/ipvs/graceful_termination.go | 4 ++-- pkg/proxy/ipvs/proxier.go | 4 ++-- pkg/proxy/ipvs/testing/fake.go | 20 ++++++++++---------- pkg/proxy/userspace/proxier.go | 4 ++-- pkg/proxy/util/utils.go | 2 +- pkg/proxy/winkernel/hnsV1.go | 4 ++-- pkg/proxy/winkernel/hnsV2.go | 4 ++-- pkg/proxy/winkernel/proxier.go | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkg/proxy/endpointslicecache.go b/pkg/proxy/endpointslicecache.go index 58f8ef3fbc0..0043ff4eed7 100644 --- a/pkg/proxy/endpointslicecache.go +++ b/pkg/proxy/endpointslicecache.go @@ -372,9 +372,9 @@ func endpointSliceCacheKeys(endpointSlice *discovery.EndpointSlice) (types.Names var err error serviceName, ok := endpointSlice.Labels[discovery.LabelServiceName] if !ok || serviceName == "" { - err = fmt.Errorf("No %s label set on endpoint slice: %s", discovery.LabelServiceName, endpointSlice.Name) + err = fmt.Errorf("no %s label set on endpoint slice: %s", discovery.LabelServiceName, endpointSlice.Name) } else if endpointSlice.Namespace == "" || endpointSlice.Name == "" { - err = fmt.Errorf("Expected EndpointSlice name and namespace to be set: %v", endpointSlice) + err = fmt.Errorf("expected EndpointSlice name and namespace to be set: %v", endpointSlice) } return types.NamespacedName{Namespace: endpointSlice.Namespace, Name: serviceName}, endpointSlice.Name, err } diff --git a/pkg/proxy/ipvs/graceful_termination.go b/pkg/proxy/ipvs/graceful_termination.go index f4bdd3cb502..eb31a50200c 100644 --- a/pkg/proxy/ipvs/graceful_termination.go +++ b/pkg/proxy/ipvs/graceful_termination.go @@ -173,12 +173,12 @@ func (m *GracefulTerminationManager) deleteRsFunc(rsToDelete *listItem) (bool, e klog.V(5).Infof("Deleting rs: %s", rsToDelete.String()) err := m.ipvs.DeleteRealServer(rsToDelete.VirtualServer, rs) if err != nil { - return false, fmt.Errorf("Delete destination %q err: %v", rs.String(), err) + return false, fmt.Errorf("delete destination %q err: %w", rs.String(), err) } return true, nil } } - return true, fmt.Errorf("Failed to delete rs %q, can't find the real server", rsToDelete.String()) + return true, fmt.Errorf("failed to delete rs %q, can't find the real server", rsToDelete.String()) } func (m *GracefulTerminationManager) tryDeleteRs() { diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 708f2ac69d1..138ce5328b3 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -621,7 +621,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) { kernelConfigFile := fmt.Sprintf("/boot/config-%s", kernelVersionStr) kConfig, err := ioutil.ReadFile(kernelConfigFile) if err != nil { - return nil, fmt.Errorf("Failed to read Kernel Config file %s with error %v", kernelConfigFile, err) + return nil, fmt.Errorf("failed to read Kernel Config file %s with error %w", kernelConfigFile, err) } for _, module := range ipvsModules { if match, _ := regexp.Match("CONFIG_"+strings.ToUpper(module)+"=y", kConfig); match { @@ -631,7 +631,7 @@ func (handle *LinuxKernelHandler) GetModules() ([]string, error) { return bmods, nil } if err != nil { - return nil, fmt.Errorf("Failed to read file /proc/modules with error %v", err) + return nil, fmt.Errorf("failed to read file /proc/modules with error %w", err) } defer modulesFile.Close() diff --git a/pkg/proxy/ipvs/testing/fake.go b/pkg/proxy/ipvs/testing/fake.go index 1f0a98fdd72..93886f6be7b 100644 --- a/pkg/proxy/ipvs/testing/fake.go +++ b/pkg/proxy/ipvs/testing/fake.go @@ -40,10 +40,10 @@ func NewFakeNetlinkHandle() *FakeNetlinkHandle { // EnsureAddressBind is a mock implementation func (h *FakeNetlinkHandle) EnsureAddressBind(address, devName string) (exist bool, err error) { if len(devName) == 0 { - return false, fmt.Errorf("Device name can't be empty") + return false, fmt.Errorf("device name can't be empty") } if _, ok := h.localAddresses[devName]; !ok { - return false, fmt.Errorf("Error bind address: %s to a non-exist interface: %s", address, devName) + return false, fmt.Errorf("error bind address: %s to a non-exist interface: %s", address, devName) } for _, addr := range h.localAddresses[devName] { if addr == address { @@ -58,10 +58,10 @@ func (h *FakeNetlinkHandle) EnsureAddressBind(address, devName string) (exist bo // UnbindAddress is a mock implementation func (h *FakeNetlinkHandle) UnbindAddress(address, devName string) error { if len(devName) == 0 { - return fmt.Errorf("Device name can't be empty") + return fmt.Errorf("device name can't be empty") } if _, ok := h.localAddresses[devName]; !ok { - return fmt.Errorf("Error unbind address: %s from a non-exist interface: %s", address, devName) + return fmt.Errorf("error unbind address: %s from a non-exist interface: %s", address, devName) } for i, addr := range h.localAddresses[devName] { if addr == address { @@ -71,13 +71,13 @@ func (h *FakeNetlinkHandle) UnbindAddress(address, devName string) error { } } // return error message if address is not found in slice h.localAddresses[devName] - return fmt.Errorf("Address: %s is not found in interface: %s", address, devName) + return fmt.Errorf("address: %s is not found in interface: %s", address, devName) } // EnsureDummyDevice is a mock implementation func (h *FakeNetlinkHandle) EnsureDummyDevice(devName string) (bool, error) { if len(devName) == 0 { - return false, fmt.Errorf("Device name can't be empty") + return false, fmt.Errorf("device name can't be empty") } if _, ok := h.localAddresses[devName]; !ok { // create dummy interface if devName is not found in localAddress map @@ -91,10 +91,10 @@ func (h *FakeNetlinkHandle) EnsureDummyDevice(devName string) (bool, error) { // DeleteDummyDevice is a mock implementation func (h *FakeNetlinkHandle) DeleteDummyDevice(devName string) error { if len(devName) == 0 { - return fmt.Errorf("Device name can't be empty") + return fmt.Errorf("device name can't be empty") } if _, ok := h.localAddresses[devName]; !ok { - return fmt.Errorf("Error deleting a non-exist interface: %s", devName) + return fmt.Errorf("error deleting a non-exist interface: %s", devName) } delete(h.localAddresses, devName) return nil @@ -103,10 +103,10 @@ func (h *FakeNetlinkHandle) DeleteDummyDevice(devName string) error { // ListBindAddress is a mock implementation func (h *FakeNetlinkHandle) ListBindAddress(devName string) ([]string, error) { if len(devName) == 0 { - return nil, fmt.Errorf("Device name can't be empty") + return nil, fmt.Errorf("device name can't be empty") } if _, ok := h.localAddresses[devName]; !ok { - return nil, fmt.Errorf("Error list addresses from a non-exist interface: %s", devName) + return nil, fmt.Errorf("error list addresses from a non-exist interface: %s", devName) } return h.localAddresses[devName], nil } diff --git a/pkg/proxy/userspace/proxier.go b/pkg/proxy/userspace/proxier.go index b9c14d28a4e..78fb91f72fb 100644 --- a/pkg/proxy/userspace/proxier.go +++ b/pkg/proxy/userspace/proxier.go @@ -480,10 +480,10 @@ func (proxier *Proxier) addServiceOnPortInternal(service proxy.ServicePortName, func (proxier *Proxier) cleanupPortalAndProxy(serviceName proxy.ServicePortName, info *ServiceInfo) error { if err := proxier.closePortal(serviceName, info); err != nil { - return fmt.Errorf("Failed to close portal for %q: %v", serviceName, err) + return fmt.Errorf("failed to close portal for %q: %w", serviceName, err) } if err := proxier.stopProxy(serviceName, info); err != nil { - return fmt.Errorf("Failed to stop service %q: %v", serviceName, err) + return fmt.Errorf("failed to stop service %q: %w", serviceName, err) } return nil } diff --git a/pkg/proxy/util/utils.go b/pkg/proxy/util/utils.go index 57744f10abb..d0037b96e68 100644 --- a/pkg/proxy/util/utils.go +++ b/pkg/proxy/util/utils.go @@ -50,7 +50,7 @@ var ( ErrAddressNotAllowed = errors.New("address not allowed") // ErrNoAddresses indicates there are no addresses for the hostname - ErrNoAddresses = errors.New("No addresses for hostname") + ErrNoAddresses = errors.New("no addresses for hostname") ) // isValidEndpoint checks that the given host / port pair are valid endpoint diff --git a/pkg/proxy/winkernel/hnsV1.go b/pkg/proxy/winkernel/hnsV1.go index 6c9c8c68464..9d8e8780887 100644 --- a/pkg/proxy/winkernel/hnsV1.go +++ b/pkg/proxy/winkernel/hnsV1.go @@ -81,7 +81,7 @@ func (hns hnsV1) getEndpointByIpAddress(ip string, networkName string) (*endpoin endpoints, err := hcsshim.HNSListEndpointRequest() if err != nil { - return nil, fmt.Errorf("Failed to list endpoints: %v", err) + return nil, fmt.Errorf("failed to list endpoints: %w", err) } for _, endpoint := range endpoints { equal := false @@ -137,7 +137,7 @@ func (hns hnsV1) createEndpoint(ep *endpointsInfo, networkName string) (*endpoin } else { createdEndpoint, err = hnsNetwork.CreateEndpoint(hnsEndpoint) if err != nil { - return nil, fmt.Errorf("Local endpoint creation failed: %v", err) + return nil, fmt.Errorf("local endpoint creation failed: %w", err) } } return &endpointsInfo{ diff --git a/pkg/proxy/winkernel/hnsV2.go b/pkg/proxy/winkernel/hnsV2.go index 298ad544f18..839186d3692 100644 --- a/pkg/proxy/winkernel/hnsV2.go +++ b/pkg/proxy/winkernel/hnsV2.go @@ -48,7 +48,7 @@ func (hns hnsV2) getNetworkByName(name string) (*hnsNetworkInfo, error) { policySettings := hcn.RemoteSubnetRoutePolicySetting{} err = json.Unmarshal(policy.Settings, &policySettings) if err != nil { - return nil, fmt.Errorf("Failed to unmarshal Remote Subnet policy settings") + return nil, fmt.Errorf("failed to unmarshal Remote Subnet policy settings") } rs := &remoteSubnetInfo{ destinationPrefix: policySettings.DestinationPrefix, @@ -89,7 +89,7 @@ func (hns hnsV2) getEndpointByIpAddress(ip string, networkName string) (*endpoin endpoints, err := hcn.ListEndpoints() if err != nil { - return nil, fmt.Errorf("Failed to list endpoints: %v", err) + return nil, fmt.Errorf("failed to list endpoints: %w", err) } for _, endpoint := range endpoints { equal := false diff --git a/pkg/proxy/winkernel/proxier.go b/pkg/proxy/winkernel/proxier.go index 9d28d57d55e..496ece2a978 100644 --- a/pkg/proxy/winkernel/proxier.go +++ b/pkg/proxy/winkernel/proxier.go @@ -576,7 +576,7 @@ func NewProxier( time.Sleep(10 * time.Second) hnsNetworkInfo, err = hns.getNetworkByName(hnsNetworkName) if err != nil { - return nil, fmt.Errorf("Could not find HNS network %s", hnsNetworkName) + return nil, fmt.Errorf("could not find HNS network %s", hnsNetworkName) } } @@ -617,7 +617,7 @@ func NewProxier( } } if len(hostMac) == 0 { - return nil, fmt.Errorf("Could not find host mac address for %s", nodeIP) + return nil, fmt.Errorf("could not find host mac address for %s", nodeIP) } }