update golangci-lint & goimports-reviser ; fix make format check errors

.golangci.yml

@@ -153,10 +153,8 @@ linters:
   enable:
     - revive
     - goimports
-    - varcheck
+    - unused
     - unparam
-    - deadcode
-    - structcheck
     - errcheck
     - gosimple
     - staticcheck

Makefile

@@ -185,7 +185,7 @@ format: tidy ## Formats the code. Must have goimports and goimports-reviser inst
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./pkg
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./cmd
 	${OPTS} goimports -w -local ${PROJECT_BASE} ./internal
-	find . -type f -name '*.go' -not -path "./.git/*" -not -path "./vendor/*"  -exec goimports-reviser -project-name ${PROJECT_BASE} -file-path {} \;
+	find . -type f -name '*.go' -not -path "./.git/*" -not -path "./vendor/*"  -exec goimports-reviser -project-name ${PROJECT_BASE} {} \;
 
 format-windows: tidy ## Formats the code. Must have goimports and goimports-reviser installed (use make install-linters).
 	powershell 'Get-ChildItem -Directory | where Name -NotMatch vendor | % { Get-ChildItem $$_ -Recurse -Include *.go } | % {goimports -w -local ${PROJECT_BASE} $$_ }'

cmd/apps/skychat/skychat.go

@@ -95,8 +95,12 @@ func main() {
 		}()
 	}
 	setAppStatus(appCl, appserver.AppDetailedStatusRunning)
