From e50f9e6b2425c571faa1ef6e0888ddbffb6b369e Mon Sep 17 00:00:00 2001
From: Michelle Noorali <michelle@deis.com>
Date: Mon, 12 Sep 2016 08:45:43 -0600
Subject: [PATCH] ref(helm): refactor checkArgsLength method

---
 cmd/helm/helm.go     | 5 +++--
 cmd/helm/inspect.go  | 2 +-
 cmd/helm/install.go  | 2 +-
 cmd/helm/repo.go     | 4 ++--
 cmd/helm/rollback.go | 2 +-
 cmd/helm/upgrade.go  | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index d3c756b3b..7205a20f2 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -138,8 +138,9 @@ func teardown() {
 	}
 }
 
-func checkArgsLength(expectedNum, actualNum int, requiredArgs ...string) error {
-	if actualNum != expectedNum {
+func checkArgsLength(argsReceived int, requiredArgs ...string) error {
+	expectedNum := len(requiredArgs)
+	if argsReceived != expectedNum {
 		arg := "arguments"
 		if expectedNum == 1 {
 			arg = "argument"
diff --git a/cmd/helm/inspect.go b/cmd/helm/inspect.go
index cc02f80b1..8386fd1d0 100644
--- a/cmd/helm/inspect.go
+++ b/cmd/helm/inspect.go
@@ -70,7 +70,7 @@ func newInspectCmd(c helm.Interface, out io.Writer) *cobra.Command {
 		Short: "inspect a chart",
 		Long:  inspectDesc,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := checkArgsLength(1, len(args), "chart name"); err != nil {
+			if err := checkArgsLength(len(args), "chart name"); err != nil {
 				return err
 			}
 			cp, err := locateChartPath(args[0], insp.verify, insp.keyring)
diff --git a/cmd/helm/install.go b/cmd/helm/install.go
index a926b3c11..ced11eb9c 100644
--- a/cmd/helm/install.go
+++ b/cmd/helm/install.go
@@ -89,7 +89,7 @@ func newInstallCmd(c helm.Interface, out io.Writer) *cobra.Command {
 		Long:              installDesc,
 		PersistentPreRunE: setupConnection,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := checkArgsLength(1, len(args), "chart name"); err != nil {
+			if err := checkArgsLength(len(args), "chart name"); err != nil {
 				return err
 			}
 			cp, err := locateChartPath(args[0], inst.verify, inst.keyring)
diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go
index df3205120..65f273db3 100644
--- a/cmd/helm/repo.go
+++ b/cmd/helm/repo.go
@@ -69,7 +69,7 @@ var repoIndexCmd = &cobra.Command{
 }
 
 func runRepoAdd(cmd *cobra.Command, args []string) error {
-	if err := checkArgsLength(2, len(args), "name for the chart repository", "the url of the chart repository"); err != nil {
+	if err := checkArgsLength(len(args), "name for the chart repository", "the url of the chart repository"); err != nil {
 		return err
 	}
 	name, url := args[0], args[1]
@@ -101,7 +101,7 @@ func runRepoList(cmd *cobra.Command, args []string) error {
 }
 
 func runRepoRemove(cmd *cobra.Command, args []string) error {
-	if err := checkArgsLength(1, len(args), "name of chart repository"); err != nil {
+	if err := checkArgsLength(len(args), "name of chart repository"); err != nil {
 		return err
 	}
 	return removeRepoLine(args[0])
diff --git a/cmd/helm/rollback.go b/cmd/helm/rollback.go
index bb6326f7a..f711dacf4 100644
--- a/cmd/helm/rollback.go
+++ b/cmd/helm/rollback.go
@@ -52,7 +52,7 @@ func newRollbackCmd(c helm.Interface, out io.Writer) *cobra.Command {
 		Long:              rollbackDesc,
 		PersistentPreRunE: setupConnection,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := checkArgsLength(1, len(args), "release name"); err != nil {
+			if err := checkArgsLength(len(args), "release name"); err != nil {
 				return err
 			}
 			rollback.client = ensureHelmClient(rollback.client)
diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go
index 95b5e7901..ca60c9985 100644
--- a/cmd/helm/upgrade.go
+++ b/cmd/helm/upgrade.go
@@ -64,7 +64,7 @@ func newUpgradeCmd(client helm.Interface, out io.Writer) *cobra.Command {
 		Long:              upgradeDesc,
 		PersistentPreRunE: setupConnection,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := checkArgsLength(2, len(args), "release name, chart path"); err != nil {
+			if err := checkArgsLength(len(args), "release name", "chart path"); err != nil {
 				return err
 			}