Merge pull request #7755 from tanjunchen/fix-up-static-error

fix-up staticcheck error

dnsprovider/pkg/dnsprovider/providers/openstack/designate/rrchangeset.go

@@ -56,11 +56,11 @@ func (c *ResourceRecordChangeset) Apply() error {
 	for _, removal := range c.removals {
 		rrID, err := c.nameToID(removal.Name())
 		if err != nil {
-
+			return err
 		}
 		err = recordsets.Delete(c.zone.zones.iface.sc, zoneID, rrID).ExtractErr()
 		if err != nil {
-
+			return err
 		}
 	}
 
@@ -73,14 +73,14 @@ func (c *ResourceRecordChangeset) Apply() error {
 		}
 		_, err := recordsets.Create(c.zone.zones.iface.sc, zoneID, opts).Extract()
 		if err != nil {
-
+			return err
 		}
 	}
 
 	for _, upsert := range c.upserts {
 		rrID, err := c.nameToID(upsert.Name())
 		if err != nil {
-
+			return err
 		}
 		uopts := recordsets.UpdateOpts{
 			TTL:     int(upsert.Ttl()),
@@ -96,7 +96,7 @@ func (c *ResourceRecordChangeset) Apply() error {
 			}
 			_, err := recordsets.Create(c.zone.zones.iface.sc, zoneID, copts).Extract()
 			if err != nil {
-
+				return err
 			}
 		}
 	}

nodeup/pkg/model/context.go

