From 05a4e3437b2502d55d51d9c3c3d9ad66ef33f9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Thu, 2 Feb 2023 05:19:29 +0000 Subject: [PATCH] chore: update deps + Go 1.20 (#38) Reviewed-on: https://gitea.dwysokinski.me/twhelp/sessions/pulls/38 --- .drone.yml | 8 +++---- build/docker/sessions/dev/Dockerfile | 2 +- build/docker/sessions/prod/Dockerfile | 2 +- cmd/sessions/internal/appmode/appmode_test.go | 2 -- go.mod | 14 +++++------ go.sum | 24 +++++++++---------- internal/domain/api_key_test.go | 1 + 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3ee1980..e048ef9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: test steps: - name: test - image: golang:1.19 + image: golang:1.20 environment: TESTS_DB_DSN: postgres://postgres:sessions@database:5432/sessions?sslmode=disable commands: @@ -33,7 +33,7 @@ name: check-go-mod steps: - name: check go.mod - image: golang:1.19 + image: golang:1.20 commands: - make generate - go mod tidy @@ -76,7 +76,7 @@ platform: steps: - name: govulncheck - image: golang:1.19 + image: golang:1.20 commands: - make generate - go install golang.org/x/vuln/cmd/govulncheck@latest @@ -175,6 +175,6 @@ depends_on: - manifest --- kind: signature -hmac: bfcf8bf08c0429043cc382f644bac90b3ff619bbac454abd21a4a7f14d485816 +hmac: e7d25bfdf6996b87a21de714bd52fa5317e192022f254a2813953673af4d5edd ... diff --git a/build/docker/sessions/dev/Dockerfile b/build/docker/sessions/dev/Dockerfile index 82534e8..a18bc28 100644 --- a/build/docker/sessions/dev/Dockerfile +++ b/build/docker/sessions/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.20 as builder WORKDIR /app COPY go.mod go.sum ./ RUN go mod download diff --git a/build/docker/sessions/prod/Dockerfile b/build/docker/sessions/prod/Dockerfile index 0c56d74..004de2c 100644 --- a/build/docker/sessions/prod/Dockerfile +++ b/build/docker/sessions/prod/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.5-alpine3.17 as builder +FROM golang:1.20.0-alpine3.17 as builder WORKDIR /sessions diff --git a/cmd/sessions/internal/appmode/appmode_test.go b/cmd/sessions/internal/appmode/appmode_test.go index 20962ec..0c9e949 100644 --- a/cmd/sessions/internal/appmode/appmode_test.go +++ b/cmd/sessions/internal/appmode/appmode_test.go @@ -11,8 +11,6 @@ import ( // //nolint:tparallel func TestParse(t *testing.T) { - t.Parallel() - tests := []struct { name string input string diff --git a/go.mod b/go.mod index 56d83b1..2392622 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module gitea.dwysokinski.me/twhelp/sessions -go 1.19 +go 1.20 require ( - gitea.dwysokinski.me/Kichiyaki/chizap v0.2.1 + gitea.dwysokinski.me/Kichiyaki/chizap v0.3.0 github.com/cenkalti/backoff/v4 v4.2.0 github.com/go-chi/chi/v5 v5.0.8 github.com/go-chi/cors v1.2.1 @@ -15,11 +15,11 @@ require ( github.com/stretchr/testify v1.8.1 github.com/swaggo/http-swagger v1.3.3 github.com/swaggo/swag v1.8.8 - github.com/uptrace/bun v1.1.10 - github.com/uptrace/bun/dbfixture v1.1.10 - github.com/uptrace/bun/dialect/pgdialect v1.1.10 - github.com/uptrace/bun/driver/pgdriver v1.1.10 - github.com/urfave/cli/v2 v2.23.7 + github.com/uptrace/bun v1.1.11 + github.com/uptrace/bun/dbfixture v1.1.11 + github.com/uptrace/bun/dialect/pgdialect v1.1.11 + github.com/uptrace/bun/driver/pgdriver v1.1.11 + github.com/urfave/cli/v2 v2.24.2 go.uber.org/zap v1.24.0 ) diff --git a/go.sum b/go.sum index 3400ee7..e47bb58 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -gitea.dwysokinski.me/Kichiyaki/chizap v0.2.1 h1:h1p7YvpKvGsFYDwV5L4xbq9VT5czWIBa5x88bl8X0nU= -gitea.dwysokinski.me/Kichiyaki/chizap v0.2.1/go.mod h1:q+HrVxr1rf95wyuSTBt4Sa54UcEysXXLfu3eHRdJpBU= +gitea.dwysokinski.me/Kichiyaki/chizap v0.3.0 h1:se+wHeMGRp28dLtSC7XuXZJtxXYqPAEcmJj0gT0tthE= +gitea.dwysokinski.me/Kichiyaki/chizap v0.3.0/go.mod h1:VMCCIdwFB8X03qS1eWKaiJgXcU2o8Hs3zn1NwcPL+iE= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -142,17 +142,17 @@ github.com/swaggo/swag v1.8.8/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9e github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= -github.com/uptrace/bun v1.1.10 h1:wx80lg32mWlOV1gNvmPTbR9znt6A2fYvvURzU5dzSPE= -github.com/uptrace/bun v1.1.10/go.mod h1:pOWJSVU+W0jp3+cbn/TtHdcG/h+QxagECw4EYdKiaSw= -github.com/uptrace/bun/dbfixture v1.1.10 h1:fjxGQ7CFoIcbfBp3sAg3R6Ee4xaAYGgMTLMY2VergWE= -github.com/uptrace/bun/dbfixture v1.1.10/go.mod h1:cYs6r9hGlgnrh8mW0HYkhso3GMpP2/aY/FFQ45bj3Qw= -github.com/uptrace/bun/dialect/pgdialect v1.1.10 h1:H25ieb5OJV5ywvKvswF++wMTnePRaGRiSNkYCRXrQxc= -github.com/uptrace/bun/dialect/pgdialect v1.1.10/go.mod h1:leDSw/IC70/GYPIU3zC8fkOZpJaJ28f51OMT1VnZiY8= -github.com/uptrace/bun/driver/pgdriver v1.1.10 h1:xmabc3eG5rz8FadFF3GrQiGs5XvXlz6CJUMZhne+1sM= -github.com/uptrace/bun/driver/pgdriver v1.1.10/go.mod h1:krWrOAzJmroYDySsA6oNsJEVUmKl+ZBWLkGHphXUxqI= +github.com/uptrace/bun v1.1.11 h1:PVT+DHdLX13tIJaBoT0tkjh1TOWOybW/pz3TKiOB9lo= +github.com/uptrace/bun v1.1.11/go.mod h1:ysoB7l3gioKLBaZH9wKuJAoeBiOthb/hTyKdbXKcaxg= +github.com/uptrace/bun/dbfixture v1.1.11 h1:kYiwydXAMwLYKDjTqB7GhguribLfJpWN/VIraoIu1fc= +github.com/uptrace/bun/dbfixture v1.1.11/go.mod h1:tqtA92QYGFpLdhF0fh94Q/tIoocB2q9Zn9mOKSoXMSs= +github.com/uptrace/bun/dialect/pgdialect v1.1.11 h1:z1CLRQiYtTX1Usn2OEF7EtOBYeTFJiNdTgLuXE+AZZs= +github.com/uptrace/bun/dialect/pgdialect v1.1.11/go.mod h1:orzsx6UwNnSaTTELzLqc/XiWrR4k0Smid8Bchdg0mk4= +github.com/uptrace/bun/driver/pgdriver v1.1.11 h1:0oKNY3cBuIs6wHCJP2IpUw5wPoeUa8oIDEvIdei+sDI= +github.com/uptrace/bun/driver/pgdriver v1.1.11/go.mod h1:c5x3/2B63Vw876N1GjWJbqQOE3k68+8abMc428PKG18= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY= -github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= +github.com/urfave/cli/v2 v2.24.2 h1:q1VA+ofZ8SWfEKB9xXHUD4QZaeI9e+ItEqSbfH2JBXk= +github.com/urfave/cli/v2 v2.24.2/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= diff --git a/internal/domain/api_key_test.go b/internal/domain/api_key_test.go index eb22e5e..27dc399 100644 --- a/internal/domain/api_key_test.go +++ b/internal/domain/api_key_test.go @@ -82,6 +82,7 @@ func TestNewCreateAPIKeyParams(t *testing.T) { return } assert.NoError(t, err) + assert.Equal(t, tt.keyName, params.Name()) assert.Equal(t, tt.key, params.Key()) assert.Equal(t, tt.userID, params.UserID()) })