Chore/dependencies (#11)

* Updated dependencies

Author: ziflex

.github/workflows/build.yml

@@ -7,16 +7,39 @@ on:
     branches: [ master ]
 
 jobs:
+  analyze:
+    name: Static Analysis
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '>=1.19'
+
+      - name: Set up linters
+        run: make install-tools
+
+      - name: Lint
+        run: |
+          make vet
+          make lint
+          make fmt
+          git diff
+          if [[ $(git diff) != '' ]]; then echo 'Invalid formatting!' >&2; exit 1; fi
 
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
+      - name: Set up Go
+        uses: actions/setup-go@v3
         with:
-          go-version: ^1.16
+          go-version: '>=1.18'
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/release.yml

@@ -14,9 +14,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: '>=1.18'
       - name: Set up env vars
         run: |
           export FERRET_VERSION=$(sh versions.sh ferret)
@@ -33,7 +33,7 @@ jobs:
           username: ${{ secrets.CR_USER }}
           password: ${{ secrets.CR_PAT }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
           args: release --rm-dist

Dockerfile

@@ -14,7 +14,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux make compile
 
 # Build the final container. And install
-FROM montferret/chromium:99.0.4844.0
+FROM montferret/chromium:110.0.5479.0
 
 RUN apt-get update && apt-get install -y dumb-init
 

Dockerfile.release

@@ -1,5 +1,5 @@
 # Build the final container. And install
-FROM montferret/chromium:99.0.4844.0
+FROM montferret/chromium:110.0.5479.0
 
 RUN apt-get update && apt-get install -y dumb-init
 

Makefile

@@ -7,6 +7,11 @@ default: build
 
 build: vet test compile
 
+install-tools:
+	go install honnef.co/go/tools/cmd/staticcheck@latest && \
+	go install golang.org/x/tools/cmd/goimports@latest && \
+	go install github.com/mgechev/revive@latest
+
 install:
 	go get
 
@@ -26,10 +31,12 @@ doc:
 	godoc -http=:6060 -index
 
 fmt:
-	go fmt ./...
+	go fmt ./... && \
+	goimports -w -local github.com/MontFerret ./cdn ./cmd ./reporters ./runner ./runtime ./sources ./testing
 
 lint:
-	revive -config revive.toml -formatter stylish ./...
+	staticcheck ./... && \
+	revive -config revive.toml -formatter stylish -exclude ./pkg/parser/fql/... -exclude ./vendor/... ./...
 
 vet:
 	go vet ./...

cdn/directory.go

@@ -1,13 +1,14 @@
 package cdn
 
 import (
-	"github.com/pkg/errors"
 	"path/filepath"
 	"regexp"
 	"strconv"
+
+	"github.com/pkg/errors"
 )
 
-var bindingExp = regexp.MustCompile("^(?P<path>[A-Za-z0-9./\\\\]+)(?P<port>:\\d+)?(?P<name>@\\w+)?")
+var bindingExp = regexp.MustCompile(`^(?P<path>[A-Za-z0-9./\\]+)(?P<port>:\d+)?(?P<name>@\w+)?`)
 
 type Directory struct {
 	Name string

cdn/directory_test.go

@@ -1,9 +1,11 @@
 package cdn_test
 
 import (
-	"github.com/MontFerret/lab/cdn"
-	. "github.com/smartystreets/goconvey/convey"
 	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+
+	"github.com/MontFerret/lab/cdn"
 )
 
 func TestDirectory(t *testing.T) {

cdn/manager.go

@@ -4,15 +4,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"net/http"
 	"sync"
 
 	"github.com/pkg/errors"
 )
 
 type Manager struct {
 	addr    string
-	server  *http.Server
 	nodes   []*Node
 	running bool
 }

cdn/node.go

@@ -3,9 +3,10 @@ package cdn
 import (
 	"context"
 	"fmt"
+	"math/rand"
+
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"math/rand"
 )
 
 type (

cmd/default.go

@@ -7,12 +7,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/MontFerret/ferret/pkg/runtime/core"
 	"github.com/go-waitfor/waitfor"
-	"github.com/go-waitfor/waitfor-http"
+	http "github.com/go-waitfor/waitfor-http"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli/v2"
 
+	"github.com/MontFerret/ferret/pkg/runtime/core"
+
 	"github.com/MontFerret/lab/cdn"
 	"github.com/MontFerret/lab/reporters"
 	"github.com/MontFerret/lab/runner"