lint fixes (#25)

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.github/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.github/workflows/build.yml

@@ -34,10 +34,9 @@ jobs:
         uses: actions/checkout@v2
       - name: lint
         uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.github/workflows/pr.yml

@@ -34,10 +34,9 @@ jobs:
         uses: actions/checkout@v2
       - name: lint
         uses: golangci/golangci-lint-action@v2
-        continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.39
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
           # Optional: golangci-lint command line arguments.

.golangci.yml

@@ -0,0 +1,44 @@
+run:
+  concurrency: 4
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
+
+linters-settings:
+  govet:
+    check-shadowing: true
+    enable:
+      - fieldalignment
+
+linters:
+  enable:
+    - govet
+    - deadcode
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - bodyclose
+    - gci
+    - goconst
+    - gocritic
+    - gosimple
+    - gofmt
+    - gofumpt
+    - goimports
+    - golint
+    - gosec
+    - makezero
+    - misspell
+    - nakedret
+    - nestif
+    - nilerr
+    - noctx
+    - prealloc
+    - unconvert
+    - unparam
+  disable-all: false

http.go

@@ -20,21 +20,19 @@ import (
 	"github.com/unistack-org/micro/v3/codec"
 	"github.com/unistack-org/micro/v3/errors"
 	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/router"
 )
 
-var (
+var DefaultContentType = "application/json"
-	DefaultContentType = "application/json"
-)
 
+/*
 func filterLabel(r []router.Route) []router.Route {
 	//				selector.FilterLabel("protocol", "http")
 	return r
 }
+*/
 
 type httpClient struct {
 	opts    client.Options
-	dialer  *net.Dialer
 	httpcli *http.Client
 	init    bool
 	sync.RWMutex
@@ -46,6 +44,7 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 
 	var tags []string
 	var scheme string
+
 	u, err := url.Parse(addr)
 	if err != nil {
 		hreq.URL = &url.URL{
@@ -55,7 +54,10 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 		}
 		hreq.Host = addr
 		scheme = "http"
-	} else {
+	}
+
+	// nolint: nestif
+	if scheme == "" {
 		ep := req.Endpoint()
 		if opts.Context != nil {
 			if m, ok := opts.Context.Value(methodKey{}).(string); ok {
@@ -70,7 +72,6 @@ func newRequest(addr string, req client.Request, ct string, cf codec.Codec, msg
 			if t, ok := opts.Context.Value(structTagsKey{}).([]string); ok && len(t) > 0 {
 				tags = t
 			}
-
 		}
 		hreq.URL, err = u.Parse(ep)
 		if err != nil {
@@ -147,26 +148,20 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 	hrsp, err := h.httpcli.Do(hreq.WithContext(ctx))
 	if err != nil {
 		switch err := err.(type) {
-		case net.Error:
-			if err.Timeout() {
-				return errors.Timeout("go.micro.client", err.Error())
-			}
 		case *url.Error:
 			if err, ok := err.Err.(net.Error); ok && err.Timeout() {
 				return errors.Timeout("go.micro.client", err.Error())
 			}
+		case net.Error:
+			if err.Timeout() {
+				return errors.Timeout("go.micro.client", err.Error())
+			}
 		}
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}
 
 	defer hrsp.Body.Close()
 
-	if ct == "application/x-www-form-urlencoded" {
-		cf, err = h.newCodec(DefaultContentType)
-		if err != nil {
-			return errors.InternalServerError("go.micro.client", err.Error())
-		}
-	}
 	return h.parseRsp(ctx, hrsp, rsp, opts)
 }
 
@@ -198,11 +193,6 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
 		return nil, errors.InternalServerError("go.micro.client", err.Error())
 	}
 
-	dialAddr := addr
-	u, err := url.Parse(dialAddr)
-	if err == nil && u.Scheme != "" && u.Host != "" {
-		dialAddr = u.Host
-	}
 	cc, err := (h.httpcli.Transport).(*http.Transport).DialContext(ctx, "tcp", addr)
 	if err != nil {
 		return nil, errors.InternalServerError("go.micro.client", fmt.Sprintf("Error dialing: %v", err))
@@ -296,7 +286,7 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := client.WithRequestTimeout(d.Sub(time.Now()))
+		opt := client.WithRequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -423,7 +413,7 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := client.WithRequestTimeout(d.Sub(time.Now()))
+		opt := client.WithRequestTimeout(time.Until(d))
 		opt(&callOpts)
 	}
 
@@ -476,9 +466,9 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	call := func(i int) (client.Stream, error) {
 		// call backoff first. Someone may want an initial start delay
-		t, err := callOpts.Backoff(ctx, req, i)
+		t, cerr := callOpts.Backoff(ctx, req, i)
-		if err != nil {
+		if cerr != nil {
-			return nil, errors.InternalServerError("go.micro.client", err.Error())
+			return nil, errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		// only sleep if greater than 0
@@ -488,19 +478,19 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 		node := next()
 
-		stream, err := h.stream(ctx, node, req, callOpts)
+		stream, cerr := h.stream(ctx, node, req, callOpts)
 
 		// record the result of the call to inform future routing decisions
-		if verr := h.opts.Selector.Record(node, err); verr != nil {
+		if verr := h.opts.Selector.Record(node, cerr); verr != nil {
 			return nil, verr
 		}
 
 		// try and transform the error to a go-micro error
-		if verr, ok := err.(*errors.Error); ok {
+		if verr, ok := cerr.(*errors.Error); ok {
 			return nil, verr
 		}
 
-		return stream, err
+		return stream, cerr
 	}
 
 	type response struct {
@@ -513,8 +503,8 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	for i := 0; i <= callOpts.Retries; i++ {
 		go func() {
-			s, err := call(i)
+			s, cerr := call(i)
-			ch <- response{s, err}
+			ch <- response{s, cerr}
 		}()
 
 		select {

message.go

@@ -5,9 +5,9 @@ import (
 )
 
 type httpMessage struct {
+	payload     interface{}
 	topic       string
 	contentType string
-	payload     interface{}
 }
 
 func newHTTPMessage(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {

options.go

@@ -26,27 +26,28 @@ var (
 )
 
 type poolMaxStreams struct{}
-type poolMaxIdle struct{}
-type codecsKey struct{}
-type tlsAuth struct{}
-type maxRecvMsgSizeKey struct{}
-type maxSendMsgSizeKey struct{}
 
 // PoolMaxStreams maximum streams on a connectioin
 func PoolMaxStreams(n int) client.Option {
 	return client.SetOption(poolMaxStreams{}, n)
 }
 
+type poolMaxIdle struct{}
+
 // PoolMaxIdle maximum idle conns of a pool
 func PoolMaxIdle(d int) client.Option {
 	return client.SetOption(poolMaxIdle{}, d)
 }
 
+type maxRecvMsgSizeKey struct{}
+
 // MaxRecvMsgSize set the maximum size of message that client can receive.
 func MaxRecvMsgSize(s int) client.Option {
 	return client.SetOption(maxRecvMsgSizeKey{}, s)
 }
 
+type maxSendMsgSizeKey struct{}
+
 // MaxSendMsgSize set the maximum size of message that client can send.
 func MaxSendMsgSize(s int) client.Option {
 	return client.SetOption(maxSendMsgSizeKey{}, s)
@@ -54,12 +55,14 @@ func MaxSendMsgSize(s int) client.Option {
 
 type httpClientKey struct{}
 
+// nolint: golint
 func HTTPClient(c *http.Client) client.Option {
 	return client.SetOption(httpClientKey{}, c)
 }
 
 type httpDialerKey struct{}
 
+// nolint: golint
 func HTTPDialer(d *net.Dialer) client.Option {
 	return client.SetOption(httpDialerKey{}, d)
 }

stream.go

@@ -16,24 +16,21 @@ import (
 
 // Implements the streamer interface
 type httpStream struct {
-	sync.RWMutex
-	address string
-	opts    client.CallOptions
-	ct      string
-	cf      codec.Codec
-	context context.Context
-	header  http.Header
-	seq     uint64
-	closed  chan bool
 	err     error
 	conn    net.Conn
-	reader  *bufio.Reader
+	cf      codec.Codec
+	context context.Context
 	request client.Request
+	header  http.Header
+	closed  chan bool
+	reader  *bufio.Reader
+	address string
+	ct      string
+	opts    client.CallOptions
+	sync.RWMutex
 }
 
-var (
+var errShutdown = fmt.Errorf("connection is shut down")
-	errShutdown = fmt.Errorf("connection is shut down")
-)
 
 func (h *httpStream) isClosed() bool {
 	select {
@@ -112,6 +109,10 @@ func (h *httpStream) Close() error {
 func (h *httpStream) parseRsp(ctx context.Context, hrsp *http.Response, cf codec.Codec, rsp interface{}, opts client.CallOptions) error {
 	var err error
 
+	select {
+	case <-ctx.Done():
+		err = ctx.Err()
+	default:
 		// fast path return
 		if hrsp.StatusCode == http.StatusNoContent {
 			return nil
@@ -130,10 +131,10 @@ func (h *httpStream) parseRsp(ctx context.Context, hrsp *http.Response, cf codec
 				err, ok = errmap["default"].(error)
 			}
 		}
-	if err == nil {
+		if !ok || err == nil {
-		buf, err := io.ReadAll(hrsp.Body)
+			buf, cerr := io.ReadAll(hrsp.Body)
-		if err != nil {
+			if cerr != nil {
-			errors.InternalServerError("go.micro.client", err.Error())
+				return errors.InternalServerError("go.micro.client", cerr.Error())
 			}
 			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
 		}
@@ -141,6 +142,7 @@ func (h *httpStream) parseRsp(ctx context.Context, hrsp *http.Response, cf codec
 		if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
 			err = errors.InternalServerError("go.micro.client", cerr.Error())
 		}
+	}
 
 	return err
 }

util.go

@@ -96,13 +96,15 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			continue
 		}
 
+		// nolint: gocritic
 		if _, ok := fieldsmap[t.name]; ok {
-			if val.Type().Kind() == reflect.Slice {
+			switch val.Type().Kind() {
+			case reflect.Slice:
 				for idx := 0; idx < val.Len(); idx++ {
 					values.Add(t.name, fmt.Sprintf("%v", val.Index(idx).Interface()))
 				}
 				fieldsmapskip[t.name] = struct{}{}
-			} else {
+			default:
 				fieldsmap[t.name] = fmt.Sprintf("%v", val.Interface())
 			}
 		} else if (body == "*" || body == t.name) && method != http.MethodGet {
@@ -173,6 +175,12 @@ func newTemplate(path string) (util.Template, error) {
 }
 
 func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp interface{}, opts client.CallOptions) error {
+	var err error
+
+	select {
+	case <-ctx.Done():
+		err = ctx.Err()
+	default:
 		// fast path return
 		if hrsp.StatusCode == http.StatusNoContent {
 			return nil
@@ -184,13 +192,13 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 			ct = htype
 		}
 
-	cf, err := h.newCodec(ct)
+		cf, cerr := h.newCodec(ct)
-	if err != nil {
+		if cerr != nil {
-		return errors.InternalServerError("go.micro.client", err.Error())
+			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		if hrsp.StatusCode < 400 {
-		if err := cf.ReadBody(hrsp.Body, rsp); err != nil {
+			if err = cf.ReadBody(hrsp.Body, rsp); err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
 			return nil
@@ -202,10 +210,10 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 				err, ok = errmap["default"].(error)
 			}
 		}
-	if err == nil {
+		if !ok || err == nil {
-		buf, err := io.ReadAll(hrsp.Body)
+			buf, rerr := io.ReadAll(hrsp.Body)
-		if err != nil {
+			if rerr != nil {
-			errors.InternalServerError("go.micro.client", err.Error())
+				return errors.InternalServerError("go.micro.client", rerr.Error())
 			}
 			return errors.New("go.micro.client", string(buf), int32(hrsp.StatusCode))
 		}
@@ -213,6 +221,7 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 		if cerr := cf.ReadBody(hrsp.Body, err); cerr != nil {
 			err = errors.InternalServerError("go.micro.client", cerr.Error())
 		}
+	}
 
 	return err
 }

util_test.go

@@ -18,8 +18,8 @@ func TestNewPathRequest(t *testing.T) {
 	type Message struct {
 		Name string `json:"name"`
 		Val1 string `protobuf:"bytes,1,opt,name=val1,proto3" json:"val1"`
-		Val2 int64
 		Val3 []string
+		Val2 int64
 	}
 
 	omsg := &Message{Name: "test_name", Val1: "test_val1", Val2: 100, Val3: []string{"slice"}}
@@ -45,8 +45,8 @@ func TestNewPathVarRequest(t *testing.T) {
 	type Message struct {
 		Name string `json:"name"`
 		Val1 string `protobuf:"bytes,1,opt,name=val1,proto3" json:"val1"`
-		Val2 int64
 		Val3 []string
+		Val2 int64
 	}
 
 	omsg := &Message{Name: "test_name", Val1: "test_val1", Val2: 100, Val3: []string{"slice"}}