Merge pull request #7684 from pmacik/fix-lint

Fix golangci-lint errors.
pull/7692/head
Matthew Fisher 5 years ago committed by GitHub
commit 4c55073da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -24,8 +24,6 @@ import (
"regexp" "regexp"
"strings" "strings"
"helm.sh/helm/v3/pkg/releaseutil"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"helm.sh/helm/v3/cmd/helm/require" "helm.sh/helm/v3/cmd/helm/require"
@ -33,6 +31,7 @@ import (
"helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/chartutil"
"helm.sh/helm/v3/pkg/cli/values" "helm.sh/helm/v3/pkg/cli/values"
"helm.sh/helm/v3/pkg/releaseutil"
) )
const templateDesc = ` const templateDesc = `
@ -53,7 +52,7 @@ func newTemplateCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "template [NAME] [CHART]", Use: "template [NAME] [CHART]",
Short: fmt.Sprintf("locally render templates"), Short: "locally render templates",
Long: templateDesc, Long: templateDesc,
Args: require.MinimumNArgs(1), Args: require.MinimumNArgs(1),
RunE: func(_ *cobra.Command, args []string) error { RunE: func(_ *cobra.Command, args []string) error {

@ -259,7 +259,7 @@ func NewCompleteCmd(settings *cli.EnvSettings, out io.Writer) *cobra.Command {
// completion script to parse. // completion script to parse.
// The directive integer must be that last character following a single : // The directive integer must be that last character following a single :
// The completion script expects :directive // The completion script expects :directive
fmt.Fprintln(out, fmt.Sprintf(":%d", directive)) fmt.Fprintf(out, ":%d\n", directive)
// Print some helpful info to stderr for the user to understand. // Print some helpful info to stderr for the user to understand.
// Output from stderr should be ignored from the completion script. // Output from stderr should be ignored from the completion script.

Loading…
Cancel
Save