From defd8713accc2fea675f63bad02aaee3394efb0b Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Thu, 13 Sep 2018 17:44:46 -0400 Subject: [PATCH] Fix govet errors in generators --- hack/.golint_failures | 1 - pkg/kubectl/describe/versioned/describe.go | 2 +- .../generate/versioned/clusterrolebinding.go | 10 +- pkg/kubectl/generate/versioned/configmap.go | 14 +- pkg/kubectl/generate/versioned/namespace.go | 2 +- pkg/kubectl/generate/versioned/pdb.go | 14 +- .../generate/versioned/priorityclass.go | 8 +- pkg/kubectl/generate/versioned/quota.go | 6 +- pkg/kubectl/generate/versioned/rolebinding.go | 12 +- pkg/kubectl/generate/versioned/run.go | 236 +++++++++--------- pkg/kubectl/generate/versioned/secret.go | 14 +- .../versioned/secret_for_docker_registry.go | 14 +- .../generate/versioned/secret_for_tls.go | 8 +- pkg/kubectl/generate/versioned/service.go | 32 +-- .../generate/versioned/service_basic.go | 20 +- 15 files changed, 196 insertions(+), 197 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index c9004ba3c2..10be372224 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -190,7 +190,6 @@ pkg/kubectl/cmd/util/openapi pkg/kubectl/cmd/util/sanity pkg/kubectl/cmd/version pkg/kubectl/cmd/wait -pkg/kubectl/describe pkg/kubectl/generate pkg/kubectl/generate/versioned pkg/kubectl/metricsutil diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 621c6609ed..7246126ed9 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -31,7 +31,7 @@ import ( // DescriberFn gives a way to easily override the function for unit testing if needed var DescriberFn describe.DescriberFunc = Describer -// Returns a Describer for displaying the specified RESTMapping type or an error. +// Describer returns a Describer for displaying the specified RESTMapping type or an error. func Describer(restClientGetter genericclioptions.RESTClientGetter, mapping *meta.RESTMapping) (printers.Describer, error) { clientConfig, err := restClientGetter.ToRESTConfig() if err != nil { diff --git a/pkg/kubectl/generate/versioned/clusterrolebinding.go b/pkg/kubectl/generate/versioned/clusterrolebinding.go index 4444d5a9f8..b874c63794 100644 --- a/pkg/kubectl/generate/versioned/clusterrolebinding.go +++ b/pkg/kubectl/generate/versioned/clusterrolebinding.go @@ -97,11 +97,11 @@ func (s ClusterRoleBindingGeneratorV1) Generate(genericParams map[string]interfa // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern. func (s ClusterRoleBindingGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"clusterrole", false}, - {"user", false}, - {"group", false}, - {"serviceaccount", false}, + {Name: "name", Required: true}, + {Name: "clusterrole", Required: false}, + {Name: "user", Required: false}, + {Name: "group", Required: false}, + {Name: "serviceaccount", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/configmap.go b/pkg/kubectl/generate/versioned/configmap.go index 7e4525b89b..67058422ca 100644 --- a/pkg/kubectl/generate/versioned/configmap.go +++ b/pkg/kubectl/generate/versioned/configmap.go @@ -114,13 +114,13 @@ func (s ConfigMapGeneratorV1) Generate(genericParams map[string]interface{}) (ru // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern. func (s ConfigMapGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"type", false}, - {"from-file", false}, - {"from-literal", false}, - {"from-env-file", false}, - {"force", false}, - {"hash", false}, + {Name: "name", Required: true}, + {Name: "type", Required: false}, + {Name: "from-file", Required: false}, + {Name: "from-literal", Required: false}, + {Name: "from-env-file", Required: false}, + {Name: "force", Required: false}, + {Name: "hash", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/namespace.go b/pkg/kubectl/generate/versioned/namespace.go index 85286ac269..8921764db6 100644 --- a/pkg/kubectl/generate/versioned/namespace.go +++ b/pkg/kubectl/generate/versioned/namespace.go @@ -57,7 +57,7 @@ func (g NamespaceGeneratorV1) Generate(genericParams map[string]interface{}) (ru // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern func (g NamespaceGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, + {Name: "name", Required: true}, } } diff --git a/pkg/kubectl/generate/versioned/pdb.go b/pkg/kubectl/generate/versioned/pdb.go index a02fffa3bf..a8cc6469e1 100644 --- a/pkg/kubectl/generate/versioned/pdb.go +++ b/pkg/kubectl/generate/versioned/pdb.go @@ -38,9 +38,9 @@ var _ generate.StructuredGenerator = &PodDisruptionBudgetV1Generator{} func (PodDisruptionBudgetV1Generator) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"min-available", false}, - {"selector", true}, + {Name: "name", Required: true}, + {Name: "min-available", Required: false}, + {Name: "selector", Required: true}, } } @@ -120,10 +120,10 @@ var _ generate.StructuredGenerator = &PodDisruptionBudgetV2Generator{} func (PodDisruptionBudgetV2Generator) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"min-available", false}, - {"max-unavailable", false}, - {"selector", true}, + {Name: "name", Required: true}, + {Name: "min-available", Required: false}, + {Name: "max-unavailable", Required: false}, + {Name: "selector", Required: true}, } } diff --git a/pkg/kubectl/generate/versioned/priorityclass.go b/pkg/kubectl/generate/versioned/priorityclass.go index 393bda7c4e..bd10d47181 100644 --- a/pkg/kubectl/generate/versioned/priorityclass.go +++ b/pkg/kubectl/generate/versioned/priorityclass.go @@ -38,10 +38,10 @@ var _ generate.StructuredGenerator = &PriorityClassV1Generator{} func (PriorityClassV1Generator) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"value", true}, - {"global-default", false}, - {"description", false}, + {Name: "name", Required: true}, + {Name: "value", Required: true}, + {Name: "global-default", Required: false}, + {Name: "description", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/quota.go b/pkg/kubectl/generate/versioned/quota.go index f6a672046f..c3710acb3b 100644 --- a/pkg/kubectl/generate/versioned/quota.go +++ b/pkg/kubectl/generate/versioned/quota.go @@ -40,9 +40,9 @@ type ResourceQuotaGeneratorV1 struct { // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern func (g ResourceQuotaGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"hard", true}, - {"scopes", false}, + {Name: "name", Required: true}, + {Name: "hard", Required: true}, + {Name: "scopes", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/rolebinding.go b/pkg/kubectl/generate/versioned/rolebinding.go index 3a7f52a057..ed91208855 100644 --- a/pkg/kubectl/generate/versioned/rolebinding.go +++ b/pkg/kubectl/generate/versioned/rolebinding.go @@ -100,12 +100,12 @@ func (s RoleBindingGeneratorV1) Generate(genericParams map[string]interface{}) ( // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern. func (s RoleBindingGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"clusterrole", false}, - {"role", false}, - {"user", false}, - {"group", false}, - {"serviceaccount", false}, + {Name: "name", Required: true}, + {Name: "clusterrole", Required: false}, + {Name: "role", Required: false}, + {Name: "user", Required: false}, + {Name: "group", Required: false}, + {Name: "serviceaccount", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/run.go b/pkg/kubectl/generate/versioned/run.go index fabb08e581..4a3c00258a 100644 --- a/pkg/kubectl/generate/versioned/run.go +++ b/pkg/kubectl/generate/versioned/run.go @@ -38,22 +38,22 @@ type DeploymentV1Beta1 struct{} func (DeploymentV1Beta1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"replicas", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "replicas", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "serviceaccount", Required: false}, } } @@ -126,22 +126,22 @@ type DeploymentAppsV1Beta1 struct{} func (DeploymentAppsV1Beta1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"replicas", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "replicas", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "serviceaccount", Required: false}, } } @@ -291,23 +291,23 @@ type JobV1 struct{} func (JobV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"leave-stdin-open", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"restart", false}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "leave-stdin-open", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "restart", Required: false}, + {Name: "serviceaccount", Required: false}, } } @@ -385,24 +385,24 @@ type CronJobV2Alpha1 struct{} func (CronJobV2Alpha1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"leave-stdin-open", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"restart", false}, - {"schedule", true}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "leave-stdin-open", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "restart", Required: false}, + {Name: "schedule", Required: true}, + {Name: "serviceaccount", Required: false}, } } @@ -486,24 +486,24 @@ type CronJobV1Beta1 struct{} func (CronJobV1Beta1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"leave-stdin-open", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"restart", false}, - {"schedule", true}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "leave-stdin-open", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "restart", Required: false}, + {Name: "schedule", Required: true}, + {Name: "serviceaccount", Required: false}, } } @@ -587,22 +587,22 @@ type BasicReplicationController struct{} func (BasicReplicationController) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"replicas", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"tty", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "replicas", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "tty", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "serviceaccount", Required: false}, } } @@ -809,23 +809,23 @@ type BasicPod struct{} func (BasicPod) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"labels", false}, - {"default-name", false}, - {"name", true}, - {"image", true}, - {"image-pull-policy", false}, - {"port", false}, - {"hostport", false}, - {"stdin", false}, - {"leave-stdin-open", false}, - {"tty", false}, - {"restart", false}, - {"command", false}, - {"args", false}, - {"env", false}, - {"requests", false}, - {"limits", false}, - {"serviceaccount", false}, + {Name: "labels", Required: false}, + {Name: "default-name", Required: false}, + {Name: "name", Required: true}, + {Name: "image", Required: true}, + {Name: "image-pull-policy", Required: false}, + {Name: "port", Required: false}, + {Name: "hostport", Required: false}, + {Name: "stdin", Required: false}, + {Name: "leave-stdin-open", Required: false}, + {Name: "tty", Required: false}, + {Name: "restart", Required: false}, + {Name: "command", Required: false}, + {Name: "args", Required: false}, + {Name: "env", Required: false}, + {Name: "requests", Required: false}, + {Name: "limits", Required: false}, + {Name: "serviceaccount", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/secret.go b/pkg/kubectl/generate/versioned/secret.go index 9d2771c251..bca194139f 100644 --- a/pkg/kubectl/generate/versioned/secret.go +++ b/pkg/kubectl/generate/versioned/secret.go @@ -115,13 +115,13 @@ func (s SecretGeneratorV1) Generate(genericParams map[string]interface{}) (runti // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern func (s SecretGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"type", false}, - {"from-file", false}, - {"from-literal", false}, - {"from-env-file", false}, - {"force", false}, - {"append-hash", false}, + {Name: "name", Required: true}, + {Name: "type", Required: false}, + {Name: "from-file", Required: false}, + {Name: "from-literal", Required: false}, + {Name: "from-env-file", Required: false}, + {Name: "force", Required: false}, + {Name: "append-hash", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/secret_for_docker_registry.go b/pkg/kubectl/generate/versioned/secret_for_docker_registry.go index 36072cb3c7..e8996b8f2c 100644 --- a/pkg/kubectl/generate/versioned/secret_for_docker_registry.go +++ b/pkg/kubectl/generate/versioned/secret_for_docker_registry.go @@ -116,13 +116,13 @@ func (s SecretForDockerRegistryGeneratorV1) StructuredGenerate() (runtime.Object // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern func (s SecretForDockerRegistryGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"from-file", false}, - {"docker-username", true}, - {"docker-email", false}, - {"docker-password", true}, - {"docker-server", true}, - {"append-hash", false}, + {Name: "name", Required: true}, + {Name: "from-file", Required: false}, + {Name: "docker-username", Required: true}, + {Name: "docker-email", Required: false}, + {Name: "docker-password", Required: true}, + {Name: "docker-server", Required: true}, + {Name: "append-hash", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/secret_for_tls.go b/pkg/kubectl/generate/versioned/secret_for_tls.go index a9622547ce..0733dab7c1 100644 --- a/pkg/kubectl/generate/versioned/secret_for_tls.go +++ b/pkg/kubectl/generate/versioned/secret_for_tls.go @@ -124,10 +124,10 @@ func readFile(file string) ([]byte, error) { // ParamNames returns the set of supported input parameters when using the parameter injection generator pattern func (s SecretForTLSGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"key", true}, - {"cert", true}, - {"append-hash", false}, + {Name: "name", Required: true}, + {Name: "key", Required: true}, + {Name: "cert", Required: true}, + {Name: "append-hash", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/service.go b/pkg/kubectl/generate/versioned/service.go index dd35b04d0b..bea484098e 100644 --- a/pkg/kubectl/generate/versioned/service.go +++ b/pkg/kubectl/generate/versioned/service.go @@ -52,28 +52,28 @@ func (ServiceGeneratorV2) Generate(params map[string]interface{}) (runtime.Objec func paramNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"default-name", true}, - {"name", false}, - {"selector", true}, + {Name: "default-name", Required: true}, + {Name: "name", Required: false}, + {Name: "selector", Required: true}, // port will be used if a user specifies --port OR the exposed object // has one port - {"port", false}, + {Name: "port", Required: false}, // ports will be used iff a user doesn't specify --port AND the // exposed object has multiple ports - {"ports", false}, - {"labels", false}, - {"external-ip", false}, - {"load-balancer-ip", false}, - {"type", false}, - {"protocol", false}, + {Name: "ports", Required: false}, + {Name: "labels", Required: false}, + {Name: "external-ip", Required: false}, + {Name: "load-balancer-ip", Required: false}, + {Name: "type", Required: false}, + {Name: "protocol", Required: false}, // protocols will be used to keep port-protocol mapping derived from // exposed object - {"protocols", false}, - {"container-port", false}, // alias of target-port - {"target-port", false}, - {"port-name", false}, - {"session-affinity", false}, - {"cluster-ip", false}, + {Name: "protocols", Required: false}, + {Name: "container-port", Required: false}, // alias of target-port + {Name: "target-port", Required: false}, + {Name: "port-name", Required: false}, + {Name: "session-affinity", Required: false}, + {Name: "cluster-ip", Required: false}, } } diff --git a/pkg/kubectl/generate/versioned/service_basic.go b/pkg/kubectl/generate/versioned/service_basic.go index 10efd77659..be1e6667f3 100644 --- a/pkg/kubectl/generate/versioned/service_basic.go +++ b/pkg/kubectl/generate/versioned/service_basic.go @@ -57,29 +57,29 @@ type ServiceExternalNameGeneratorV1 struct { func (ServiceClusterIPGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"tcp", true}, - {"clusterip", false}, + {Name: "name", Required: true}, + {Name: "tcp", Required: true}, + {Name: "clusterip", Required: false}, } } func (ServiceNodePortGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"tcp", true}, - {"nodeport", true}, + {Name: "name", Required: true}, + {Name: "tcp", Required: true}, + {Name: "nodeport", Required: true}, } } func (ServiceLoadBalancerGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"tcp", true}, + {Name: "name", Required: true}, + {Name: "tcp", Required: true}, } } func (ServiceExternalNameGeneratorV1) ParamNames() []generate.GeneratorParam { return []generate.GeneratorParam{ - {"name", true}, - {"externalname", true}, + {Name: "name", Required: true}, + {Name: "externalname", Required: true}, } }