From 94daee0164805ef86cc36790c662b7f074db10ec Mon Sep 17 00:00:00 2001 From: Sukeesh Date: Sun, 30 Jun 2019 11:56:27 +0900 Subject: [PATCH] Cleanup: Audit log and error capitalization Kubernetes-commit: 346fdbccf0ac06ab3fa0e51ab3b92fdc041bb4cc --- .../main.go | 8 ++++---- rest/plugin.go | 4 ++-- rest/request.go | 4 ++-- tools/clientcmd/loader.go | 6 +++--- tools/portforward/portforward.go | 20 +++++++++---------- util/certificate/certificate_manager.go | 2 +- util/certificate/certificate_manager_test.go | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/dynamic-create-update-delete-deployment/main.go b/examples/dynamic-create-update-delete-deployment/main.go index c23e5ca9..62897b5d 100644 --- a/examples/dynamic-create-update-delete-deployment/main.go +++ b/examples/dynamic-create-update-delete-deployment/main.go @@ -135,18 +135,18 @@ func main() { // RetryOnConflict uses exponential backoff to avoid exhausting the apiserver result, getErr := client.Resource(deploymentRes).Namespace(namespace).Get("demo-deployment", metav1.GetOptions{}) if getErr != nil { - panic(fmt.Errorf("Failed to get latest version of Deployment: %v", getErr)) + panic(fmt.Errorf("failed to get latest version of Deployment: %v", getErr)) } // update replicas to 1 if err := unstructured.SetNestedField(result.Object, int64(1), "spec", "replicas"); err != nil { - panic(fmt.Errorf("Failed to set replica value: %v", err)) + panic(fmt.Errorf("failed to set replica value: %v", err)) } // extract spec containers containers, found, err := unstructured.NestedSlice(result.Object, "spec", "template", "spec", "containers") if err != nil || !found || containers == nil { - panic(fmt.Errorf("Deployment containers not found or error in spec: %v", err)) + panic(fmt.Errorf("deployment containers not found or error in spec: %v", err)) } // update container[0] image @@ -161,7 +161,7 @@ func main() { return updateErr }) if retryErr != nil { - panic(fmt.Errorf("Update failed: %v", retryErr)) + panic(fmt.Errorf("update failed: %v", retryErr)) } fmt.Println("Updated deployment...") diff --git a/rest/plugin.go b/rest/plugin.go index 83ef5ae3..0bc2d03f 100644 --- a/rest/plugin.go +++ b/rest/plugin.go @@ -55,7 +55,7 @@ func RegisterAuthProviderPlugin(name string, plugin Factory) error { pluginsLock.Lock() defer pluginsLock.Unlock() if _, found := plugins[name]; found { - return fmt.Errorf("Auth Provider Plugin %q was registered twice", name) + return fmt.Errorf("auth Provider Plugin %q was registered twice", name) } klog.V(4).Infof("Registered Auth Provider Plugin %q", name) plugins[name] = plugin @@ -67,7 +67,7 @@ func GetAuthProvider(clusterAddress string, apc *clientcmdapi.AuthProviderConfig defer pluginsLock.Unlock() p, ok := plugins[apc.Name] if !ok { - return nil, fmt.Errorf("No Auth Provider found for name %q", apc.Name) + return nil, fmt.Errorf("no Auth Provider found for name %q", apc.Name) } return p(clusterAddress, apc.Config, persister) } diff --git a/rest/request.go b/rest/request.go index 84fb6250..491f8bbd 100644 --- a/rest/request.go +++ b/rest/request.go @@ -871,13 +871,13 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu // 3. Apiserver closes connection. // 4. client-go should catch this and return an error. klog.V(2).Infof("Stream error %#v when reading response body, may be caused by closed connection.", err) - streamErr := fmt.Errorf("Stream error when reading response body, may be caused by closed connection. Please retry. Original error: %v", err) + streamErr := fmt.Errorf("stream error when reading response body, may be caused by closed connection. Please retry. Original error: %v", err) return Result{ err: streamErr, } default: klog.Errorf("Unexpected error when reading response body: %v", err) - unexpectedErr := fmt.Errorf("Unexpected error when reading response body. Please retry. Original error: %v", err) + unexpectedErr := fmt.Errorf("unexpected error when reading response body. Please retry. Original error: %v", err) return Result{ err: unexpectedErr, } diff --git a/tools/clientcmd/loader.go b/tools/clientcmd/loader.go index cda54ccd..4e37e792 100644 --- a/tools/clientcmd/loader.go +++ b/tools/clientcmd/loader.go @@ -212,7 +212,7 @@ func (rules *ClientConfigLoadingRules) Load() (*clientcmdapi.Config, error) { } if err != nil { - errlist = append(errlist, fmt.Errorf("Error loading config file \"%s\": %v", filename, err)) + errlist = append(errlist, fmt.Errorf("error loading config file \"%s\": %v", filename, err)) continue } @@ -483,7 +483,7 @@ func ResolveLocalPaths(config *clientcmdapi.Config) error { } base, err := filepath.Abs(filepath.Dir(cluster.LocationOfOrigin)) if err != nil { - return fmt.Errorf("Could not determine the absolute path of config file %s: %v", cluster.LocationOfOrigin, err) + return fmt.Errorf("could not determine the absolute path of config file %s: %v", cluster.LocationOfOrigin, err) } if err := ResolvePaths(GetClusterFileReferences(cluster), base); err != nil { @@ -496,7 +496,7 @@ func ResolveLocalPaths(config *clientcmdapi.Config) error { } base, err := filepath.Abs(filepath.Dir(authInfo.LocationOfOrigin)) if err != nil { - return fmt.Errorf("Could not determine the absolute path of config file %s: %v", authInfo.LocationOfOrigin, err) + return fmt.Errorf("could not determine the absolute path of config file %s: %v", authInfo.LocationOfOrigin, err) } if err := ResolvePaths(GetAuthInfoFileReferences(authInfo), base); err != nil { diff --git a/tools/portforward/portforward.go b/tools/portforward/portforward.go index 4ab72bb4..ffc0bcac 100644 --- a/tools/portforward/portforward.go +++ b/tools/portforward/portforward.go @@ -90,20 +90,20 @@ func parsePorts(ports []string) ([]ForwardedPort, error) { } remoteString = parts[1] } else { - return nil, fmt.Errorf("Invalid port format '%s'", portString) + return nil, fmt.Errorf("invalid port format '%s'", portString) } localPort, err := strconv.ParseUint(localString, 10, 16) if err != nil { - return nil, fmt.Errorf("Error parsing local port '%s': %s", localString, err) + return nil, fmt.Errorf("error parsing local port '%s': %s", localString, err) } remotePort, err := strconv.ParseUint(remoteString, 10, 16) if err != nil { - return nil, fmt.Errorf("Error parsing remote port '%s': %s", remoteString, err) + return nil, fmt.Errorf("error parsing remote port '%s': %s", remoteString, err) } if remotePort == 0 { - return nil, fmt.Errorf("Remote port must be > 0") + return nil, fmt.Errorf("remote port must be > 0") } forwards = append(forwards, ForwardedPort{uint16(localPort), uint16(remotePort)}) @@ -159,14 +159,14 @@ func New(dialer httpstream.Dialer, ports []string, stopChan <-chan struct{}, rea // NewOnAddresses creates a new PortForwarder with custom listen addresses. func NewOnAddresses(dialer httpstream.Dialer, addresses []string, ports []string, stopChan <-chan struct{}, readyChan chan struct{}, out, errOut io.Writer) (*PortForwarder, error) { if len(addresses) == 0 { - return nil, errors.New("You must specify at least 1 address") + return nil, errors.New("you must specify at least 1 address") } parsedAddresses, err := parseAddresses(addresses) if err != nil { return nil, err } if len(ports) == 0 { - return nil, errors.New("You must specify at least 1 port") + return nil, errors.New("you must specify at least 1 port") } parsedPorts, err := parsePorts(ports) if err != nil { @@ -219,7 +219,7 @@ func (pf *PortForwarder) forward() error { } if !listenSuccess { - return fmt.Errorf("Unable to listen on any of the requested ports: %v", pf.ports) + return fmt.Errorf("unable to listen on any of the requested ports: %v", pf.ports) } if pf.Ready != nil { @@ -277,7 +277,7 @@ func (pf *PortForwarder) listenOnPortAndAddress(port *ForwardedPort, protocol st func (pf *PortForwarder) getListener(protocol string, hostname string, port *ForwardedPort) (net.Listener, error) { listener, err := net.Listen(protocol, net.JoinHostPort(hostname, strconv.Itoa(int(port.Local)))) if err != nil { - return nil, fmt.Errorf("Unable to create listener: Error %s", err) + return nil, fmt.Errorf("unable to create listener: Error %s", err) } listenerAddress := listener.Addr().String() host, localPort, _ := net.SplitHostPort(listenerAddress) @@ -285,7 +285,7 @@ func (pf *PortForwarder) getListener(protocol string, hostname string, port *For if err != nil { fmt.Fprintf(pf.out, "Failed to forward from %s:%d -> %d\n", hostname, localPortUInt, port.Remote) - return nil, fmt.Errorf("Error parsing local port: %s from %s (%s)", err, listenerAddress, host) + return nil, fmt.Errorf("error parsing local port: %s from %s (%s)", err, listenerAddress, host) } port.Local = uint16(localPortUInt) if pf.out != nil { @@ -303,7 +303,7 @@ func (pf *PortForwarder) waitForConnection(listener net.Listener, port Forwarded if err != nil { // TODO consider using something like https://github.com/hydrogen18/stoppableListener? if !strings.Contains(strings.ToLower(err.Error()), "use of closed network connection") { - runtime.HandleError(fmt.Errorf("Error accepting connection on port %d: %v", port.Local, err)) + runtime.HandleError(fmt.Errorf("error accepting connection on port %d: %v", port.Local, err)) } return } diff --git a/util/certificate/certificate_manager.go b/util/certificate/certificate_manager.go index e8170044..ef387915 100644 --- a/util/certificate/certificate_manager.go +++ b/util/certificate/certificate_manager.go @@ -411,7 +411,7 @@ func (m *manager) rotateCerts() (bool, error) { // is a remainder after the old design using raw watch wrapped with backoff. crtPEM, err := csr.WaitForCertificate(ctx, client, req) if err != nil { - utilruntime.HandleError(fmt.Errorf("Certificate request was not signed: %v", err)) + utilruntime.HandleError(fmt.Errorf("certificate request was not signed: %v", err)) return false, nil } diff --git a/util/certificate/certificate_manager_test.go b/util/certificate/certificate_manager_test.go index 81f59b33..671cffc4 100644 --- a/util/certificate/certificate_manager_test.go +++ b/util/certificate/certificate_manager_test.go @@ -981,7 +981,7 @@ func (c fakeClient) Create(*certificates.CertificateSigningRequest) (*certificat if c.err != nil { return nil, c.err } - return nil, fmt.Errorf("Create error") + return nil, fmt.Errorf("create error") } csrReply := certificates.CertificateSigningRequest{} csrReply.UID = "fake-uid" @@ -993,7 +993,7 @@ func (c fakeClient) Watch(opts v1.ListOptions) (watch.Interface, error) { if c.err != nil { return nil, c.err } - return nil, fmt.Errorf("Watch error") + return nil, fmt.Errorf("watch error") } return &fakeWatch{ failureType: c.failureType,