From 7551f798a82723e5b6c72beb90fa7b14d5de754e Mon Sep 17 00:00:00 2001 From: Ivan Krutov Date: Thu, 1 Dec 2022 16:56:49 +0300 Subject: [PATCH] Bump Golang to 1.19.3 and dependencies --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- ci/test.sh | 3 +++ go.mod | 10 +++++----- go.sum | 10 ++++++++-- main_test.go | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd8697c7..03c8671d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: Set Golang uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: ~1.19.3 - uses: actions/cache@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75434a09..fd829848 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: - name: Set Golang uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: ~1.19.3 - uses: actions/cache@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a12ef846..90276c33 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: - name: Set Golang uses: actions/setup-go@v2 with: - go-version: 1.18.x + go-version: ~1.19.3 - uses: actions/cache@v1 with: diff --git a/ci/test.sh b/ci/test.sh index c436ad4d..02a097a4 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -8,3 +8,6 @@ export GO111MODULE="on" go install github.com/rakyll/statik@latest go generate github.com/aerokube/selenoid-ui go test -race -v -coverprofile=coverage.txt -covermode=atomic ./... + +go install golang.org/x/vuln/cmd/govulncheck@latest +"$(go env GOPATH)"/bin/govulncheck -tags production ./... diff --git a/go.mod b/go.mod index e023418b..634b0a59 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/aerokube/selenoid-ui -go 1.18 +go 1.19 require ( github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e github.com/abbot/go-http-auth v0.4.0 github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09 - github.com/koding/websocketproxy v0.0.0-20180716164433-0fa3f994f6e7 + github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c github.com/rakyll/statik v0.1.7 ) require ( - github.com/gorilla/websocket v1.4.0 // indirect - golang.org/x/crypto v0.0.0-20201002094018-c90954cbb977 // indirect - golang.org/x/net v0.0.0-20211008194852-3b03d305991f // indirect + github.com/gorilla/websocket v1.5.0 // indirect + golang.org/x/crypto v0.3.0 // indirect + golang.org/x/net v0.2.0 // indirect ) diff --git a/go.sum b/go.sum index 26bb8d3e..f434521f 100644 --- a/go.sum +++ b/go.sum @@ -6,16 +6,22 @@ github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09 h1:T3Y7aciF+tYzT5wXH github.com/aerokube/util v0.0.0-20181001032247-3a9b3f70da09/go.mod h1:a1duJwYg3lfxakFPqpJsD41PYdkBmeUFPA4S+ISkHhQ= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/koding/websocketproxy v0.0.0-20180716164433-0fa3f994f6e7 h1:UPc4az2SLy5Usu+JKfOV4KtfzuRQXXUxY6QOWf9QBJU= -github.com/koding/websocketproxy v0.0.0-20180716164433-0fa3f994f6e7/go.mod h1:Nn5wlyECw3iJrzi0AhIWg+AJUb4PlRQVW4/3XHH1LZA= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c h1:N7A4JCA2G+j5fuFxCsJqjFU/sZe0mj8H0sSoSwbaikw= +github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c/go.mod h1:Nn5wlyECw3iJrzi0AhIWg+AJUb4PlRQVW4/3XHH1LZA= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20201002094018-c90954cbb977 h1:yH6opeNE+0SY+7pXT4gclZUoKHogXeC2EvOSHGOMGPU= golang.org/x/crypto v0.0.0-20201002094018-c90954cbb977/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20211008194852-3b03d305991f h1:1scJEYZBaF48BaG6tYbtxmLcXqwYGSfGcMoStTqkkIw= golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/main_test.go b/main_test.go index c4fe111c..cfe8c535 100644 --- a/main_test.go +++ b/main_test.go @@ -5,7 +5,7 @@ import ( . "github.com/aandryashin/matchers" . "github.com/aandryashin/matchers/httpresp" "github.com/aerokube/util/sse" - "io/ioutil" + "io" "net/http" "net/http/httptest" "net/url" @@ -80,7 +80,7 @@ func TestPing(t *testing.T) { AssertThat(t, rsp.Body, Is{Not{nil}}) var data map[string]interface{} - bt, readErr := ioutil.ReadAll(rsp.Body) + bt, readErr := io.ReadAll(rsp.Body) AssertThat(t, readErr, Is{nil}) jsonErr := json.Unmarshal(bt, &data) AssertThat(t, jsonErr, Is{nil})