datasource/mock: switch to uber mock (#333)

go.mod

@@ -11,7 +11,6 @@ require (
  github.com/gabriel-vasile/mimetype v1.4.3
  github.com/go-chi/chi/v5 v5.0.12
  github.com/go-playground/validator/v10 v10.19.0
- github.com/golang/mock v1.6.0
  github.com/golangci/golangci-lint v1.57.2
  github.com/google/uuid v1.6.0
  github.com/gorilla/mux v1.8.1
@@ -24,6 +23,7 @@ require (
  github.com/stretchr/testify v1.9.0
  github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80
  github.com/vektah/gqlparser v1.3.1
+ go.uber.org/mock v0.4.0
  golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
  golang.org/x/oauth2 v0.18.0
  golang.org/x/sync v0.6.0

go.sum

@@ -268,8 +268,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -694,6 +692,8 @@ go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
 go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=

pkg/directory/auth0/auth0_test.go

@@ -1,15 +1,15 @@
 package auth0
 
-//go:generate go run github.com/golang/mock/mockgen -destination=mock_auth0/mock.go . RoleManager,UserManager
+//go:generate go run go.uber.org/mock/mockgen -destination=mock_auth0/mock.go . RoleManager,UserManager
 
 import (
  "context"
  "errors"
  "fmt"
  "testing"
 
- "github.com/golang/mock/gomock"
  "github.com/stretchr/testify/assert"
+ "go.uber.org/mock/gomock"
  "gopkg.in/auth0.v5/management"
 
  "github.com/pomerium/datasource/pkg/directory"

tools.go

@@ -5,6 +5,5 @@ package datasource
 
 import (
  _ "github.com/client9/misspell/cmd/misspell"
- _ "github.com/golang/mock/mockgen"
  _ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 )