PMM-7 Lint fix.

admin/commands/summary.go

@@ -357,12 +357,12 @@ type SummaryCommand struct {
 	Pprof      bool   `name:"pprof" help:"Include performance profiling data"`
 }
 
-func (cmd *SummaryCommand) makeArchive(ctx context.Context, globals *flags.GlobalFlags) (err error) {
+func (cmd *SummaryCommand) makeArchive(ctx context.Context, globals *flags.GlobalFlags) error {
 	var f *os.File
+	var err error
 
 	if f, err = os.Create(cmd.Filename); err != nil {
-		err = errors.WithStack(err)
-		return //nolint:nakedret
+		return errors.WithStack(err)
 	}
 
 	defer func() {
@@ -389,7 +389,7 @@ func (cmd *SummaryCommand) makeArchive(ctx context.Context, globals *flags.Globa
 		addServerData(ctx, zipW, cmd.Pprof)
 	}
 
-	return //nolint:nakedret
+	return nil
 }
 
 // RunCmdWithContext runs summary command.

agent/agents/process/process_logger.go

@@ -55,23 +55,22 @@ func newProcessLogger(l *logrus.Entry, lines int, redactWords []string) *process
 
 // Write implements io.Writer.
 // This method is thread-safe.
-func (pl *processLogger) Write(p []byte) (n int, err error) { //nolint:nonamedreturns
+func (pl *processLogger) Write(p []byte) (int, error) {
 	pl.m.Lock()
 	defer pl.m.Unlock()
 
 	b := bytes.NewBuffer(pl.buf)
-	n, err = b.Write(p)
+	n, err := b.Write(p)
 	if err != nil {
-		return //nolint:nakedret
+		return n, err
 	}
 
 	var line string
 	for {
 		line, err = b.ReadString('\n')
 		if err != nil {
 			pl.buf = []byte(line)
-			err = nil
-			return //nolint:nakedret
+			return n, nil //nolint:nilerr
 		}
 		line = strings.TrimSuffix(line, "\n")
 		if pl.replacer != nil {

agent/client/channel/channel_test.go

@@ -49,10 +49,12 @@ func (s *testServer) Connect(stream agentpb.Agent_ConnectServer) error {
 
 var _ agentpb.AgentServer = (*testServer)(nil)
 
-//nolint:nakedret
-func setup(t *testing.T, connect func(agentpb.Agent_ConnectServer) error, expected ...error) (channel *Channel, cc *grpc.ClientConn, teardown func()) {
+func setup(t *testing.T, connect func(agentpb.Agent_ConnectServer) error, expected ...error) (*Channel, *grpc.ClientConn, func()) {
 	t.Helper()
 
+	var channel *Channel
+	var cc *grpc.ClientConn
+	var teardown func()
 	// logrus.SetLevel(logrus.DebugLevel)
 
 	// start server with given connect handler
@@ -101,7 +103,7 @@ func setup(t *testing.T, connect func(agentpb.Agent_ConnectServer) error, expect
 		require.NoError(t, <-serveError)
 	}
 
-	return
+	return channel, cc, teardown
 }
 
 func TestAgentRequestWithTruncatedInvalidUTF8(t *testing.T) {

agent/config/config.go

@@ -186,7 +186,9 @@ func getFromCmdLine(cfg *Config, l *logrus.Entry) (string, error) {
 }
 
 // get is Get for unit tests: it parses args instead of command-line.
-func get(args []string, cfg *Config, l *logrus.Entry) (configFileF string, err error) { //nolint:nonamedreturns,cyclop
+func get(args []string, cfg *Config, l *logrus.Entry) (string, error) { //nolint:cyclop
+	var configFileF string
+	var err error
 	// tweak configuration on exit to cover all return points
 	defer func() {
 		if cfg == nil {
@@ -302,25 +304,25 @@ func get(args []string, cfg *Config, l *logrus.Entry) (configFileF string, err e
 	// parse command-line flags and environment variables
 	app, cfgFileF := Application(cfg)
 	if _, err = app.Parse(args); err != nil {
-		return //nolint:nakedret
+		return configFileF, err
 	}
 	if *cfgFileF == "" {
-		return //nolint:nakedret
+		return configFileF, err
 	}
 
 	if configFileF, err = filepath.Abs(*cfgFileF); err != nil {
-		return //nolint:nakedret
+		return configFileF, err
 	}
 	l.Infof("Loading configuration file %s.", configFileF)
 	fileCfg, err := loadFromFile(configFileF)
 	if err != nil {
-		return //nolint:nakedret
+		return configFileF, err
 	}
 
 	// re-parse flags into configuration from file
 	app, _ = Application(fileCfg)
 	if _, err = app.Parse(args); err != nil {
-		return //nolint:nakedret
+		return configFileF, err
 	}
 
 	*cfg = *fileCfg

managed/models/action_helpers_test.go

@@ -118,8 +118,12 @@ func TestCleanupResults(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
+
+		var q *reform.Querier
+		var teardown func(t *testing.T)
+
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
@@ -158,7 +162,7 @@ func TestCleanupResults(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("CheckActionResultByID", func(t *testing.T) {

managed/models/agent_helpers_test.go

@@ -45,12 +45,12 @@ func TestAgentHelpers(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.Node{
@@ -188,11 +188,11 @@ func TestAgentHelpers(t *testing.T) {
 			require.NoError(t, q.Insert(str))
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("AgentsForNode", func(t *testing.T) {

managed/models/agent_model_test.go

@@ -384,12 +384,12 @@ func TestExporterURL(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.Node{
@@ -504,11 +504,11 @@ func TestExporterURL(t *testing.T) {
 			require.NoError(t, q.Insert(str), "failed to INSERT %+v", str)
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("ExporterURL", func(t *testing.T) {

managed/models/dsn_helpers_test.go

@@ -43,12 +43,12 @@ func TestFindDSNByServiceID(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.Node{
@@ -165,11 +165,11 @@ func TestFindDSNByServiceID(t *testing.T) {
 			require.NoError(t, q.Insert(str))
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("FindDSNByServiceIDandPMMAgentIDWithNoAgent", func(t *testing.T) {

managed/models/kubernetes_helpers_test.go

@@ -44,12 +44,12 @@ func TestKubernetesHelpers(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	})
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.KubernetesCluster{
@@ -82,11 +82,11 @@ func TestKubernetesHelpers(t *testing.T) {
 			require.NoError(t, q.Insert(str), "failed to INSERT %+v", str)
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("FindAllKubernetesClusters", func(t *testing.T) {

managed/models/node_helpers_test.go

@@ -43,12 +43,12 @@ func TestNodeHelpers(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.Node{
@@ -111,11 +111,11 @@ func TestNodeHelpers(t *testing.T) {
 			require.NoError(t, q.Insert(str), "failed to INSERT %+v", str)
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("CreateNode", func(t *testing.T) {

managed/models/service_helpers_test.go

@@ -43,12 +43,12 @@ func TestServiceHelpers(t *testing.T) {
 		require.NoError(t, sqlDB.Close())
 	}()
 
-	setup := func(t *testing.T) (q *reform.Querier, teardown func(t *testing.T)) {
+	setup := func(t *testing.T) (*reform.Querier, func(t *testing.T)) {
 		t.Helper()
 		db := reform.NewDB(sqlDB, postgresql.Dialect, reform.NewPrintfLogger(t.Logf))
 		tx, err := db.Begin()
 		require.NoError(t, err)
-		q = tx.Querier
+		q := tx.Querier
 
 		for _, str := range []reform.Struct{
 			&models.Node{
@@ -140,11 +140,11 @@ func TestServiceHelpers(t *testing.T) {
 			require.NoError(t, q.Insert(str))
 		}
 
-		teardown = func(t *testing.T) {
+		teardown := func(t *testing.T) {
 			t.Helper()
 			require.NoError(t, tx.Rollback())
 		}
-		return //nolint:nakedret
+		return q, teardown
 	}
 
 	t.Run("FindServices", func(t *testing.T) {

managed/services/management/dbaas/components_service_test.go

@@ -53,18 +53,18 @@ func TestComponentService(t *testing.T) {
 		kubeConfig  = "{}"
 	)
 
-	setup := func(t *testing.T) (ctx context.Context, cs dbaasv1beta1.ComponentsServer, dbaasClient *mockDbaasClient, kubeClient *mockKubernetesClient,
-		kubeStorage *mockKubeStorageManager,
+	setup := func(t *testing.T) (context.Context, dbaasv1beta1.ComponentsServer, *mockDbaasClient, *mockKubernetesClient,
+		*mockKubeStorageManager,
 	) {
 		t.Helper()
 
-		ctx = logger.Set(context.Background(), t.Name())
+		ctx := logger.Set(context.Background(), t.Name())
 		uuid.SetRand(&tests.IDReader{})
 
 		sqlDB := testdb.Open(t, models.SetupFixtures, nil)
 		db := reform.NewDB(sqlDB, postgresql.Dialect, nil)
 
-		dbaasClient = &mockDbaasClient{}
+		dbaasClient := &mockDbaasClient{}
 
 		kubernetesCluster, err := models.CreateKubernetesCluster(db.Querier, &models.CreateKubernetesClusterParams{
 			KubernetesClusterName: clusterName,
@@ -80,12 +80,12 @@ func TestComponentService(t *testing.T) {
 		})
 
 		vsc := NewVersionServiceClient(versionServiceURL)
-		kubeStorage = &mockKubeStorageManager{}
-		kubeClient = &mockKubernetesClient{}
+		kubeStorage := &mockKubeStorageManager{}
+		kubeClient := &mockKubernetesClient{}
 		kubeClient.On("GetServerVersion").Return(nil, nil)
-		cs = NewComponentsService(db, dbaasClient, vsc, kubeStorage)
+		cs := NewComponentsService(db, dbaasClient, vsc, kubeStorage)
 
-		return //nolint:nakedret
+		return ctx, cs, dbaasClient, kubeClient, kubeStorage
 	}
 
 	t.Run("PXC", func(t *testing.T) {