-
-	err := http.ListenAndServe(*addr, nil)
+	srv := &http.Server{
+		Addr:         *addr,
+		ReadTimeout:  5 * time.Second,
+		WriteTimeout: 10 * time.Second,
+	}
+	err := srv.ListenAndServe()
 	if err != nil {
 		print(err.Error())
 		setAppError(appCl, err)

cmd/apps/vpn-client/vpn-client.go

@@ -1,3 +1,4 @@
+// Package main vpn-client.go
 package main
 
 import (

cmd/apps/vpn-server/vpn-server.go

@@ -1,3 +1,4 @@
+// Package main vpn-server.go
 package main
 
 import (

cmd/setup-node/commands/root.go

@@ -1,11 +1,11 @@
+// Package commands root.go
 package commands
 
 import (
 	"bufio"
 	"context"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"os"
 
 	cc "github.com/ivanpirog/coloredcobra"
@@ -80,7 +80,7 @@ var rootCmd = &cobra.Command{
 
 		conf := &setup.Config{}
 
-		raw, err := ioutil.ReadAll(rdr)
+		raw, err := io.ReadAll(rdr)
 		if err != nil {
 			log.Fatalf("Failed to read config: %v", err)
 		}

cmd/setup-node/setup-node.go

@@ -1,3 +1,4 @@
+/*Package main setup-node*/
 package main
 
 import (

cmd/skywire-cli/commands/completion/completion.go

@@ -1,3 +1,4 @@
+// Package clicompletion generate completion script
 package clicompletion
 
 import (

cmd/skywire-cli/commands/config/gen.go

@@ -1,3 +1,4 @@
+// Package cliconfig gen.go
 package cliconfig
 
 import (

cmd/skywire-cli/commands/dmsgpty/hvdmsg.go

@@ -1,3 +1,4 @@
+// Package clidmsgpty hvdmsg.go
 package clidmsgpty
 
 import (

cmd/skywire-cli/commands/mdisc/root.go

@@ -1,3 +1,4 @@
+// Package climdisc root.go
 package climdisc
 
 import (

cmd/skywire-cli/commands/root.go

@@ -1,3 +1,4 @@
+// Package commands root.go
 package commands
 
 import (

cmd/skywire-cli/commands/rpc/root.go

@@ -1,3 +1,4 @@
+// Package clirpc root.go
 package clirpc
 
 import (

cmd/skywire-cli/commands/rtfind/root.go

@@ -1,3 +1,4 @@
+// Package clirtfind subcommand for skywire-cli
 package clirtfind
 
 import (

cmd/skywire-cli/commands/visor/app.go

@@ -1,3 +1,4 @@
+// Package clivisor app.go
 package clivisor
 
 import (

cmd/skywire-cli/commands/vpn/root.go

@@ -1,3 +1,4 @@
+// Package clivpn root.go
 package clivpn
 
 import (

cmd/skywire-cli/commands/vpn/vvpn.go

@@ -33,6 +33,8 @@ func init() {
 	}
 	vpnUICmd.Flags().BoolVarP(&isPkg, "pkg", "p", false, "use package config path")
 	vpnUICmd.Flags().StringVarP(&path, "config", "c", "", "config path")
+	vpnURLCmd.Flags().BoolVarP(&isPkg, "pkg", "p", false, "use package config path")
+	vpnURLCmd.Flags().StringVarP(&path, "config", "c", "", "config path")
 	vpnListCmd.Flags().BoolVarP(&isUnFiltered, "nofilter", "n", false, "provide unfiltered results")
 	vpnListCmd.Flags().StringVarP(&ver, "ver", "v", version, "filter results by version")
 	vpnListCmd.Flags().StringVarP(&country, "country", "c", "", "filter results by country")

cmd/skywire-cli/internal/internal.go

@@ -1,3 +1,4 @@
+// Package internal contain functions used internally by different skywire-cli subcommands
 package internal
 
 import (

cmd/skywire-cli/skywire-cli.go

@@ -1,3 +1,4 @@
+// Package main skywire-cli.go
 package main
 
 import (

cmd/skywire-visor/commands/nosystray.go

@@ -1,6 +1,7 @@
 //go:build !systray
 // +build !systray
 
+// Package commands nosystray.go
 package commands
 
 import (

cmd/skywire-visor/commands/root.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"net"
 	"net/http"
 	_ "net/http/pprof" // nolint:gosec // https://golang.org/doc/diagnostics.html#profiling
@@ -386,7 +385,7 @@ func initLogger(tag string, syslogAddr string) *logging.MasterLogger {
 			mLog.WithError(err).Error("Failed to connect to the syslog daemon.")
 		} else {
 			mLog.AddHook(hook)
-			mLog.Out = ioutil.Discard
+			mLog.Out = io.Discard
 		}
 	}
 	return mLog
@@ -399,7 +398,13 @@ func initPProf(log *logging.MasterLogger, tag string, profMode string, profAddr
 	case "none", "":
 	case "http":
 		go func() {
-			err := http.ListenAndServe(profAddr, nil)
+			srv := &http.Server{
+				Addr:         profAddr,
+				Handler:      nil,
+				ReadTimeout:  5 * time.Second,
+				WriteTimeout: 10 * time.Second,
+			}
+			err := srv.ListenAndServe()
 			log.WithError(err).
 				WithField("mode", profMode).
 				WithField("addr", profAddr).

internal/httpauth/client.go

@@ -1,3 +1,4 @@
+// Package httpauth http authorizatioon
 package httpauth
 
 import (
@@ -7,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -99,14 +99,14 @@ func (c *Client) do(client *http.Client, req *http.Request) (*http.Response, err
 
 	body := make([]byte, 0)
 	if req.ContentLength != 0 {
-		auxBody, err := ioutil.ReadAll(req.Body)
+		auxBody, err := io.ReadAll(req.Body)
 		if err != nil {
 			return nil, err
 		}
 		if err := req.Body.Close(); err != nil {
 			c.log.WithError(err).Warn("Failed to close HTTP request body")
 		}
-		req.Body = ioutil.NopCloser(bytes.NewBuffer(auxBody))
+		req.Body = io.NopCloser(bytes.NewBuffer(auxBody))
 		body = auxBody
 	}
 
@@ -131,7 +131,7 @@ func (c *Client) do(client *http.Client, req *http.Request) (*http.Response, err
 			c.log.WithError(err).Warn("Failed to close HTTP response body")
 		}
 
-		req.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+		req.Body = io.NopCloser(bytes.NewBuffer(body))
 
 		resp, err = c.doRequest(client, req, body)
 		if err != nil {
@@ -227,15 +227,15 @@ func isNonceValid(res *http.Response) (*http.Response, bool, error) {
 	var serverResponse HTTPResponse
 	var auxResp http.Response
 
-	auxRespBody, err := ioutil.ReadAll(res.Body)
+	auxRespBody, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, false, err
 	}
 	if err := res.Body.Close(); err != nil {
 		return nil, false, err
 	}
 	auxResp = *res
-	auxResp.Body = ioutil.NopCloser(bytes.NewBuffer(auxRespBody))
+	auxResp.Body = io.NopCloser(bytes.NewBuffer(auxRespBody))
 
 	if err := json.Unmarshal(auxRespBody, &serverResponse); err != nil || serverResponse.Error == nil {
 		return &auxResp, true, nil
@@ -269,7 +269,7 @@ func sanitizedAddr(addr string) string {
 func extractHTTPError(r io.Reader) error {
 	var serverError HTTPResponse
 
-	body, err := ioutil.ReadAll(r)
+	body, err := io.ReadAll(r)
 	if err != nil {
 		return err
 	}
@@ -285,7 +285,7 @@ func extractHTTPError(r io.Reader) error {
 func ExtractError(r io.Reader) error {
 	var apiError Error
 
-	body, err := ioutil.ReadAll(r)
+	body, err := io.ReadAll(r)
 	if err != nil {
 		return err
 	}

internal/httpauth/client_test.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -58,7 +58,7 @@ func TestClient(t *testing.T) {
 	res, err := c.Do(req)
 	require.NoError(t, err)
 
-	b, err := ioutil.ReadAll(res.Body)
+	b, err := io.ReadAll(res.Body)
 	require.NoError(t, err)
 	require.NoError(t, res.Body.Close())
 	assert.Equal(t, []byte(payload), b)
@@ -86,7 +86,7 @@ func TestClient_BadNonce(t *testing.T) {
 	res, err := c.Do(req)
 	require.NoError(t, err)
 
-	b, err := ioutil.ReadAll(res.Body)
+	b, err := io.ReadAll(res.Body)
 	require.NoError(t, err)
 	require.NoError(t, res.Body.Close())
 	assert.Equal(t, uint64(2), c.nonce)
@@ -109,7 +109,7 @@ func newTestServer(t *testing.T, pk cipher.PubKey, headerCh chan<- http.Header)
 		if r.URL.String() == fmt.Sprintf("/security/nonces/%s", pk) {
 			require.NoError(t, json.NewEncoder(w).Encode(&NextNonceResponse{pk, Nonce(nonce)}))
 		} else {
-			body, err := ioutil.ReadAll(r.Body)
+			body, err := io.ReadAll(r.Body)
 			if body != nil {
 				defer func() {
 					require.NoError(t, r.Body.Close())

internal/packetfilter/address-filter.go

@@ -1,3 +1,4 @@
+/*Package packetfilter filter packets*/
 package packetfilter
 
 import (

internal/skysocks/client.go

@@ -1,3 +1,4 @@
+// Package skysocks client.go
 package skysocks
 
 import (

internal/skysocks/server_test.go

@@ -2,7 +2,7 @@ package skysocks
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -79,7 +79,7 @@ func TestProxy(t *testing.T) {
 	res, err := c.Get(ts.URL)
 	require.NoError(t, err)
 
-	msg, err := ioutil.ReadAll(res.Body)
+	msg, err := io.ReadAll(res.Body)
 	require.NoError(t, err)
 	require.NoError(t, res.Body.Close())
 	assert.Equal(t, "Hello, client\n", string(msg))

internal/vpn/client.go

@@ -1,3 +1,4 @@
+// Package vpn internal vpn
 package vpn
 
 import (

pkg/app/appcommon/log_store_test.go

@@ -2,7 +2,6 @@ package appcommon
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 	"time"
@@ -11,7 +10,7 @@ import (
 )
 
 func TestLogStore(t *testing.T) {
-	p, err := ioutil.TempFile("", "test-db")
+	p, err := os.CreateTemp("", "test-db")
 	require.NoError(t, err)
 
 	defer os.Remove(p.Name()) // nolint

pkg/app/appdisc/discovery_manager.go

@@ -1,3 +1,4 @@
+// Package appdisc updates app discovery
 package appdisc
 
 import (

pkg/app/appevent/broadcaster.go

@@ -1,3 +1,4 @@
+// Package appevent broadcaster.go
 package appevent
 
 import (

pkg/app/idmanager/delta_informer.go

@@ -1,3 +1,4 @@
+// Package idmanager delta_informer.go
 package idmanager
 
 // DeltaInformer informs when there has been a change to the id-manager.

pkg/app/launcher/launcher.go

@@ -1,3 +1,4 @@
+// Package launcher launcher.go
 package launcher
 
 import (

pkg/dmsgc/dmsgc.go

@@ -1,3 +1,4 @@
+// Package dmsgc dmsg config and client
 package dmsgc
 
 import (

pkg/restart/restart.go

@@ -1,3 +1,4 @@
+// Package restart restart.go
 package restart
 
 import (

pkg/router/routerclient/client.go

@@ -1,3 +1,4 @@
+// Package routerclient client.go
 package routerclient
 
 import (

pkg/routing/packet.go

@@ -10,8 +10,9 @@ import (
 // Packet defines generic packet recognized by all skywire visors.
 // The unit of communication for routing/router is called packets.
 // Packet format:
-//     | type (byte) | route ID (uint32) | payload size (uint16) | payload (~) |
-//     | 1[0:1]      | 4[1:5]            | 2[5:7]                | [7:~]       |
+//
+//	| type (byte) | route ID (uint32) | payload size (uint16) | payload (~) |
+//	| 1[0:1]      | 4[1:5]            | 2[5:7]                | [7:~]       |
 type Packet []byte
 
 // Packet sizes and offsets.

pkg/routing/rule.go

@@ -53,7 +53,6 @@ const (
 
 // Rule represents a routing rule.
 // There are two types of routing rules; App and Forward.
-//
 type Rule []byte
 
 func (r Rule) assertLen(l int) {

pkg/servicedisc/autoconnect.go

@@ -1,3 +1,4 @@
+// Package servicedisc works with the service discovery
 package servicedisc
 
 import (