Skip to content

Commit

Permalink
fix(*): fix new linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
adamreese committed Nov 12, 2016
1 parent 79e43a7 commit d59f66f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions cmd/helm/dependency_update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ func TestDependencyUpdateCmd(t *testing.T) {
srv := repotest.NewServer(hh)
defer srv.Stop()
copied, err := srv.CopyCharts("testdata/testcharts/*.tgz")
if err != nil {
t.Fatal(err)
}
t.Logf("Copied charts:\n%s", strings.Join(copied, "\n"))
t.Logf("Listening on directory %s", srv.Root())

Expand Down
3 changes: 3 additions & 0 deletions cmd/helm/repo_remove_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ func TestRepoRemove(t *testing.T) {
b := bytes.NewBuffer(nil)

home, err := tempHelmHome(t)
if err != nil {
t.Fatal(err)
}
defer os.Remove(home)
hh := helmpath.Home(home)

Expand Down
2 changes: 1 addition & 1 deletion pkg/chartutil/expand.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func Expand(dir string, r io.Reader) error {
return nil
}

// ExpandFile expands the src file into the dest directroy.
// ExpandFile expands the src file into the dest directory.
func ExpandFile(dest, src string) error {
h, err := os.Open(src)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions pkg/kube/tunnel.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ func getAvailablePort() (int, error) {
defer l.Close()

_, p, err := net.SplitHostPort(l.Addr().String())
if err != nil {
return 0, err
}
port, err := strconv.Atoi(p)
if err != nil {
return 0, err
Expand Down
3 changes: 3 additions & 0 deletions pkg/lint/rules/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ func validateNoMissingValues(templatesPath string, chartValues chartutil.Values,
tmpl := template.New("tpl").Funcs(engine.FuncMap())
// If the templatesPath includes any *.tpl files we will parse and import them as associated templates
associatedTemplates, err := filepath.Glob(filepath.Join(templatesPath, "*.tpl"))
if err != nil {
return err
}

if len(associatedTemplates) > 0 {
tmpl, err = tmpl.ParseFiles(associatedTemplates...)
Expand Down
2 changes: 1 addition & 1 deletion pkg/repo/repotest/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func NewServer(docroot string) *Server {
return srv
}

// Server is an implementaiton of a repository server for testing.
// Server is an implementation of a repository server for testing.
type Server struct {
docroot string
srv *httptest.Server
Expand Down

0 comments on commit d59f66f

Please sign in to comment.