From 8acb51e0612a59076a8da6c232408f4a4c7ca631 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Mon, 30 Dec 2019 21:13:40 +0800 Subject: [PATCH] pkg/apis/ pkg/commands/ pkg/model/ staticcheck --- pkg/apis/kops/registry/helpers.go | 2 +- pkg/apis/kops/validation/instancegroup.go | 6 +++--- pkg/apis/kops/validation/validation.go | 2 +- pkg/commands/status_discovery.go | 4 ++-- pkg/model/components/kubecontrollermanager.go | 6 +++--- pkg/model/iam.go | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/apis/kops/registry/helpers.go b/pkg/apis/kops/registry/helpers.go index dc4349aa75..e8cc30e69f 100644 --- a/pkg/apis/kops/registry/helpers.go +++ b/pkg/apis/kops/registry/helpers.go @@ -32,7 +32,7 @@ func CreateClusterConfig(clientset simple.Clientset, cluster *api.Cluster, group return fmt.Errorf("InstanceGroup #%d did not have a Name", i+1) } if names[ns.ObjectMeta.Name] { - return fmt.Errorf("Duplicate InstanceGroup Name found: %q", ns.ObjectMeta.Name) + return fmt.Errorf("duplicate InstanceGroup Name found: %q", ns.ObjectMeta.Name) } names[ns.ObjectMeta.Name] = true } diff --git a/pkg/apis/kops/validation/instancegroup.go b/pkg/apis/kops/validation/instancegroup.go index 9338430e85..e61a25a9b6 100644 --- a/pkg/apis/kops/validation/instancegroup.go +++ b/pkg/apis/kops/validation/instancegroup.go @@ -77,7 +77,7 @@ func ValidateInstanceGroup(g *kops.InstanceGroup) error { if g.IsMaster() { if len(g.Spec.Subnets) == 0 { - return fmt.Errorf("Master InstanceGroup %s did not specify any Subnets", g.ObjectMeta.Name) + return fmt.Errorf("master InstanceGroup %s did not specify any Subnets", g.ObjectMeta.Name) } } @@ -218,7 +218,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, st for i := range cluster.Spec.Subnets { s := &cluster.Spec.Subnets[i] if clusterSubnets[s.Name] != nil { - return fmt.Errorf("Subnets contained a duplicate value: %v", s.Name) + return fmt.Errorf("subnets contained a duplicate value: %v", s.Name) } clusterSubnets[s.Name] = s } @@ -232,7 +232,7 @@ func CrossValidateInstanceGroup(g *kops.InstanceGroup, cluster *kops.Cluster, st k8sVersion, err := util.ParseKubernetesVersion(cluster.Spec.KubernetesVersion) if err != nil { - return fmt.Errorf("Unable to determine kubernetes version from %q", cluster.Spec.KubernetesVersion) + return fmt.Errorf("unable to determine kubernetes version from %q", cluster.Spec.KubernetesVersion) } allErrs := field.ErrorList{} diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 74da877178..6e03dfe9ac 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -384,7 +384,7 @@ func ValidateEtcdVersionForCalicoV3(e *kops.EtcdClusterSpec, majorVersion string } sem, err := semver.Parse(strings.TrimPrefix(version, "v")) if err != nil { - allErrs = append(allErrs, field.InternalError(fldPath.Child("MajorVersion"), fmt.Errorf("Failed to parse Etcd version to check compatibility: %s", err))) + allErrs = append(allErrs, field.InternalError(fldPath.Child("MajorVersion"), fmt.Errorf("failed to parse Etcd version to check compatibility: %s", err))) } if sem.Major != 3 { diff --git a/pkg/commands/status_discovery.go b/pkg/commands/status_discovery.go index 4f9261a4d1..1d34528802 100644 --- a/pkg/commands/status_discovery.go +++ b/pkg/commands/status_discovery.go @@ -64,7 +64,7 @@ func (s *CloudDiscoveryStatusStore) GetApiIngressStatus(cluster *kops.Cluster) ( if lb != nil { lbDnsName := aws.StringValue(lb.DNSName) if lbDnsName == "" { - return nil, fmt.Errorf("Found ELB %q, but it did not have a DNSName", name) + return nil, fmt.Errorf("found ELB %q, but it did not have a DNSName", name) } ingresses = append(ingresses, kops.ApiIngressStatus{Hostname: lbDnsName}) @@ -102,5 +102,5 @@ func (s *CloudDiscoveryStatusStore) FindClusterStatus(cluster *kops.Cluster) (*k if osCloud, ok := cloud.(openstack.OpenstackCloud); ok { return osCloud.FindClusterStatus(cluster) } - return nil, fmt.Errorf("Etcd Status not implemented for %T", cloud) + return nil, fmt.Errorf("etcd Status not implemented for %T", cloud) } diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go index 958caf44be..499f09c61c 100644 --- a/pkg/model/components/kubecontrollermanager.go +++ b/pkg/model/components/kubecontrollermanager.go @@ -52,17 +52,17 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error k8sv148, err := util.ParseKubernetesVersion("v1.4.8") if err != nil { - return fmt.Errorf("Unable to parse kubernetesVersion %s", err) + return fmt.Errorf("unable to parse kubernetesVersion %s", err) } k8sv152, err := util.ParseKubernetesVersion("v1.5.2") if err != nil { - return fmt.Errorf("Unable to parse kubernetesVersion %s", err) + return fmt.Errorf("unable to parse kubernetesVersion %s", err) } kubernetesVersion, err := KubernetesVersion(clusterSpec) if err != nil { - return fmt.Errorf("Unable to parse kubernetesVersion %s", err) + return fmt.Errorf("unable to parse kubernetesVersion %s", err) } // In 1.4.8+ and 1.5.2+ k8s added the capability to tune the duration upon which the volume attach detach diff --git a/pkg/model/iam.go b/pkg/model/iam.go index 944e9046fc..d7e41678a7 100644 --- a/pkg/model/iam.go +++ b/pkg/model/iam.go @@ -59,7 +59,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error { specProfile := fi.StringValue(ig.Spec.IAM.Profile) if matchingRole, ok := sharedProfileARNsToIGRole[specProfile]; ok { if matchingRole != ig.Spec.Role { - return fmt.Errorf("Found IAM instance profile assigned to multiple Instance Group roles %v and %v: %v", + return fmt.Errorf("found IAM instance profile assigned to multiple Instance Group roles %v and %v: %v", ig.Spec.Role, sharedProfileARNsToIGRole[specProfile], specProfile) } } else {