From b2f530d75643e61ac398c05a3a57f37b3ab4f3f8 Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Sat, 11 Mar 2017 01:46:56 -0500 Subject: [PATCH] [cli] fix Generator's error messages Invalid variables are used when format error messages. This change fixes them. --- pkg/kubectl/clusterrolebinding.go | 18 +++++++++--------- pkg/kubectl/configmap.go | 2 +- pkg/kubectl/rolebinding.go | 18 +++++++++--------- pkg/kubectl/secret.go | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkg/kubectl/clusterrolebinding.go b/pkg/kubectl/clusterrolebinding.go index 712f7b32694..a05acdc1587 100644 --- a/pkg/kubectl/clusterrolebinding.go +++ b/pkg/kubectl/clusterrolebinding.go @@ -52,29 +52,29 @@ func (s ClusterRoleBindingGeneratorV1) Generate(genericParams map[string]interfa return nil, err } delegate := &ClusterRoleBindingGeneratorV1{} - fromFileStrings, found := genericParams["user"] + userStrings, found := genericParams["user"] if found { - fromFileArray, isArray := fromFileStrings.([]string) + fromFileArray, isArray := userStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", userStrings) } delegate.Users = fromFileArray delete(genericParams, "user") } - fromLiteralStrings, found := genericParams["group"] + groupStrings, found := genericParams["group"] if found { - fromLiteralArray, isArray := fromLiteralStrings.([]string) + fromLiteralArray, isArray := groupStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", groupStrings) } delegate.Groups = fromLiteralArray delete(genericParams, "group") } - fromSAStrings, found := genericParams["serviceaccount"] + saStrings, found := genericParams["serviceaccount"] if found { - fromLiteralArray, isArray := fromSAStrings.([]string) + fromLiteralArray, isArray := saStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", saStrings) } delegate.ServiceAccounts = fromLiteralArray delete(genericParams, "serviceaccount") diff --git a/pkg/kubectl/configmap.go b/pkg/kubectl/configmap.go index 239c5ac7ecc..56198fac754 100644 --- a/pkg/kubectl/configmap.go +++ b/pkg/kubectl/configmap.go @@ -66,7 +66,7 @@ func (s ConfigMapGeneratorV1) Generate(genericParams map[string]interface{}) (ru if found { fromLiteralArray, isArray := fromLiteralStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", fromLiteralStrings) } delegate.LiteralSources = fromLiteralArray delete(genericParams, "from-literal") diff --git a/pkg/kubectl/rolebinding.go b/pkg/kubectl/rolebinding.go index 55c36d1157d..b37f0e045f2 100644 --- a/pkg/kubectl/rolebinding.go +++ b/pkg/kubectl/rolebinding.go @@ -54,29 +54,29 @@ func (s RoleBindingGeneratorV1) Generate(genericParams map[string]interface{}) ( return nil, err } delegate := &RoleBindingGeneratorV1{} - fromFileStrings, found := genericParams["user"] + userStrings, found := genericParams["user"] if found { - fromFileArray, isArray := fromFileStrings.([]string) + fromFileArray, isArray := userStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", userStrings) } delegate.Users = fromFileArray delete(genericParams, "user") } - fromLiteralStrings, found := genericParams["group"] + groupStrings, found := genericParams["group"] if found { - fromLiteralArray, isArray := fromLiteralStrings.([]string) + fromLiteralArray, isArray := groupStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", groupStrings) } delegate.Groups = fromLiteralArray delete(genericParams, "group") } - fromSAStrings, found := genericParams["serviceaccount"] + saStrings, found := genericParams["serviceaccount"] if found { - fromLiteralArray, isArray := fromSAStrings.([]string) + fromLiteralArray, isArray := saStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", saStrings) } delegate.ServiceAccounts = fromLiteralArray delete(genericParams, "serviceaccount") diff --git a/pkg/kubectl/secret.go b/pkg/kubectl/secret.go index 70d436b05bc..b8173d3e5b0 100644 --- a/pkg/kubectl/secret.go +++ b/pkg/kubectl/secret.go @@ -66,7 +66,7 @@ func (s SecretGeneratorV1) Generate(genericParams map[string]interface{}) (runti if found { fromLiteralArray, isArray := fromLiteralStrings.([]string) if !isArray { - return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) + return nil, fmt.Errorf("expected []string, found :%v", fromLiteralStrings) } delegate.LiteralSources = fromLiteralArray delete(genericParams, "from-literal")