fix lint

Signed-off-by: alanprot <[email protected]>

go.mod

@@ -1,6 +1,6 @@
 module github.com/weaveworks/common
 
-go 1.14
+go 1.21
 
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5

httpgrpc/server/server.go

@@ -102,9 +102,9 @@ func ParseURL(unparsed string) (string, error) {
 			return "", err
 		}
 		parts := strings.SplitN(host, ".", 3)
-		service, namespace, domain := parts[0], "default", ""
+		service, _, domain := parts[0], "default", ""
 		if len(parts) > 1 {
-			namespace = parts[1]
+			namespace := parts[1]
 			domain = "." + namespace
 		}
 		if len(parts) > 2 {
@@ -174,7 +174,7 @@ func WriteResponse(w http.ResponseWriter, resp *httpgrpc.HTTPResponse) error {
 func WriteError(w http.ResponseWriter, err error) {
 	resp, ok := httpgrpc.HTTPResponseFromError(err)
 	if ok {
-		WriteResponse(w, resp)
+		err = WriteResponse(w, resp)
 	} else {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}

httpgrpc/server/server_test.go

@@ -9,7 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	opentracing "github.com/opentracing/opentracing-go"
+	"github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	jaegercfg "github.com/uber/jaeger-client-go/config"
@@ -39,7 +39,7 @@ func newTestServer(handler http.Handler) (*testServer, error) {
 	}
 
 	httpgrpc.RegisterHTTPServer(server.grpcServer, server.Server)
-	go server.grpcServer.Serve(lis)
+	go server.grpcServer.Serve(lis) //nolint:errcheck
 
 	return server, nil
 }

instrument/instrument_test.go

@@ -3,6 +3,7 @@ package instrument_test
 import (
 	"context"
 	"errors"
+	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
 
@@ -47,10 +48,10 @@ func (c *spyCollector) After(ctx context.Context, method, statusCode string, sta
 func TestCollectedRequest(t *testing.T) {
 	c := &spyCollector{}
 	fcalled := false
-	instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
+	require.NoError(t, instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
 		fcalled = true
 		return nil
-	})
+	}))
 	assert.True(t, fcalled)
 	assert.True(t, c.before)
 	assert.True(t, c.after)
@@ -59,9 +60,9 @@ func TestCollectedRequest(t *testing.T) {
 
 func TestCollectedRequest_Error(t *testing.T) {
 	c := &spyCollector{}
-	instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
+	require.NoError(t, instrument.CollectedRequest(context.Background(), "test", c, nil, func(_ context.Context) error {
 		return errors.New("boom")
-	})
+	}))
 	assert.True(t, c.before)
 	assert.True(t, c.after)
 	assert.Equal(t, "500", c.afterCode)

logging/format.go

@@ -15,7 +15,7 @@ type Format struct {
 
 // RegisterFlags adds the log format flag to the provided flagset.
 func (f *Format) RegisterFlags(fs *flag.FlagSet) {
-	f.Set("logfmt")
+	f.Set("logfmt") //nolint:errcheck
 	fs.Var(f, "log.format", "Output log messages in the given format. Valid formats: [logfmt, json]")
 }
 

logging/gokit.go

@@ -62,31 +62,31 @@ func (s *sprint) String() string {
 }
 
 func (g gokit) Debugf(format string, args ...interface{}) {
-	level.Debug(g.Logger).Log("msg", &sprintf{format: format, args: args})
+	level.Debug(g.Logger).Log("msg", &sprintf{format: format, args: args}) //nolint:errcheck
 }
 func (g gokit) Debugln(args ...interface{}) {
-	level.Debug(g.Logger).Log("msg", &sprint{args: args})
+	level.Debug(g.Logger).Log("msg", &sprint{args: args}) //nolint:errcheck
 }
 
 func (g gokit) Infof(format string, args ...interface{}) {
-	level.Info(g.Logger).Log("msg", &sprintf{format: format, args: args})
+	level.Info(g.Logger).Log("msg", &sprintf{format: format, args: args}) //nolint:errcheck
 }
 func (g gokit) Infoln(args ...interface{}) {
-	level.Info(g.Logger).Log("msg", &sprint{args: args})
+	level.Info(g.Logger).Log("msg", &sprint{args: args}) //nolint:errcheck
 }
 
 func (g gokit) Warnf(format string, args ...interface{}) {
-	level.Warn(g.Logger).Log("msg", &sprintf{format: format, args: args})
+	level.Warn(g.Logger).Log("msg", &sprintf{format: format, args: args}) //nolint:errcheck
 }
 func (g gokit) Warnln(args ...interface{}) {
-	level.Warn(g.Logger).Log("msg", &sprint{args: args})
+	level.Warn(g.Logger).Log("msg", &sprint{args: args}) //nolint:errcheck
 }
 
 func (g gokit) Errorf(format string, args ...interface{}) {
-	level.Error(g.Logger).Log("msg", &sprintf{format: format, args: args})
+	level.Error(g.Logger).Log("msg", &sprintf{format: format, args: args}) //nolint:errcheck
 }
 func (g gokit) Errorln(args ...interface{}) {
-	level.Error(g.Logger).Log("msg", &sprint{args: args})
+	level.Error(g.Logger).Log("msg", &sprint{args: args}) //nolint:errcheck
 }
 
 func (g gokit) WithField(key string, value interface{}) Interface {

logging/level.go

@@ -32,7 +32,7 @@ type Level struct {
 
 // RegisterFlags adds the log level flag to the provided flagset.
 func (l *Level) RegisterFlags(f *flag.FlagSet) {
-	l.Set("info")
+	l.Set("info") //nolint:errcheck
 	f.Var(l, "log.level", "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error]")
 }
 

mflag/flag.go

@@ -230,7 +230,7 @@ func (s *stringValue) Set(val string) error {
 
 func (s *stringValue) Get() interface{} { return string(*s) }
 
-func (s *stringValue) String() string { return fmt.Sprintf("%s", *s) }
+func (s *stringValue) String() string { return string(*s) }
 
 // -- float64 Value
 type float64Value float64
@@ -1026,7 +1026,9 @@ func (fs *FlagSet) parseOne() (bool, string, error) {
 				return false, "", fs.failf("invalid boolean value %q for  -%s: %v", value, name, err)
 			}
 		} else {
-			fv.Set("true")
+			if err := fv.Set("true"); err != nil {
+				return false, "", fs.failf("invalid boolean value for -%s: %v", name, err)
+			}
 		}
 	} else {
 		// It must have a value, which might be the next argument.
@@ -1162,7 +1164,7 @@ func (fs *FlagSet) Parsed() bool {
 // after all flags are defined and before flags are accessed by the program.
 func Parse() {
 	// Ignore errors; CommandLine is set for ExitOnError.
-	CommandLine.Parse(os.Args[1:])
+	CommandLine.Parse(os.Args[1:]) //nolint:errcheck
 }
 
 // Parsed returns true if the command-line flags have been parsed.

mflag/flag_test.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/require"
 )
 
 // ResetForTesting clears all flag state and sets the usage function as directed.
@@ -76,14 +78,14 @@ func TestEverything(t *testing.T) {
 		}
 	}
 	// Now set all flags
-	Set("test_bool", "true")
-	Set("test_int", "1")
-	Set("test_int64", "1")
-	Set("test_uint", "1")
-	Set("test_uint64", "1")
-	Set("test_string", "1")
-	Set("test_float64", "1")
-	Set("test_duration", "1s")
+	require.NoError(t, Set("test_bool", "true"))
+	require.NoError(t, Set("test_int", "1"))
+	require.NoError(t, Set("test_int64", "1"))
+	require.NoError(t, Set("test_uint", "1"))
+	require.NoError(t, Set("test_uint64", "1"))
+	require.NoError(t, Set("test_string", "1"))
+	require.NoError(t, Set("test_float64", "1"))
+	require.NoError(t, Set("testrequire.NoError(_duration", "1s"))
 	desired = "1"
 	Visit(visitor)
 	if len(m) != 8 {
@@ -95,9 +97,7 @@ func TestEverything(t *testing.T) {
 	// Now test they're visited in sort order.
 	var flagNames []string
 	Visit(func(f *Flag) {
-		for _, name := range f.Names {
-			flagNames = append(flagNames, name)
-		}
+		flagNames = append(flagNames, f.Names...)
 	})
 	if !sort.StringsAreSorted(flagNames) {
 		t.Errorf("flag names not sorted: %v", flagNames)
@@ -276,7 +276,7 @@ func testPanic(f *FlagSet, t *testing.T) {
 	args := []string{
 		"-int", "21",
 	}
-	f.Parse(args)
+	require.NoError(t, f.Parse(args))
 }
 
 func TestParsePanic(t *testing.T) {
@@ -368,7 +368,7 @@ func TestSetOutput(t *testing.T) {
 	var buf bytes.Buffer
 	flags.SetOutput(&buf)
 	flags.Init("test", ContinueOnError)
-	flags.Parse([]string{"-unknown"})
+	require.NoError(t, flags.Parse([]string{"-unknown"}))
 	if out := buf.String(); !strings.Contains(out, "-unknown") {
 		t.Logf("expected output mentioning unknown; got %q", out)
 	}
@@ -520,7 +520,7 @@ func TestMergeFlags(t *testing.T) {
 	base.String([]string{"f"}, "", "")
 
 	fs := NewFlagSet("test", ContinueOnError)
-	Merge(fs, base)
+	require.NoError(t, Merge(fs, base))
 	if len(fs.formal) != 1 {
 		t.Fatalf("FlagCount (%d) != number (1) of elements merged", len(fs.formal))
 	}

middleware/logging_test.go

@@ -38,7 +38,8 @@ func TestBadWriteLogging(t *testing.T) {
 			Log: logging.Logrus(logrusLogger),
 		}
 		handler := func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "<html><body>Hello World!</body></html>")
+			_, err := io.WriteString(w, "<html><body>Hello World!</body></html>")
+			require.NoError(t, err)
 		}
 		loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))
 
@@ -83,7 +84,8 @@ func TestDisabledSuccessfulRequestsLogging(t *testing.T) {
 		}
 
 		handler := func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck
+			_, err := io.WriteString(w, "<html><body>Hello World!</body></html>") //nolint:errcheck
+			require.NoError(t, err)
 		}
 		loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))
 
@@ -127,7 +129,8 @@ func TestLoggingRequestsAtInfoLevel(t *testing.T) {
 			LogRequestAtInfoLevel: true,
 		}
 		handler := func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "<html><body>Hello World!</body></html>")
+			_, err := io.WriteString(w, "<html><body>Hello World!</body></html>")
+			require.NoError(t, err)
 		}
 		loggingHandler := loggingMiddleware.Wrap(http.HandlerFunc(handler))
 

