[go-vet] Few more static analysis fixes.

jumpojoy · Dec 14, 2021 · 2ecebf1 · 2ecebf1
1 parent cfe1248
commit 2ecebf1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/metrics/eventmetrics_test.go b/metrics/eventmetrics_test.go
@@ -183,7 +183,7 @@ func BenchmarkEventMetricsStringer(b *testing.B) {
 	})
 	// run the em.String() function b.N times
 	for n := 0; n < b.N; n++ {
-		em.String()
+		_ = em.String()
 	}
 }
 

diff --git a/probes/dns/dns_test.go b/probes/dns/dns_test.go
@@ -20,14 +20,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/cloudprober/cloudprober/logger"
 	"github.com/cloudprober/cloudprober/probes/common/statskeeper"
 	configpb "github.com/cloudprober/cloudprober/probes/dns/proto"
 	"github.com/cloudprober/cloudprober/probes/options"
 	"github.com/cloudprober/cloudprober/targets"
 	"github.com/cloudprober/cloudprober/validators"
 	validatorpb "github.com/cloudprober/cloudprober/validators/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/miekg/dns"
 )
 
@@ -203,7 +203,12 @@ func TestValidator(t *testing.T) {
 		{"match", answerMatchPattern, 1},
 		{"nomatch", answerNoMatchPattern, 0},
 	} {
-		valPb := []*validatorpb.Validator{{Name: proto.String(tst.name), Type: &validatorpb.Validator_Regex{tst.pattern}}}
+		valPb := []*validatorpb.Validator{
+			{
+				Name: proto.String(tst.name),
+				Type: &validatorpb.Validator_Regex{Regex: tst.pattern},
+			},
+		}
 		validator, err := validators.Init(valPb, nil)
 		if err != nil {
 			t.Fatalf("Error initializing validator for pattern %v: %v", tst.pattern, err)

diff --git a/probes/grpc/grpc.go b/probes/grpc/grpc.go
@@ -29,7 +29,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/cloudprober/cloudprober/common/oauth"
 	"github.com/cloudprober/cloudprober/logger"
 	"github.com/cloudprober/cloudprober/metrics"
@@ -38,6 +37,7 @@ import (
 	"github.com/cloudprober/cloudprober/probes/probeutils"
 	"github.com/cloudprober/cloudprober/sysvars"
 	"github.com/cloudprober/cloudprober/targets/endpoint"
+	"github.com/golang/protobuf/proto"
 
 	pb "github.com/cloudprober/cloudprober/servers/grpc/proto"
 	spb "github.com/cloudprober/cloudprober/servers/grpc/proto"
@@ -98,7 +98,7 @@ func (p *Probe) setupDialOpts() error {
 		if err != nil {
 			return err
 		}
-		p.dialOpts = append(p.dialOpts, grpc.WithPerRPCCredentials(grpcoauth.TokenSource{oauthTS}))
+		p.dialOpts = append(p.dialOpts, grpc.WithPerRPCCredentials(grpcoauth.TokenSource{TokenSource: oauthTS}))
 	}
 	altsCfg := p.c.GetAltsConfig()
 	if altsCfg != nil {

diff --git a/probes/options/options_test.go b/probes/options/options_test.go
@@ -122,9 +122,9 @@ func TestGetSourceIPFromConfig(t *testing.T) {
 		}
 
 		if r.sourceIP != "" {
-			p.SourceIpConfig = &configpb.ProbeDef_SourceIp{r.sourceIP}
+			p.SourceIpConfig = &configpb.ProbeDef_SourceIp{SourceIp: r.sourceIP}
 		} else if r.sourceIntf != "" {
-			p.SourceIpConfig = &configpb.ProbeDef_SourceInterface{r.sourceIntf}
+			p.SourceIpConfig = &configpb.ProbeDef_SourceInterface{SourceInterface: r.sourceIntf}
 			mockInterfaceByName(r.intf, r.intfAddrs)
 		}
 
@@ -175,7 +175,7 @@ func TestIPVersionFromSourceIP(t *testing.T) {
 		}
 
 		if r.sourceIP != "" {
-			p.SourceIpConfig = &configpb.ProbeDef_SourceIp{r.sourceIP}
+			p.SourceIpConfig = &configpb.ProbeDef_SourceIp{SourceIp: r.sourceIP}
 		}
 
 		opts, err := BuildProbeOptions(p, nil, nil, nil)

diff --git a/rds/client/client.go b/rds/client/client.go
@@ -199,7 +199,7 @@ func (client *Client) initListResourcesFunc() error {
 		if err != nil {
 			return fmt.Errorf("rds/client: error getting token source from OAuth config (%+v): %v", client.serverOpts.GetOauthConfig(), err)
 		}
-		client.dialOpts = append(client.dialOpts, grpc.WithPerRPCCredentials(grpcoauth.TokenSource{oauthTS}))
+		client.dialOpts = append(client.dialOpts, grpc.WithPerRPCCredentials(grpcoauth.TokenSource{TokenSource: oauthTS}))
 	}
 
 	conn, err := client.connect(client.serverOpts.GetServerAddress())

diff --git a/surfacers/surfacers.go b/surfacers/surfacers.go
@@ -79,10 +79,10 @@ var StatusTmpl = template.Must(template.New("statusTmpl").Parse(`
 
 // Default surfacers. These surfacers are enabled if no surfacer is defined.
 var defaultSurfacers = []*surfacerpb.SurfacerDef{
-	&surfacerpb.SurfacerDef{
+	{
 		Type: surfacerpb.Type_PROMETHEUS.Enum(),
 	},
-	&surfacerpb.SurfacerDef{
+	{
 		Type: surfacerpb.Type_FILE.Enum(),
 	},
 }

diff --git a/surfacers/surfacers_test.go b/surfacers/surfacers_test.go
@@ -22,10 +22,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/cloudprober/cloudprober/metrics"
 	fileconfigpb "github.com/cloudprober/cloudprober/surfacers/file/proto"
 	surfacerpb "github.com/cloudprober/cloudprober/surfacers/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestDefaultConfig(t *testing.T) {
@@ -39,7 +39,7 @@ func TestDefaultConfig(t *testing.T) {
 }
 
 func TestEmptyConfig(t *testing.T) {
-	s, err := Init(context.Background(), []*surfacerpb.SurfacerDef{&surfacerpb.SurfacerDef{}})
+	s, err := Init(context.Background(), []*surfacerpb.SurfacerDef{{}})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -59,7 +59,7 @@ func TestInferType(t *testing.T) {
 	s, err := Init(context.Background(), []*surfacerpb.SurfacerDef{
 		{
 			Surfacer: &surfacerpb.SurfacerDef_FileSurfacer{
-				&fileconfigpb.SurfacerConf{
+				FileSurfacer: &fileconfigpb.SurfacerConf{
 					FilePath: proto.String(tmpfile.Name()),
 				},
 			},
@@ -190,8 +190,7 @@ func TestFailureMetric(t *testing.T) {
 
 	wantEventMetrics := [][]*metrics.EventMetrics{
 		testEventMetrics, // s1
-
-		[]*metrics.EventMetrics{
+		{
 			testEventMetrics[0].Clone().
 				AddMetric("failure", metrics.NewInt(2)),
 			testEventMetrics[1], // unchanged