diff --git a/internal/auth/delivery/http/auth_http_test.go b/internal/auth/delivery/http/auth_http_test.go index 5cd15e8..9e78802 100644 --- a/internal/auth/delivery/http/auth_http_test.go +++ b/internal/auth/delivery/http/auth_http_test.go @@ -25,7 +25,7 @@ import ( userrepo "source.toby3d.me/website/indieauth/internal/user/repository/memory" ) -type dependencies struct { +type Dependencies struct { authService auth.UseCase clients client.Repository clientService client.UseCase @@ -47,7 +47,7 @@ func TestRender(t *testing.T) { deps.store.Store(path.Join(profilerepo.DefaultPathPrefix, me.String()), user.Profile) deps.store.Store(path.Join(userrepo.DefaultPathPrefix, me.String()), user) - r := router.New() + r := router.New() //nolint: varnamelen delivery.NewRequestHandler(delivery.NewRequestHandlerOptions{ Auth: deps.authService, Clients: deps.clientService, @@ -95,18 +95,18 @@ func TestRender(t *testing.T) { } } -func NewDependencies(tb testing.TB) dependencies { +func NewDependencies(tb testing.TB) Dependencies { tb.Helper() config := domain.TestConfig(tb) matcher := language.NewMatcher(message.DefaultCatalog.Languages()) store := new(sync.Map) clients := clientrepo.NewMemoryClientRepository(store) - sessions := sessionrepo.NewMemorySessionRepository(config, store) + sessions := sessionrepo.NewMemorySessionRepository(store, config) authService := ucase.NewAuthUseCase(sessions, config) clientService := clientucase.NewClientUseCase(clients) - return dependencies{ + return Dependencies{ authService: authService, clients: clients, clientService: clientService, diff --git a/internal/client/delivery/http/client_http_test.go b/internal/client/delivery/http/client_http_test.go index 3301e96..bff37ac 100644 --- a/internal/client/delivery/http/client_http_test.go +++ b/internal/client/delivery/http/client_http_test.go @@ -19,7 +19,7 @@ import ( tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" ) -type dependencies struct { +type Dependencies struct { client *domain.Client config *domain.Config matcher language.Matcher @@ -34,7 +34,7 @@ func TestRead(t *testing.T) { deps := NewDependencies(t) - r := router.New() + r := router.New() //nolint: varnamelen delivery.NewRequestHandler(delivery.NewRequestHandlerOptions{ Client: deps.client, Config: deps.config, @@ -62,18 +62,18 @@ func TestRead(t *testing.T) { } } -func NewDependencies(tb testing.TB) dependencies { +func NewDependencies(tb testing.TB) Dependencies { tb.Helper() client := domain.TestClient(tb) config := domain.TestConfig(tb) matcher := language.NewMatcher(message.DefaultCatalog.Languages()) store := new(sync.Map) - sessions := sessionrepo.NewMemorySessionRepository(config, store) + sessions := sessionrepo.NewMemorySessionRepository(store, config) tokens := tokenrepo.NewMemoryTokenRepository(store) tokenService := tokenucase.NewTokenUseCase(tokens, sessions, config) - return dependencies{ + return Dependencies{ client: client, config: config, matcher: matcher, diff --git a/internal/session/repository/memory/memory_session.go b/internal/session/repository/memory/memory_session.go index 13b20f1..2e0e650 100644 --- a/internal/session/repository/memory/memory_session.go +++ b/internal/session/repository/memory/memory_session.go @@ -25,7 +25,7 @@ type ( const DefaultPathPrefix string = "sessions" -func NewMemorySessionRepository(config *domain.Config, store *sync.Map) session.Repository { +func NewMemorySessionRepository(store *sync.Map, config *domain.Config) session.Repository { return &memorySessionRepository{ config: config, store: store, diff --git a/internal/testing/bolttest/bolttest.go b/internal/testing/bolttest/bolttest.go index 7e5706a..778e5f2 100644 --- a/internal/testing/bolttest/bolttest.go +++ b/internal/testing/bolttest/bolttest.go @@ -12,14 +12,14 @@ import ( func New(tb testing.TB) (*bolt.DB, func()) { tb.Helper() - f, err := os.CreateTemp(os.TempDir(), "bbolt_*.db") + tempFile, err := os.CreateTemp(os.TempDir(), "bbolt_*.db") if err != nil { tb.Fatal(err) } - filePath := f.Name() + filePath := tempFile.Name() - if err := f.Close(); err != nil { + if err := tempFile.Close(); err != nil { tb.Fatal(err) } diff --git a/internal/ticket/delivery/http/ticket_http_test.go b/internal/ticket/delivery/http/ticket_http_test.go index f9c1fa4..6634641 100644 --- a/internal/ticket/delivery/http/ticket_http_test.go +++ b/internal/ticket/delivery/http/ticket_http_test.go @@ -18,7 +18,7 @@ import ( ucase "source.toby3d.me/website/indieauth/internal/ticket/usecase" ) -type dependencies struct { +type Dependencies struct { client *http.Client config *domain.Config matcher language.Matcher @@ -70,7 +70,7 @@ func TestUpdate(t *testing.T) { } } -func NewDependencies(tb testing.TB) dependencies { +func NewDependencies(tb testing.TB) Dependencies { tb.Helper() config := domain.TestConfig(tb) @@ -79,7 +79,7 @@ func NewDependencies(tb testing.TB) dependencies { ticket := domain.TestTicket(tb) token := domain.TestToken(tb) - r := router.New() + r := router.New() //nolint: varnamelen // NOTE(toby3d): private resource r.GET(ticket.Resource.URL().EscapedPath(), func(ctx *http.RequestCtx) { ctx.SuccessString(common.MIMETextHTMLCharsetUTF8, @@ -101,7 +101,7 @@ func NewDependencies(tb testing.TB) dependencies { tickets := ticketrepo.NewMemoryTicketRepository(store, config) ticketService := ucase.NewTicketUseCase(tickets, client, config) - return dependencies{ + return Dependencies{ client: client, config: config, matcher: matcher, diff --git a/internal/token/delivery/http/token_http_test.go b/internal/token/delivery/http/token_http_test.go index 8dee715..c7280d0 100644 --- a/internal/token/delivery/http/token_http_test.go +++ b/internal/token/delivery/http/token_http_test.go @@ -24,7 +24,7 @@ import ( tokenucase "source.toby3d.me/website/indieauth/internal/token/usecase" ) -type dependencies struct { +type Dependencies struct { client *http.Client config *domain.Config sessions session.Repository @@ -131,7 +131,7 @@ func TestRevocation(t *testing.T) { } } -func NewDependencies(tb testing.TB) dependencies { +func NewDependencies(tb testing.TB) Dependencies { tb.Helper() client := new(http.Client) @@ -144,7 +144,7 @@ func NewDependencies(tb testing.TB) dependencies { ticketService := ticketucase.NewTicketUseCase(tickets, client, config) tokenService := tokenucase.NewTokenUseCase(tokens, sessions, config) - return dependencies{ + return Dependencies{ client: client, config: config, sessions: sessions,