@@ -398,13 +398,13 @@ func (c *NodeupModelContext) UseSecureKubelet() bool {
 
 	// @check if we have anything specific to master kubelet
 	if c.IsMaster {
-		if cluster.MasterKubelet != nil && cluster.MasterKubelet.AnonymousAuth != nil && *cluster.MasterKubelet.AnonymousAuth == false {
+		if cluster.MasterKubelet != nil && cluster.MasterKubelet.AnonymousAuth != nil && !*cluster.MasterKubelet.AnonymousAuth {
 			return true
 		}
 	}
 
 	// @check the default settings for master and kubelet
-	if cluster.Kubelet != nil && cluster.Kubelet.AnonymousAuth != nil && *cluster.Kubelet.AnonymousAuth == false {
+	if cluster.Kubelet != nil && cluster.Kubelet.AnonymousAuth != nil && !*cluster.Kubelet.AnonymousAuth {
 		return true
 	}
 

pkg/kubemanifest/visitor.go

@@ -48,9 +48,9 @@ type Visitor interface {
 }
 
 func visit(visitor Visitor, data interface{}, path []string, mutator func(interface{})) error {
-	switch data.(type) {
+	switch data := data.(type) {
 	case string:
-		err := visitor.VisitString(path, data.(string), func(v string) {
+		err := visitor.VisitString(path, data, func(v string) {
 			mutator(v)
 		})
 		if err != nil {
@@ -58,7 +58,7 @@ func visit(visitor Visitor, data interface{}, path []string, mutator func(interf
 		}
 
 	case bool:
-		err := visitor.VisitBool(path, data.(bool), func(v bool) {
+		err := visitor.VisitBool(path, data, func(v bool) {
 			mutator(v)
 		})
 		if err != nil {
@@ -66,7 +66,7 @@ func visit(visitor Visitor, data interface{}, path []string, mutator func(interf
 		}
 
 	case float64:
-		err := visitor.VisitFloat64(path, data.(float64), func(v float64) {
+		err := visitor.VisitFloat64(path, data, func(v float64) {
 			mutator(v)
 		})
 		if err != nil {
@@ -74,7 +74,7 @@ func visit(visitor Visitor, data interface{}, path []string, mutator func(interf
 		}
 
 	case map[string]interface{}:
-		m := data.(map[string]interface{})
+		m := data
 		for k, v := range m {
 			path = append(path, k)
 
@@ -88,7 +88,7 @@ func visit(visitor Visitor, data interface{}, path []string, mutator func(interf
 		}
 
 	case []interface{}:
-		s := data.([]interface{})
+		s := data
 		for i, v := range s {
 			path = append(path, fmt.Sprintf("[%d]", i))
 

pkg/model/components/kubelet.go

@@ -69,7 +69,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 		if clusterSpec.Kubelet.AllowPrivileged != nil {
 			// If it is explicitly set to false, return an error, because this
 			// behavior is no longer supported in v1.14 (the default was true, prior).
-			if *clusterSpec.Kubelet.AllowPrivileged == false {
+			if !*clusterSpec.Kubelet.AllowPrivileged {
 				klog.Warningf("Kubelet's --allow-privileged flag is no longer supported in v1.14.")
 			}
 			// Explicitly set it to nil, so it won't be passed on the command line.

pkg/model/context.go

@@ -307,7 +307,7 @@ func (m *KopsModelContext) UseLoadBalancerForAPI() bool {
 // HA - see https://github.com/kubernetes/kops/issues/4252
 func (m *KopsModelContext) UseLoadBalancerForInternalAPI() bool {
 	return m.UseLoadBalancerForAPI() &&
-		m.Cluster.Spec.API.LoadBalancer.UseForInternalApi == true
+		m.Cluster.Spec.API.LoadBalancer.UseForInternalApi
 }
 
 // UsePrivateDNS checks if we are using private DNS

pkg/resources/aws/aws.go

@@ -230,7 +230,7 @@ func addUntaggedRouteTables(cloud awsup.AWSCloud, clusterName string, resources
 
 		isMain := false
 		for _, a := range rt.Associations {
-			if aws.BoolValue(a.Main) == true {
+			if aws.BoolValue(a.Main) {
 				isMain = true
 			}
 		}

protokube/pkg/protokube/etcd_manifest.go

@@ -244,7 +244,7 @@ func buildCertificateDirectories(c *EtcdCluster) []string {
 	tracked := make(map[string]bool, 0)
 
 	for _, x := range []string{c.TLSCA, c.TLSCert, c.TLSKey, c.PeerCA, c.PeerKey, c.PeerKey} {
-		if x == "" || tracked[filepath.Dir(x)] == true {
+		if x == "" || tracked[filepath.Dir(x)] {
 			continue
 		}
 		tracked[filepath.Dir(x)] = true

upup/pkg/fi/cloudup/gce/op.go

@@ -102,7 +102,7 @@ func waitForOp(op *compute.Operation, getOperation func(operationName string) (*
 	return wait.Poll(operationPollInterval, operationPollTimeoutDuration, func() (bool, error) {
 		start := time.Now()
 		//gce.operationPollRateLimiter.Accept()
-		duration := time.Now().Sub(start)
+		duration := time.Since(start)
 		if duration > 5*time.Second {
 			klog.Infof("pollOperation: throttled %v for %v", duration, opName)
 		}
@@ -112,7 +112,7 @@ func waitForOp(op *compute.Operation, getOperation func(operationName string) (*
 		}
 		done := opIsDone(pollOp)
 		if done {
-			duration := time.Now().Sub(opStart)
+			duration := time.Since(opStart)
 			if duration > 1*time.Minute {
 				// Log the JSON. It's cleaner than the %v structure.
 				enc, err := pollOp.MarshalJSON()

upup/pkg/fi/cloudup/spotinsttasks/elastigroup.go

@@ -803,9 +803,7 @@ func (_ *Elastigroup) update(cloud awsup.AWSCloud, a, e, changes *Elastigroup) e
 				}
 
 				types := make([]string, len(e.SpotInstanceTypes))
-				for i, typ := range e.SpotInstanceTypes {
-					types[i] = typ
-				}
+				copy(types, e.SpotInstanceTypes)
 
 				group.Compute.InstanceTypes.SetSpot(types)
 				changes.SpotInstanceTypes = nil

upup/pkg/fi/cloudup/terraform/hcl_printer.go

@@ -69,7 +69,7 @@ func (v *astSanitizer) visitObjectItem(o *ast.ObjectItem) {
 				v := text[1 : len(text)-1]
 				safe := true
 				for _, c := range v {
-					if strings.IndexRune(safeChars, c) == -1 {
+					if !strings.ContainsRune(safeChars, c) {
 						safe = false
 						break
 					}

upup/pkg/fi/utils/sanitize.go

@@ -28,14 +28,14 @@ func SanitizeString(s string) string {
 	var out bytes.Buffer
 	allowed := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-"
 	for _, c := range s {
-		if strings.IndexRune(allowed, c) != -1 {
+		if strings.ContainsRune(allowed, c) {
 			out.WriteRune(c)
 		} else {
 			out.WriteRune('_')
 		}
 	}
 
-	return string(out.Bytes())
+	return out.String()
 }
 
 // ExpandPath replaces common path aliases: ~ -> $HOME