From a39105ba9614cde34007d312c48151f1fa39e37e Mon Sep 17 00:00:00 2001 From: Vincent Boutour Date: Fri, 11 Aug 2023 21:33:23 +0200 Subject: [PATCH] chore(deps): Migrationg mocks tool Signed-off-by: Vincent Boutour --- Makefile | 4 ++-- go.mod | 2 +- go.sum | 25 ++----------------------- pkg/crud/get_test.go | 2 +- pkg/crud/share_test.go | 2 +- pkg/fibr/fibr_test.go | 2 +- pkg/mocks/interfaces.go | 2 +- pkg/mocks/metadata.go | 2 +- pkg/mocks/redis_client.go | 2 +- pkg/mocks/storage.go | 2 +- pkg/share/share_test.go | 2 +- pkg/thumbnail/utils_test.go | 2 +- 12 files changed, 14 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index b324789b..6ec0e8d1 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,7 @@ app: init dev .PHONY: init init: @curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "git_hooks" "coverage" "release" - go install "github.com/golang/mock/mockgen@v1.6.0" go install "github.com/golangci/golangci-lint/cmd/golangci-lint@latest" - go install "github.com/tdewolff/minify/v2/cmd/minify@latest" go install "golang.org/x/tools/cmd/goimports@latest" go install "golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/fieldalignment@master" go install "mvdan.cc/gofumpt@latest" @@ -71,6 +69,7 @@ style: ## mocks: Generate mocks .PHONY: mocks mocks: + go install "go.uber.org/mock/mockgen@latest" find . -name "mocks" -type d -exec rm -r "{}" \+ go generate -run mockgen $(PACKAGES) @@ -93,6 +92,7 @@ build: ## build: Build the application. .PHONY: build-web build-web: + go install "github.com/tdewolff/minify/v2/cmd/minify@latest" rm -f "cmd/fibr/static/scripts/index.min.js" "cmd/fibr/static/styles/main.min.css" minify --bundle --output "cmd/fibr/static/scripts/index.min.js" "cmd/fibr/static/scripts/"*.js minify --bundle --output "cmd/fibr/static/styles/main.min.css" "cmd/fibr/static/styles/"*.css diff --git a/go.mod b/go.mod index cce8413a..3548c227 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/ViBiOh/flags v1.3.1 github.com/ViBiOh/httputils/v4 v4.62.0 github.com/ViBiOh/vith v0.6.0 - github.com/golang/mock v1.6.0 github.com/prometheus/client_golang v1.16.0 github.com/rabbitmq/amqp091-go v1.8.1 github.com/redis/go-redis/v9 v9.0.5 @@ -18,6 +17,7 @@ require ( github.com/zeebo/xxh3 v1.0.2 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 + go.uber.org/mock v0.2.0 golang.org/x/crypto v0.12.0 golang.org/x/text v0.12.0 ) diff --git a/go.sum b/go.sum index 834700d2..358f4a8b 100644 --- a/go.sum +++ b/go.sum @@ -117,7 +117,6 @@ github.com/tdewolff/parse/v2 v2.6.7 h1:WrFllrqmzAcrKHzoYgMupqgUBIfBVOb0yscFzDf8b github.com/tdewolff/parse/v2 v2.6.7/go.mod h1:XHDhaU6IBgsryfdnpzUXBlT6leW/l25yrFBTEb4eIyM= github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0= github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= @@ -142,42 +141,22 @@ go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lI go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU= +go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM= golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= google.golang.org/genproto/googleapis/api v0.0.0-20230807174057-1744710a1577 h1:xv8KoglAClYGkprUSmDTKaILtzfD8XzG9NYVXMprjKo= diff --git a/pkg/crud/get_test.go b/pkg/crud/get_test.go index 4d82c8aa..c05c3c5e 100644 --- a/pkg/crud/get_test.go +++ b/pkg/crud/get_test.go @@ -10,7 +10,7 @@ import ( exas "github.com/ViBiOh/exas/pkg/model" "github.com/ViBiOh/fibr/pkg/mocks" "github.com/ViBiOh/fibr/pkg/provider" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func BenchmarkServeGeoJSON(b *testing.B) { diff --git a/pkg/crud/share_test.go b/pkg/crud/share_test.go index 1c5d4b99..29f82e6a 100644 --- a/pkg/crud/share_test.go +++ b/pkg/crud/share_test.go @@ -5,7 +5,7 @@ import ( "github.com/ViBiOh/fibr/pkg/mocks" "github.com/ViBiOh/fibr/pkg/provider" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func TestBestSharePath(t *testing.T) { diff --git a/pkg/fibr/fibr_test.go b/pkg/fibr/fibr_test.go index ae9f07d1..97fc4d4a 100644 --- a/pkg/fibr/fibr_test.go +++ b/pkg/fibr/fibr_test.go @@ -16,7 +16,7 @@ import ( "github.com/ViBiOh/fibr/pkg/mocks" "github.com/ViBiOh/fibr/pkg/provider" httpModel "github.com/ViBiOh/httputils/v4/pkg/model" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" "golang.org/x/crypto/bcrypt" ) diff --git a/pkg/mocks/interfaces.go b/pkg/mocks/interfaces.go index 7fe3958e..05ad8177 100644 --- a/pkg/mocks/interfaces.go +++ b/pkg/mocks/interfaces.go @@ -14,7 +14,7 @@ import ( model "github.com/ViBiOh/auth/v2/pkg/model" provider "github.com/ViBiOh/fibr/pkg/provider" renderer "github.com/ViBiOh/httputils/v4/pkg/renderer" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // Crud is a mock of Crud interface. diff --git a/pkg/mocks/metadata.go b/pkg/mocks/metadata.go index 19fd745f..b9d21a03 100644 --- a/pkg/mocks/metadata.go +++ b/pkg/mocks/metadata.go @@ -10,7 +10,7 @@ import ( model "github.com/ViBiOh/absto/pkg/model" provider "github.com/ViBiOh/fibr/pkg/provider" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // MetadataManager is a mock of MetadataManager interface. diff --git a/pkg/mocks/redis_client.go b/pkg/mocks/redis_client.go index 0591dcf8..e954c97b 100644 --- a/pkg/mocks/redis_client.go +++ b/pkg/mocks/redis_client.go @@ -9,8 +9,8 @@ import ( reflect "reflect" time "time" - gomock "github.com/golang/mock/gomock" redis "github.com/redis/go-redis/v9" + gomock "go.uber.org/mock/gomock" ) // RedisClient is a mock of Client interface. diff --git a/pkg/mocks/storage.go b/pkg/mocks/storage.go index beb46f31..42ad1b90 100644 --- a/pkg/mocks/storage.go +++ b/pkg/mocks/storage.go @@ -12,7 +12,7 @@ import ( time "time" model "github.com/ViBiOh/absto/pkg/model" - gomock "github.com/golang/mock/gomock" + gomock "go.uber.org/mock/gomock" ) // Storage is a mock of Storage interface. diff --git a/pkg/share/share_test.go b/pkg/share/share_test.go index 54f8b54c..17f786df 100644 --- a/pkg/share/share_test.go +++ b/pkg/share/share_test.go @@ -8,7 +8,7 @@ import ( "github.com/ViBiOh/fibr/pkg/mocks" "github.com/ViBiOh/fibr/pkg/provider" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func TestPurgeExpiredShares(t *testing.T) { diff --git a/pkg/thumbnail/utils_test.go b/pkg/thumbnail/utils_test.go index e5e64402..b3415409 100644 --- a/pkg/thumbnail/utils_test.go +++ b/pkg/thumbnail/utils_test.go @@ -7,7 +7,7 @@ import ( absto "github.com/ViBiOh/absto/pkg/model" "github.com/ViBiOh/fibr/pkg/mocks" "github.com/ViBiOh/httputils/v4/pkg/cache" - "github.com/golang/mock/gomock" + "go.uber.org/mock/gomock" ) func TestCanHaveThumbnail(t *testing.T) {