upd: linter notes

Author: zamangi

internal/generator/cli/commands/consts.go

@@ -14,7 +14,7 @@ const (
 	ForceGenerationFlag             = "force"
 	ForceGenerationShortFlag        = "f"
 	ForceGenerationFlagDefaultValue = false
-	ForceGenerationUsage            = "Force generation even if output file conflicts found and partition files limit reached"
+	ForceGenerationUsage            = "Force generation even if output file conflicts found and partition files limit reached" //nolint:lll
 
 	TTYFlag      = "tty"
 	TTYShortFlag = "t"

internal/generator/cli/commands/generate/generate.go

@@ -175,10 +175,17 @@ func runGenerate(ctx context.Context, opts *generateOptions) error {
 	return nil
 }
 
-// initProgressTrackerManager inits progress bar manager (progress.Tracker) and builds streams.Confirm func based on useTTY
-func initProgressTrackerManager(ctx context.Context, renderer render.Renderer, useTTY bool) (progress.Tracker, confirm.Confirm) {
-	var progressTrackerManager progress.Tracker
-	var confirmFunc confirm.Confirm
+// initProgressTrackerManager inits progress bar manager (progress.Tracker)
+// and builds streams.Confirm func based on useTTY.
+func initProgressTrackerManager(
+	ctx context.Context,
+	renderer render.Renderer,
+	useTTY bool,
+) (progress.Tracker, confirm.Confirm) {
+	var (
+		progressTrackerManager progress.Tracker
+		confirmFunc            confirm.Confirm
+	)
 
 	if useTTY {
 		progressTrackerManager = bar.NewProgressBarManager(ctx)

internal/generator/cli/confirm/confirm.go

@@ -18,6 +18,7 @@ var ErrPromptFailed = errors.New("prompt failed")
 // Confirm asks user a yes/no question. Returns true for “yes”.
 type Confirm func(ctx context.Context, question string) (bool, error)
 
+//nolint:gocritic
 func BuildConfirmTTY(in io.Reader, out io.Writer) func(ctx context.Context, question string) (bool, error) {
 	return func(ctx context.Context, question string) (bool, error) {
 		fmt.Fprintln(out)
@@ -35,6 +36,7 @@ func BuildConfirmTTY(in io.Reader, out io.Writer) func(ctx context.Context, ques
 			if len(s) == 1 && strings.Contains("YyNn", s) || prompt.Default != "" && len(s) == 0 {
 				return nil
 			}
+
 			return errors.New("invalid input")
 		}
 		prompt.Validate = validate
@@ -58,14 +60,18 @@ func BuildConfirmTTY(in io.Reader, out io.Writer) func(ctx context.Context, ques
 		}
 
 		if err != nil {
-			return false, fmt.Errorf("%w: %v", ErrPromptFailed, err)
+			return false, errors.Wrap(ErrPromptFailed, err.Error())
 		}
 
 		return strings.Contains("Yy", input), nil
 	}
 }
 
-func BuildConfirmNoTTY(in render.Renderer, out io.Writer, isUpdatePaused *atomic.Bool) func(ctx context.Context, question string) (bool, error) {
+func BuildConfirmNoTTY(
+	in render.Renderer,
+	out io.Writer,
+	isUpdatePaused *atomic.Bool,
+) func(ctx context.Context, question string) (bool, error) {
 	return func(ctx context.Context, question string) (bool, error) {
 		// here we pause ProgressLogManager to stop sending progress messages
 		isUpdatePaused.Store(true)

internal/generator/cli/confirm/confirm_racy_test.go

@@ -5,17 +5,15 @@ package confirm
 import (
 	"bytes"
 	"context"
-	"errors"
-	"fmt"
 	"testing"
 
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 )
 
 func TestConfirmTTY(t *testing.T) {
 	testCases := []struct {
 		name        string
-		ctx         context.Context
 		question    string
 		input       string
 		expected    bool
@@ -82,7 +80,7 @@ func TestConfirmTTY(t *testing.T) {
 			input.WriteString(tc.input + "\n")
 
 			res, err := confirm(ctx, tc.question)
-			require.True(t, errors.Is(err, tc.expectedErr), fmt.Sprintf("expected: %v, got: %v", tc.expectedErr, err))
+			require.ErrorIs(t, err, tc.expectedErr, "expected: %v, got: %v", tc.expectedErr, err)
 
 			require.Equal(t, tc.expected, res)
 		})

internal/generator/cli/confirm/confirm_test.go

@@ -3,12 +3,11 @@ package confirm
 import (
 	"bytes"
 	"context"
-	"errors"
-	"fmt"
 	"sync/atomic"
 	"testing"
 	"time"
 
+	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	rendererMock "github.com/tarantool/sdvg/internal/generator/cli/render/mock"
 )
@@ -18,7 +17,6 @@ var errMockTest = errors.New("mock test error")
 func TestConfirmNoTTY(t *testing.T) {
 	testCases := []struct {
 		name        string
-		ctx         context.Context
 		question    string
 		ch          chan time.Time
 		expected    bool
@@ -125,7 +123,7 @@ func TestConfirmNoTTY(t *testing.T) {
 			}
 
 			res, err := confirm(ctx, tc.question)
-			require.True(t, errors.Is(err, tc.expectedErr), fmt.Sprintf("expected: %v, got: %v", tc.expectedErr, err))
+			require.ErrorIs(t, err, tc.expectedErr, "expected: %v, got: %v", tc.expectedErr, err)
 
 			require.Equal(t, tc.expected, res)
 		})
@@ -154,13 +152,14 @@ func TestConfirmNoTTY_IsUpdatePaused(t *testing.T) {
 
 	mockFunc(r, ch)
 
+	//nolint:errcheck
 	go confirm(context.Background(), "")
 
 	start := time.Now()
 	ch <- start
 
 	for isUpdatePaused.Load() {
-		if time.Now().Sub(start) > 2*time.Second {
+		if time.Since(start) > 2*time.Second {
 			t.Fatal("isUpdatePaused has not been called")
 		}
 	}

internal/generator/cli/confirm/reader.go

@@ -22,7 +22,7 @@ func (c *cancelableReader) Read(p []byte) (int, error) {
 	case <-c.closed:
 		return 0, io.EOF
 	default:
-		return c.r.Read(p)
+		return c.r.Read(p) //nolint:wrapcheck
 	}
 }
 
@@ -33,5 +33,6 @@ func (c *cancelableReader) Close() error {
 	default:
 		close(c.closed)
 	}
+
 	return nil
 }

internal/generator/cli/progress/bar/bar.go

@@ -80,5 +80,5 @@ func (p *ProgressBarManager) Wait() {
 
 // Write writes to stdout.
 func (p *ProgressBarManager) Write(b []byte) (int, error) {
-	return p.progressManager.Write(b)
+	return p.progressManager.Write(b) //nolint:wrapcheck
 }

internal/generator/cli/progress/log/log.go

@@ -152,5 +152,5 @@ func (p *ProgressLogManager) eta(t *task) string {
 
 // Write writes to default stdout.
 func (p *ProgressLogManager) Write(b []byte) (int, error) {
-	return os.Stdout.Write(b)
+	return os.Stdout.Write(b) //nolint:wrapcheck
 }

internal/generator/cli/streams/in.go

@@ -1,4 +1,3 @@
-//nolint:dupl
 package streams
 
 import (

internal/generator/cli/streams/out.go

@@ -1,4 +1,3 @@
-//nolint:dupl
 package streams
 
 import (