Enable nakedret golangci-lint linter

vihangm · vihangm · commit 92f0bffd63e7 · 2021-03-29T18:12:03.000-07:00
Summary: TSIA Test Plan: `GO_ENABLED=0 golangci-lint run` reports no errors Reviewers: zasgar Reviewed By: zasgar Differential Revision: https://phab.corp.pixielabs.ai/D7908 GitOrigin-RevId: 2ce6dc2
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -19,6 +19,7 @@ linters:
   - ineffassign
   - makezero
   - misspell
+  - nakedret
   - nolintlint
   - staticcheck
   - structcheck
@@ -39,3 +40,5 @@ linters:
 linters-settings:
   goimports:
     local-prefixes: pixielabs.ai
+  nakedret:
+    max-func-lines: 0
diff --git a/src/cloud/api/ptproxy/vizier_pt_proxy.go b/src/cloud/api/ptproxy/vizier_pt_proxy.go
@@ -95,14 +95,11 @@ func (v *VizierPassThroughProxy) DebugPods(req *pl_api_vizierpb.DebugPodsRequest
 	return rp.Run()
 }
 
-func getCredsFromCtx(ctx context.Context) (token string, claim *jwt.JWTClaims, err error) {
-	var aCtx *authcontext.AuthContext
-	aCtx, err = authcontext.FromContext(ctx)
+func getCredsFromCtx(ctx context.Context) (string, *jwt.JWTClaims, error) {
+	aCtx, err := authcontext.FromContext(ctx)
 	if err != nil {
-		return
+		return "", nil, err
 	}
 
-	token = aCtx.AuthToken
-	claim = aCtx.Claims
-	return
+	return aCtx.AuthToken, aCtx.Claims, nil
 }
diff --git a/src/cloud/indexer/indexer_server.go b/src/cloud/indexer/indexer_server.go
@@ -50,23 +50,24 @@ func newVZMgrClient() (vzmgrpb.VZMgrServiceClient, error) {
 	return vzmgrpb.NewVZMgrServiceClient(vzmgrChannel), nil
 }
 
-func createStanNatsConnection(clientID string) (nc *nats.Conn, sc stan.Conn, err error) {
-	nc, err = nats.Connect(viper.GetString("nats_url"),
+func createStanNatsConnection(clientID string) (*nats.Conn, stan.Conn, error) {
+	nc, err := nats.Connect(viper.GetString("nats_url"),
 		nats.ClientCert(viper.GetString("client_tls_cert"), viper.GetString("client_tls_key")),
 		nats.RootCAs(viper.GetString("tls_ca_cert")))
 	if err != nil {
 		log.WithError(err).Error("NATS connection failed")
-		return
+		return nil, nil, err
 	}
-	sc, err = stan.Connect(viper.GetString("stan_cluster"),
+	sc, err := stan.Connect(viper.GetString("stan_cluster"),
 		clientID, stan.NatsConn(nc),
 		stan.SetConnectionLostHandler(func(_ stan.Conn, err error) {
 			log.WithError(err).Fatal("STAN Connection Lost")
 		}))
 	if err != nil {
 		log.WithError(err).Error("STAN connection failed")
+		return nil, nil, err
 	}
-	return
+	return nc, sc, nil
 }
 
 func getESHTTPSClient() (*http.Client, error) {
diff --git a/src/cloud/vzconn/vzconn_server.go b/src/cloud/vzconn/vzconn_server.go
@@ -41,23 +41,24 @@ func newVZMgrClients() (vzmgrpb.VZMgrServiceClient, vzmgrpb.VZDeploymentServiceC
 	return vzmgrpb.NewVZMgrServiceClient(vzmgrChannel), vzmgrpb.NewVZDeploymentServiceClient(vzmgrChannel), nil
 }
 
-func createStanNatsConnection(clientID string) (nc *nats.Conn, sc stan.Conn, err error) {
-	nc, err = nats.Connect(viper.GetString("nats_url"),
+func createStanNatsConnection(clientID string) (*nats.Conn, stan.Conn, error) {
+	nc, err := nats.Connect(viper.GetString("nats_url"),
 		nats.ClientCert(viper.GetString("client_tls_cert"), viper.GetString("client_tls_key")),
 		nats.RootCAs(viper.GetString("tls_ca_cert")))
 	if err != nil {
 		log.WithError(err).Error("NATS connection failed")
-		return
+		return nil, nil, err
 	}
-	sc, err = stan.Connect(viper.GetString("stan_cluster"),
+	sc, err := stan.Connect(viper.GetString("stan_cluster"),
 		clientID, stan.NatsConn(nc),
 		stan.SetConnectionLostHandler(func(_ stan.Conn, err error) {
 			log.WithError(err).Fatal("STAN Connection Lost")
 		}))
 	if err != nil {
 		log.WithError(err).Error("STAN connection failed")
+		return nil, nil, err
 	}
-	return
+	return nc, sc, nil
 }
 
 func main() {
diff --git a/src/pixie_cli/pkg/components/input_field.go b/src/pixie_cli/pkg/components/input_field.go
@@ -374,7 +374,8 @@ func (i *InputField) Focus(func(p tview.Primitive)) {
 // stringWidth returns the number of horizontal cells needed to print the given
 // text. It splits the text into its grapheme clusters, calculates each
 // cluster's width, and adds them up to a total.
-func stringWidth(text string) (width int) {
+func stringWidth(text string) int {
+	width := 0
 	g := uniseg.NewGraphemes(text)
 	for g.Next() {
 		var chWidth int
@@ -386,7 +387,7 @@ func stringWidth(text string) (width int) {
 		}
 		width += chWidth
 	}
-	return
+	return width
 }
 
 // iterateString iterates through the given string one printed character at a
diff --git a/src/pixie_cli/pkg/components/status.go b/src/pixie_cli/pkg/components/status.go
@@ -11,7 +11,8 @@ var (
 	statusErr = "\u2715"
 )
 
-func computePadding(s string, pad int) (padS int, padE int) {
+func computePadding(s string, pad int) (int, int) {
+	var padS, padE int
 	pad -= len([]rune(s))
 	if pad < 0 {
 		pad = 0
@@ -22,7 +23,7 @@ func computePadding(s string, pad int) (padS int, padE int) {
 	if pad%2 != 0 {
 		padE = padS + 1
 	}
-	return
+	return padS, padE
 }
 
 // StatusOK prints out the default OK symbol, center padded to the size specified.
diff --git a/src/vizier/services/cloud_connector/bridge/server.go b/src/vizier/services/cloud_connector/bridge/server.go
@@ -937,8 +937,8 @@ func (s *Bridge) publishBridgeSync(stream vzconnpb.VZConnService_NATSBridgeClien
 	return nil
 }
 
-func (s *Bridge) generateHeartbeats(done <-chan bool) (hbCh chan *cvmsgspb.VizierHeartbeat) {
-	hbCh = make(chan *cvmsgspb.VizierHeartbeat)
+func (s *Bridge) generateHeartbeats(done <-chan bool) chan *cvmsgspb.VizierHeartbeat {
+	hbCh := make(chan *cvmsgspb.VizierHeartbeat)
 
 	sendHeartbeat := func() {
 		addr, port, err := s.vzInfo.GetAddress()
@@ -992,7 +992,7 @@ func (s *Bridge) generateHeartbeats(done <-chan bool) (hbCh chan *cvmsgspb.Vizie
 			}
 		}
 	}()
-	return
+	return hbCh
 }
 
 func (s *Bridge) currentStatus() cvmsgspb.VizierStatus {

Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,11 @@ func (v VizierPassThroughProxy) DebugPods(req pl_api_vizierpb.DebugPodsRequest`
`95`	`95`	`return rp.Run()`
`96`	`96`	`}`
`97`	`97`
`98`		`-func getCredsFromCtx(ctx context.Context) (token string, claim *jwt.JWTClaims, err error) {`
`99`		`- var aCtx *authcontext.AuthContext`
`100`		`- aCtx, err = authcontext.FromContext(ctx)`
	`98`	`+func getCredsFromCtx(ctx context.Context) (string, *jwt.JWTClaims, error) {`
	`99`	`+ aCtx, err := authcontext.FromContext(ctx)`
`101`	`100`	`if err != nil {`
`102`		`- return`
	`101`	`+ return "", nil, err`
`103`	`102`	`}`
`104`	`103`
`105`		`- token = aCtx.AuthToken`
`106`		`- claim = aCtx.Claims`
`107`		`- return`
	`104`	`+ return aCtx.AuthToken, aCtx.Claims, nil`
`108`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,8 @@ func (i *InputField) Focus(func(p tview.Primitive)) {`
`374`	`374`	`// stringWidth returns the number of horizontal cells needed to print the given`
`375`	`375`	`// text. It splits the text into its grapheme clusters, calculates each`
`376`	`376`	`// cluster's width, and adds them up to a total.`
`377`		`-func stringWidth(text string) (width int) {`
	`377`	`+func stringWidth(text string) int {`
	`378`	`+ width := 0`
`378`	`379`	`g := uniseg.NewGraphemes(text)`
`379`	`380`	`for g.Next() {`
`380`	`381`	`var chWidth int`
`@@ -386,7 +387,7 @@ func stringWidth(text string) (width int) {`
`386`	`387`	`}`
`387`	`388`	`width += chWidth`
`388`	`389`	`}`
`389`		`- return`
	`390`	`+ return width`
`390`	`391`	`}`
`391`	`392`
`392`	`393`	`// iterateString iterates through the given string one printed character at a`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ var (`
`11`	`11`	`statusErr = "\u2715"`
`12`	`12`	`)`
`13`	`13`
`14`		`-func computePadding(s string, pad int) (padS int, padE int) {`
	`14`	`+func computePadding(s string, pad int) (int, int) {`
	`15`	`+ var padS, padE int`
`15`	`16`	`pad -= len([]rune(s))`
`16`	`17`	`if pad < 0 {`
`17`	`18`	`pad = 0`
`@@ -22,7 +23,7 @@ func computePadding(s string, pad int) (padS int, padE int) {`
`22`	`23`	`if pad%2 != 0 {`
`23`	`24`	`padE = padS + 1`
`24`	`25`	`}`
`25`		`- return`
	`26`	`+ return padS, padE`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`// StatusOK prints out the default OK symbol, center padded to the size specified.`
Original file line number	Diff line number	Diff line change
`@@ -937,8 +937,8 @@ func (s *Bridge) publishBridgeSync(stream vzconnpb.VZConnService_NATSBridgeClien`
`937`	`937`	`return nil`
`938`	`938`	`}`
`939`	`939`
`940`		`-func (s Bridge) generateHeartbeats(done <-chan bool) (hbCh chan cvmsgspb.VizierHeartbeat) {`
`941`		`- hbCh = make(chan *cvmsgspb.VizierHeartbeat)`
	`940`	`+func (s Bridge) generateHeartbeats(done <-chan bool) chan cvmsgspb.VizierHeartbeat {`
	`941`	`+ hbCh := make(chan *cvmsgspb.VizierHeartbeat)`
`942`	`942`
`943`	`943`	`sendHeartbeat := func() {`
`944`	`944`	`addr, port, err := s.vzInfo.GetAddress()`
`@@ -992,7 +992,7 @@ func (s Bridge) generateHeartbeats(done <-chan bool) (hbCh chan cvmsgspb.Vizie`
`992`	`992`	`}`
`993`	`993`	`}`
`994`	`994`	`}()`
`995`		`- return`
	`995`	`+ return hbCh`
`996`	`996`	`}`
`997`	`997`
`998`	`998`	`func (s *Bridge) currentStatus() cvmsgspb.VizierStatus {`