fix: linting update

Signed-off-by: Eray Ates <[email protected]>

.golangci.yml

@@ -1,19 +1,13 @@
-# Refer to golangci-lint's example config file for more options and information:
-# https://github.com/golangci/golangci-lint/blob/master/.golangci.example.yml
-
-run:
-  timeout: 5m
-  modules-download-mode: readonly
-
 linters:
-  enable:
-    - errcheck
-    - goimports
-    - golint
-    - govet
-    - staticcheck
-
-issues:
-  exclude-use-default: false
-  max-issues-per-linter: 0
-  max-same-issues: 0
+  enable-all: true
+  disable:
+    - depguard
+    - prealloc
+    - lll
+    - nlreturn
+    - funlen
+    - mnd
+    - gochecknoinits
+    - testpackage
+    - gomnd # Deprecated
+  fast: true

Makefile

@@ -10,7 +10,7 @@ build: ## Build the binary
 
 lint: ## Lint Go files
 	golangci-lint --version
-	golangci-lint run ./...
+	GOPATH="$(shell dirname $(PWD))" golangci-lint run ./...
 
 test: ## Run unit tests
 	@go test -race ./...

README.md

@@ -3,7 +3,7 @@
 [![License](https://img.shields.io/github/license/worldline-go/forward?color=red&style=flat-square)](https://raw.githubusercontent.com/worldline-go/forward/main/LICENSE)
 [![Coverage](https://img.shields.io/sonar/coverage/worldline-go_forward?logo=sonarcloud&server=https%3A%2F%2Fsonarcloud.io&style=flat-square)](https://sonarcloud.io/summary/overall?id=worldline-go_forward)
 [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/worldline-go/forward/Test?logo=github&style=flat-square&label=ci)](https://github.com/worldline-go/forward/actions)
-[![Go Reference](https://pkg.go.dev/badge/github.com/worldline-go/forward.svg)](https://pkg.go.dev/github.com/worldline-go/forward)
+[![Go PKG](https://raw.githubusercontent.com/worldline-go/guide/main/badge/custom/reference.svg)](https://pkg.go.dev/github.com/worldline-go/forward)
 
 Export socket connection to HTTP service with filter options.
 
@@ -48,7 +48,7 @@ sudo ./forward -s '/var/run/docker.sock:/:-POST,-PUT,-DELETE'
 There are scratch and alpine version of container image.
 
 ```sh
-docker run -p 8080:8080 -v /var/run/docker.sock:/docker.sock ghcr.io/worldline-go/forward -s /docker.sock:/:-POST,-PUT,-DELETE,-PATCH
+docker run --rm -it -p 8080:8080 -v /var/run/docker.sock:/docker.sock ghcr.io/worldline-go/forward -s /docker.sock:/:-POST,-PUT,-DELETE,-PATCH
 ```
 
 ## Development

cmd/forward/args/root.go

@@ -5,11 +5,10 @@ import (
 	"log/slog"
 
 	"github.com/rakunlabs/into"
+	"github.com/spf13/cobra"
 	"github.com/worldline-go/forward/internal/config"
 	"github.com/worldline-go/forward/internal/info"
 	"github.com/worldline-go/forward/internal/server"
-
-	"github.com/spf13/cobra"
 )
 
 var rootCmd = &cobra.Command{
@@ -32,6 +31,7 @@ var rootCmd = &cobra.Command{
 func Execute(ctx context.Context) error {
 	rootCmd.Version = info.AppInfo.Version
 	rootCmd.Long += "\n" + longInfo()
+
 	return rootCmd.ExecuteContext(ctx)
 }
 

cmd/forward/main.go

@@ -8,7 +8,6 @@ import (
 )
 
 var (
-	// Populated by goreleaser during build
 	version = "v0.0.0"
 	commit  = "-"
 	date    = "-"

internal/handler/methods.go

@@ -75,6 +75,7 @@ func printMethods(methods map[string]struct{}) string {
 	for k := range methods {
 		keys = append(keys, k)
 	}
+
 	sort.Slice(keys, func(i, j int) bool {
 		return keys[i] < keys[j]
 	})

internal/handler/methods_test.go

@@ -10,13 +10,16 @@ func TestFilterMethods_Parse(t *testing.T) {
 		Allow map[string]struct{}
 		Deny  map[string]struct{}
 	}
+
 	type match struct {
 		Method string
 		Check  bool
 	}
+
 	type args struct {
 		methods []string
 	}
+
 	tests := []struct {
 		name   string
 		want   want

internal/handler/socket.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 )
 
-// SocketDirector is a reverse proxy director that rewrites the URL path to
+// SocketDirector is a reverse proxy director that touch request before sending to the socket.
 func SocketDirector(req *http.Request) {
 	req.Header.Add("X-Forwarded-Host", req.Host)
 	req.URL.Scheme = "http"
@@ -49,7 +49,6 @@ func SocketHandler(socketURLPath string, socketPath string, methods *FilterMetho
 			return
 		}
 
-		// TODO: return allowed methods
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		w.Write([]byte("Method not allowed")) //nolint:errcheck
 	}

internal/server/http.go

@@ -23,9 +23,10 @@ type Server struct {
 
 // ServeHTTP returns a new HTTP server.
 func ServeHTTP() []Server {
-	values := Parse(config.Application.Hosts, config.Application.Sockets)
 	var servers []Server
 
+	values := Parse(config.Application.Hosts, config.Application.Sockets)
+
 	for _, value := range values {
 		mux := http.NewServeMux()
 		// Add handler functions here
@@ -56,6 +57,7 @@ func StartHTTP(server []Server) error {
 	for _, s := range server {
 		group.Go(func() error {
 			slog.Info(fmt.Sprintf("server %s on [%s]", s.Name, s.Server.Addr))
+
 			if err := s.Server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 				return err
 			}
@@ -86,6 +88,7 @@ func StopHTTP(server []Server) error {
 		}
 
 		wg.Add(1)
+
 		go func(name string, s *http.Server) {
 			defer wg.Done()
 

internal/server/parser.go

@@ -12,7 +12,9 @@ type Holder struct {
 
 func Parse(hosts, sockets []string) []Holder {
 	var holders []Holder
+
 	socketList := make(map[string][]string)
+
 	for _, socket := range sockets {
 		name, sValue := atParse(socket)
 		socketList[name] = append(socketList[name], sValue)
@@ -33,6 +35,7 @@ func Parse(hosts, sockets []string) []Holder {
 
 func atParse(v string) (name string, value string) {
 	vSplit := strings.SplitN(v, "@", 2)
+
 	switch {
 	case len(vSplit) < 2:
 		name = "default"

internal/server/parser_test.go

@@ -1,27 +1,30 @@
-package server
+package server_test
 
 import (
 	"reflect"
 	"testing"
+
+	"github.com/worldline-go/forward/internal/server"
 )
 
 func TestParse(t *testing.T) {
 	type args struct {
 		hosts   []string
 		sockets []string
 	}
+
 	tests := []struct {
 		name string
 		args args
-		want []Holder
+		want []server.Holder
 	}{
 		{
 			name: "default",
 			args: args{
 				hosts:   []string{"0.0.0.0:8080"},
 				sockets: []string{"/docker/:*,-POST,-PUT,-DELETE"},
 			},
-			want: []Holder{
+			want: []server.Holder{
 				{
 					Name:   "default",
 					Host:   "0.0.0.0:8080",
@@ -35,7 +38,7 @@ func TestParse(t *testing.T) {
 				hosts:   []string{"[email protected]:8080", "[email protected]:8081"},
 				sockets: []string{"/docker/:*,-POST,-PUT,-DELETE", "test@/docker/:*,-POST,-PUT,-DELETE"},
 			},
-			want: []Holder{
+			want: []server.Holder{
 				{
 					Name:   "default",
 					Host:   "0.0.0.0:8080",
@@ -49,9 +52,10 @@ func TestParse(t *testing.T) {
 			},
 		},
 	}
+
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := Parse(tt.args.hosts, tt.args.sockets); !reflect.DeepEqual(got, tt.want) {
+			if got := server.Parse(tt.args.hosts, tt.args.sockets); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("Parse() = %v, want %v", got, tt.want)
 			}
 		})