From 803475c82463795fc1c6f4388c021285f14d1cbe Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Wed, 30 Nov 2016 20:22:59 -0800 Subject: [PATCH] fix(*): misc linter issues --- cmd/helm/package.go | 4 ++-- cmd/helm/strvals/parser.go | 4 +--- pkg/kube/client.go | 2 +- pkg/kube/tunnel.go | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/helm/package.go b/cmd/helm/package.go index f9cf4cdbc..d59d5cba9 100644 --- a/cmd/helm/package.go +++ b/cmd/helm/package.go @@ -166,7 +166,7 @@ func (p *packageCmd) clearsign(filename string) error { // promptUser implements provenance.PassphraseFetcher func promptUser(name string) ([]byte, error) { fmt.Printf("Password for key %q > ", name) - pw, err := terminal.ReadPassword(int(syscall.Stdin)) + pw, err := terminal.ReadPassword(syscall.Stdin) fmt.Println() - return []byte(pw), err + return pw, err } diff --git a/cmd/helm/strvals/parser.go b/cmd/helm/strvals/parser.go index c4f35e11d..c4859ad39 100644 --- a/cmd/helm/strvals/parser.go +++ b/cmd/helm/strvals/parser.go @@ -153,14 +153,12 @@ func set(data map[string]interface{}, key string, val interface{}) { } func (t *parser) val() ([]rune, error) { - v := []rune{} stop := runeSet([]rune{','}) v, _, err := runesUntil(t.sc, stop) return v, err } func (t *parser) valList() ([]interface{}, error) { - r, _, e := t.sc.ReadRune() if e != nil { return []interface{}{}, e @@ -193,7 +191,7 @@ func (t *parser) valList() ([]interface{}, error) { } } -func runesUntil(in *bytes.Buffer, stop map[rune]bool) ([]rune, rune, error) { +func runesUntil(in io.RuneReader, stop map[rune]bool) ([]rune, rune, error) { v := []rune{} for { switch r, _, e := in.ReadRune(); { diff --git a/pkg/kube/client.go b/pkg/kube/client.go index d74a1d030..e76ed5180 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -443,7 +443,7 @@ func getCurrentObject(target *resource.Info, infos []*resource.Info) (runtime.Ob if found, ok := findMatchingInfo(target, infos); ok { return found.Mapping.ConvertToVersion(found.Object, found.Mapping.GroupVersionKind.GroupVersion()) } - return nil, fmt.Errorf("No resource with the name %s found.", target.Name) + return nil, fmt.Errorf("no resource with the name %s found", target.Name) } // isMatchingInfo returns true if infos match on Name and Kind. diff --git a/pkg/kube/tunnel.go b/pkg/kube/tunnel.go index 622f2682e..a93c0384b 100644 --- a/pkg/kube/tunnel.go +++ b/pkg/kube/tunnel.go @@ -96,7 +96,7 @@ func (t *Tunnel) ForwardPort() error { select { case err = <-errChan: - return fmt.Errorf("Error forwarding ports: %v\n", err) + return fmt.Errorf("forwarding ports: %v", err) case <-pf.Ready: return nil }