middleware/response.go

@@ -72,7 +72,10 @@ func (b *nonFlushingBadResponseLoggingWriter) Write(data []byte) (int, error) {
 	}
 	n, err := b.rw.Write(data)
 	if b.logBody {
-		b.captureResponseBody(data)
+		err := b.captureResponseBody(data)
+		if err != nil {
+			return n, err
+		}
 	}
 	if err != nil {
 		b.writeError = err
@@ -106,16 +109,23 @@ func (b *nonFlushingBadResponseLoggingWriter) getWriteError() error {
 	return b.writeError
 }
 
-func (b *nonFlushingBadResponseLoggingWriter) captureResponseBody(data []byte) {
+func (b *nonFlushingBadResponseLoggingWriter) captureResponseBody(data []byte) error {
 	if len(data) > b.bodyBytesLeft {
-		b.buffer.Write(data[:b.bodyBytesLeft])
-		io.WriteString(b.buffer, "...")
+		if _, err := b.buffer.Write(data[:b.bodyBytesLeft]); err != nil {
+			return err
+		}
+		if _, err := io.WriteString(b.buffer, "..."); err != nil {
+			return err
+		}
 		b.bodyBytesLeft = 0
 		b.logBody = false
 	} else {
-		b.buffer.Write(data)
+		if _, err := b.buffer.Write(data); err != nil {
+			return err
+		}
 		b.bodyBytesLeft -= len(data)
 	}
+	return nil
 }
 
 func (b *flushingBadResponseLoggingWriter) Flush() {

middleware/response_test.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"bytes"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -27,7 +28,8 @@ func TestBadResponseLoggingWriter(t *testing.T) {
 			wrapped.WriteHeader(tc.statusCode)
 		case tc.statusCode < 300 && tc.data != "":
 			wrapped.WriteHeader(tc.statusCode)
-			wrapped.Write([]byte(tc.data))
+			_, err := wrapped.Write([]byte(tc.data))
+			require.NoError(t, err)
 		default:
 			http.Error(wrapped, tc.data, tc.statusCode)
 		}

server/server.go

@@ -555,6 +555,9 @@ func (s *Server) Shutdown() {
 	ctx, cancel := context.WithTimeout(context.Background(), s.cfg.ServerGracefulShutdownTimeout)
 	defer cancel() // releases resources if httpServer.Shutdown completes before timeout elapses
 
-	s.HTTPServer.Shutdown(ctx)
+	if err := s.HTTPServer.Shutdown(ctx); err != nil {
+		s.Log.Warnf("Failed to shit down server: %v", err)
+	}
+
 	s.GRPC.GracefulStop()
 }