diff --git a/.golangci.yml b/.golangci.yml index 86978b692..ea53c2d66 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,6 @@ linters: - gofmt - unused - gosimple - - revive - exportloopref - gocritic - gosec diff --git a/api/v1/server/authn/middleware.go b/api/v1/server/authn/middleware.go index 59eb730bc..94b46d2fe 100644 --- a/api/v1/server/authn/middleware.go +++ b/api/v1/server/authn/middleware.go @@ -3,10 +3,11 @@ package authn import ( "net/http" - "github.com/hatchet-dev/hatchet/api/v1/server/middleware" - "github.com/hatchet-dev/hatchet/internal/config/server" "github.com/labstack/echo/v4" "github.com/rs/zerolog" + + "github.com/hatchet-dev/hatchet/api/v1/server/middleware" + "github.com/hatchet-dev/hatchet/internal/config/server" ) type AuthN struct { diff --git a/api/v1/server/authn/session_helpers.go b/api/v1/server/authn/session_helpers.go index f30bcd74d..eecafee0a 100644 --- a/api/v1/server/authn/session_helpers.go +++ b/api/v1/server/authn/session_helpers.go @@ -2,9 +2,10 @@ package authn import ( "github.com/gorilla/sessions" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/internal/config/server" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) type SessionHelpers struct { diff --git a/api/v1/server/authz/middleware.go b/api/v1/server/authz/middleware.go index 6bbcf909c..013bd417c 100644 --- a/api/v1/server/authz/middleware.go +++ b/api/v1/server/authz/middleware.go @@ -3,11 +3,12 @@ package authz import ( "net/http" + "github.com/labstack/echo/v4" + "github.com/rs/zerolog" + "github.com/hatchet-dev/hatchet/api/v1/server/middleware" "github.com/hatchet-dev/hatchet/internal/config/server" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" - "github.com/rs/zerolog" ) type AuthZ struct { diff --git a/api/v1/server/handlers/events/get_data.go b/api/v1/server/handlers/events/get_data.go index d8e7e908b..3630c8d83 100644 --- a/api/v1/server/handlers/events/get_data.go +++ b/api/v1/server/handlers/events/get_data.go @@ -3,9 +3,10 @@ package events import ( "encoding/json" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *EventService) EventDataGet(ctx echo.Context, request gen.EventDataGetRequestObject) (gen.EventDataGetResponseObject, error) { diff --git a/api/v1/server/handlers/events/list.go b/api/v1/server/handlers/events/list.go index 2018e8102..799653bc6 100644 --- a/api/v1/server/handlers/events/list.go +++ b/api/v1/server/handlers/events/list.go @@ -4,11 +4,12 @@ import ( "math" "strings" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *EventService) EventList(ctx echo.Context, request gen.EventListRequestObject) (gen.EventListResponseObject, error) { diff --git a/api/v1/server/handlers/events/list_keys.go b/api/v1/server/handlers/events/list_keys.go index a805fddee..686df8ffa 100644 --- a/api/v1/server/handlers/events/list_keys.go +++ b/api/v1/server/handlers/events/list_keys.go @@ -1,9 +1,10 @@ package events import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *EventService) EventKeyList(ctx echo.Context, request gen.EventKeyListRequestObject) (gen.EventKeyListResponseObject, error) { diff --git a/api/v1/server/handlers/events/replay.go b/api/v1/server/handlers/events/replay.go index 870283fc6..c9e51cc1e 100644 --- a/api/v1/server/handlers/events/replay.go +++ b/api/v1/server/handlers/events/replay.go @@ -2,10 +2,11 @@ package events import ( "github.com/hashicorp/go-multierror" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *EventService) EventUpdateReplay(ctx echo.Context, request gen.EventUpdateReplayRequestObject) (gen.EventUpdateReplayResponseObject, error) { diff --git a/api/v1/server/handlers/tenants/create.go b/api/v1/server/handlers/tenants/create.go index 36b971c76..162b67563 100644 --- a/api/v1/server/handlers/tenants/create.go +++ b/api/v1/server/handlers/tenants/create.go @@ -3,12 +3,13 @@ package tenants import ( "errors" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *TenantService) TenantCreate(ctx echo.Context, request gen.TenantCreateRequestObject) (gen.TenantCreateResponseObject, error) { diff --git a/api/v1/server/handlers/users/create.go b/api/v1/server/handlers/users/create.go index 837519a13..dcb2fc5d3 100644 --- a/api/v1/server/handlers/users/create.go +++ b/api/v1/server/handlers/users/create.go @@ -3,12 +3,13 @@ package users import ( "errors" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" "github.com/hatchet-dev/hatchet/api/v1/server/authn" ) diff --git a/api/v1/server/handlers/users/get_current.go b/api/v1/server/handlers/users/get_current.go index f9dda2bba..b41124f09 100644 --- a/api/v1/server/handlers/users/get_current.go +++ b/api/v1/server/handlers/users/get_current.go @@ -1,10 +1,11 @@ package users import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (u *UserService) UserGetCurrent(ctx echo.Context, request gen.UserGetCurrentRequestObject) (gen.UserGetCurrentResponseObject, error) { diff --git a/api/v1/server/handlers/users/list_memberships.go b/api/v1/server/handlers/users/list_memberships.go index 9da01e5b0..5a6c519be 100644 --- a/api/v1/server/handlers/users/list_memberships.go +++ b/api/v1/server/handlers/users/list_memberships.go @@ -1,10 +1,11 @@ package users import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *UserService) TenantMembershipsList(ctx echo.Context, request gen.TenantMembershipsListRequestObject) (gen.TenantMembershipsListResponseObject, error) { diff --git a/api/v1/server/handlers/users/update_login.go b/api/v1/server/handlers/users/update_login.go index af40d3708..b8e1705bc 100644 --- a/api/v1/server/handlers/users/update_login.go +++ b/api/v1/server/handlers/users/update_login.go @@ -4,14 +4,15 @@ import ( "errors" "fmt" + "github.com/labstack/echo/v4" + "golang.org/x/crypto/bcrypt" + "github.com/hatchet-dev/hatchet/api/v1/server/authn" "github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" - "golang.org/x/crypto/bcrypt" ) func (u *UserService) UserUpdateLogin(ctx echo.Context, request gen.UserUpdateLoginRequestObject) (gen.UserUpdateLoginResponseObject, error) { diff --git a/api/v1/server/handlers/users/update_logout.go b/api/v1/server/handlers/users/update_logout.go index 0b25f6d95..86955f704 100644 --- a/api/v1/server/handlers/users/update_logout.go +++ b/api/v1/server/handlers/users/update_logout.go @@ -1,11 +1,12 @@ package users import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/authn" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (u *UserService) UserUpdateLogout(ctx echo.Context, request gen.UserUpdateLogoutRequestObject) (gen.UserUpdateLogoutResponseObject, error) { diff --git a/api/v1/server/handlers/workers/get.go b/api/v1/server/handlers/workers/get.go index 95da02ccf..329951297 100644 --- a/api/v1/server/handlers/workers/get.go +++ b/api/v1/server/handlers/workers/get.go @@ -1,10 +1,11 @@ package workers import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkerService) WorkerGet(ctx echo.Context, request gen.WorkerGetRequestObject) (gen.WorkerGetResponseObject, error) { diff --git a/api/v1/server/handlers/workers/list.go b/api/v1/server/handlers/workers/list.go index 6c27380e9..5171444e4 100644 --- a/api/v1/server/handlers/workers/list.go +++ b/api/v1/server/handlers/workers/list.go @@ -1,11 +1,12 @@ package workers import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkerService) WorkerList(ctx echo.Context, request gen.WorkerListRequestObject) (gen.WorkerListResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/get.go b/api/v1/server/handlers/workflows/get.go index 1aca4bb60..260966cad 100644 --- a/api/v1/server/handlers/workflows/get.go +++ b/api/v1/server/handlers/workflows/get.go @@ -1,10 +1,11 @@ package workflows import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowGet(ctx echo.Context, request gen.WorkflowGetRequestObject) (gen.WorkflowGetResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/get_definition.go b/api/v1/server/handlers/workflows/get_definition.go index 01f961fc7..276512803 100644 --- a/api/v1/server/handlers/workflows/get_definition.go +++ b/api/v1/server/handlers/workflows/get_definition.go @@ -3,11 +3,12 @@ package workflows import ( "errors" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowVersionGetDefinition(ctx echo.Context, request gen.WorkflowVersionGetDefinitionRequestObject) (gen.WorkflowVersionGetDefinitionResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/get_run.go b/api/v1/server/handlers/workflows/get_run.go index e8f37e639..8dc382414 100644 --- a/api/v1/server/handlers/workflows/get_run.go +++ b/api/v1/server/handlers/workflows/get_run.go @@ -1,10 +1,11 @@ package workflows import ( + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowRunGet(ctx echo.Context, request gen.WorkflowRunGetRequestObject) (gen.WorkflowRunGetResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/get_version.go b/api/v1/server/handlers/workflows/get_version.go index f5e224a67..c56f2194e 100644 --- a/api/v1/server/handlers/workflows/get_version.go +++ b/api/v1/server/handlers/workflows/get_version.go @@ -3,11 +3,12 @@ package workflows import ( "errors" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/apierrors" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowVersionGet(ctx echo.Context, request gen.WorkflowVersionGetRequestObject) (gen.WorkflowVersionGetResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/list.go b/api/v1/server/handlers/workflows/list.go index bccdfb76d..bc6f0eb4f 100644 --- a/api/v1/server/handlers/workflows/list.go +++ b/api/v1/server/handlers/workflows/list.go @@ -3,11 +3,12 @@ package workflows import ( "math" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowList(ctx echo.Context, request gen.WorkflowListRequestObject) (gen.WorkflowListResponseObject, error) { diff --git a/api/v1/server/handlers/workflows/list_runs.go b/api/v1/server/handlers/workflows/list_runs.go index 33e39dfaa..2ad5adbab 100644 --- a/api/v1/server/handlers/workflows/list_runs.go +++ b/api/v1/server/handlers/workflows/list_runs.go @@ -3,11 +3,12 @@ package workflows import ( "math" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/api/v1/server/oas/transformers" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/labstack/echo/v4" ) func (t *WorkflowService) WorkflowRunList(ctx echo.Context, request gen.WorkflowRunListRequestObject) (gen.WorkflowRunListResponseObject, error) { diff --git a/api/v1/server/middleware/populator/populator.go b/api/v1/server/middleware/populator/populator.go index 1e3d17f48..5657ad820 100644 --- a/api/v1/server/middleware/populator/populator.go +++ b/api/v1/server/middleware/populator/populator.go @@ -3,9 +3,10 @@ package populator import ( "fmt" + "github.com/labstack/echo/v4" + "github.com/hatchet-dev/hatchet/api/v1/server/middleware" "github.com/hatchet-dev/hatchet/internal/config/server" - "github.com/labstack/echo/v4" ) type ResourceGetterFunc func(config *server.ServerConfig, parentId, id string) (result interface{}, uniqueParentId string, err error) diff --git a/api/v1/server/middleware/populator/populator_test.go b/api/v1/server/middleware/populator/populator_test.go index 54dae6ffd..4299864c7 100644 --- a/api/v1/server/middleware/populator/populator_test.go +++ b/api/v1/server/middleware/populator/populator_test.go @@ -6,10 +6,11 @@ import ( "testing" "github.com/google/uuid" - "github.com/hatchet-dev/hatchet/api/v1/server/middleware" - "github.com/hatchet-dev/hatchet/internal/config/server" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" + + "github.com/hatchet-dev/hatchet/api/v1/server/middleware" + "github.com/hatchet-dev/hatchet/internal/config/server" ) type oneToManyResource struct { diff --git a/api/v1/server/oas/transformers/metadata.go b/api/v1/server/oas/transformers/metadata.go index 2d983c3eb..5bdd5e85c 100644 --- a/api/v1/server/oas/transformers/metadata.go +++ b/api/v1/server/oas/transformers/metadata.go @@ -4,6 +4,7 @@ import ( "time" "github.com/google/uuid" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" ) diff --git a/api/v1/server/oas/transformers/user.go b/api/v1/server/oas/transformers/user.go index 1d9727d61..fd0c590b4 100644 --- a/api/v1/server/oas/transformers/user.go +++ b/api/v1/server/oas/transformers/user.go @@ -1,9 +1,10 @@ package transformers import ( + "github.com/oapi-codegen/runtime/types" + "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/oapi-codegen/runtime/types" ) func ToUser(user *db.UserModel) *gen.User { diff --git a/api/v1/server/run/run.go b/api/v1/server/run/run.go index e4cd165c8..dda8370bc 100644 --- a/api/v1/server/run/run.go +++ b/api/v1/server/run/run.go @@ -4,6 +4,9 @@ import ( "context" "fmt" + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" + "github.com/hatchet-dev/hatchet/api/v1/server/authn" "github.com/hatchet-dev/hatchet/api/v1/server/authz" "github.com/hatchet-dev/hatchet/api/v1/server/handlers/events" @@ -14,8 +17,6 @@ import ( "github.com/hatchet-dev/hatchet/api/v1/server/middleware/populator" "github.com/hatchet-dev/hatchet/api/v1/server/oas/gen" "github.com/hatchet-dev/hatchet/internal/config/server" - "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" hatchetmiddleware "github.com/hatchet-dev/hatchet/api/v1/server/middleware" ) diff --git a/cmd/hatchet-admin/cli/quickstart.go b/cmd/hatchet-admin/cli/quickstart.go index 4aa94411e..b514418d2 100644 --- a/cmd/hatchet-admin/cli/quickstart.go +++ b/cmd/hatchet-admin/cli/quickstart.go @@ -10,11 +10,12 @@ import ( "strings" "github.com/fatih/color" + "sigs.k8s.io/yaml" + "github.com/hatchet-dev/hatchet/internal/config/database" "github.com/hatchet-dev/hatchet/internal/config/loader" "github.com/hatchet-dev/hatchet/internal/config/server" "github.com/hatchet-dev/hatchet/internal/encryption" - "sigs.k8s.io/yaml" "github.com/spf13/cobra" ) diff --git a/cmd/hatchet-admin/cli/seed.go b/cmd/hatchet-admin/cli/seed.go index 0cf61c8d9..a6e496ed3 100644 --- a/cmd/hatchet-admin/cli/seed.go +++ b/cmd/hatchet-admin/cli/seed.go @@ -5,10 +5,11 @@ import ( "fmt" "os" + "github.com/spf13/cobra" + "github.com/hatchet-dev/hatchet/internal/config/loader" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" - "github.com/spf13/cobra" ) // seedCmd seeds the database with initial data diff --git a/cmd/hatchet-api/main.go b/cmd/hatchet-api/main.go index e0a73b762..ad5736d9a 100644 --- a/cmd/hatchet-api/main.go +++ b/cmd/hatchet-api/main.go @@ -4,10 +4,11 @@ import ( "fmt" "os" + "github.com/spf13/cobra" + "github.com/hatchet-dev/hatchet/api/v1/server/run" "github.com/hatchet-dev/hatchet/internal/config/loader" "github.com/hatchet-dev/hatchet/pkg/cmdutils" - "github.com/spf13/cobra" ) var printVersion bool diff --git a/internal/auth/cookie/sessionstore.go b/internal/auth/cookie/sessionstore.go index 473e6c77f..16e986587 100644 --- a/internal/auth/cookie/sessionstore.go +++ b/internal/auth/cookie/sessionstore.go @@ -10,6 +10,7 @@ import ( "github.com/google/uuid" "github.com/gorilla/securecookie" "github.com/gorilla/sessions" + "github.com/hatchet-dev/hatchet/internal/datautils" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" diff --git a/internal/config/database/config.go b/internal/config/database/config.go index a7b2deb55..73b39ff97 100644 --- a/internal/config/database/config.go +++ b/internal/config/database/config.go @@ -1,9 +1,10 @@ package database import ( + "github.com/spf13/viper" + "github.com/hatchet-dev/hatchet/internal/config/shared" "github.com/hatchet-dev/hatchet/internal/repository" - "github.com/spf13/viper" ) type ConfigFile struct { diff --git a/internal/config/loader/loader.go b/internal/config/loader/loader.go index abfcf1096..264c37aba 100644 --- a/internal/config/loader/loader.go +++ b/internal/config/loader/loader.go @@ -8,6 +8,8 @@ import ( "path/filepath" "strings" + "github.com/jackc/pgx/v5/pgxpool" + "github.com/hatchet-dev/hatchet/internal/auth/cookie" "github.com/hatchet-dev/hatchet/internal/config/database" "github.com/hatchet-dev/hatchet/internal/config/loader/loaderutils" @@ -18,7 +20,6 @@ import ( "github.com/hatchet-dev/hatchet/internal/services/ingestor" "github.com/hatchet-dev/hatchet/internal/taskqueue/rabbitmq" "github.com/hatchet-dev/hatchet/internal/validator" - "github.com/jackc/pgx/v5/pgxpool" ) // LoadDatabaseConfigFile loads the database config file via viper diff --git a/internal/repository/prisma/dispatcher.go b/internal/repository/prisma/dispatcher.go index 52e9bb251..75993ef6b 100644 --- a/internal/repository/prisma/dispatcher.go +++ b/internal/repository/prisma/dispatcher.go @@ -3,13 +3,14 @@ package prisma import ( "context" + "github.com/jackc/pgx/v5/pgtype" + "github.com/jackc/pgx/v5/pgxpool" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/repository/prisma/dbsqlc" "github.com/hatchet-dev/hatchet/internal/repository/prisma/sqlchelpers" "github.com/hatchet-dev/hatchet/internal/validator" - "github.com/jackc/pgx/v5/pgtype" - "github.com/jackc/pgx/v5/pgxpool" ) type dispatcherRepository struct { diff --git a/internal/repository/prisma/ticker.go b/internal/repository/prisma/ticker.go index 807963e3a..156fef3c2 100644 --- a/internal/repository/prisma/ticker.go +++ b/internal/repository/prisma/ticker.go @@ -4,13 +4,14 @@ import ( "context" "time" + "github.com/jackc/pgx/v5/pgtype" + "github.com/jackc/pgx/v5/pgxpool" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/repository/prisma/dbsqlc" "github.com/hatchet-dev/hatchet/internal/repository/prisma/sqlchelpers" "github.com/hatchet-dev/hatchet/internal/validator" - "github.com/jackc/pgx/v5/pgtype" - "github.com/jackc/pgx/v5/pgxpool" ) type tickerRepository struct { diff --git a/internal/repository/prisma/user.go b/internal/repository/prisma/user.go index ce60b5992..29205d647 100644 --- a/internal/repository/prisma/user.go +++ b/internal/repository/prisma/user.go @@ -5,10 +5,11 @@ import ( "strings" "github.com/google/uuid" + "github.com/steebchen/prisma-client-go/runtime/transaction" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/validator" - "github.com/steebchen/prisma-client-go/runtime/transaction" ) type userRepository struct { diff --git a/internal/repository/prisma/worker.go b/internal/repository/prisma/worker.go index be0e91894..6cbc1fb58 100644 --- a/internal/repository/prisma/worker.go +++ b/internal/repository/prisma/worker.go @@ -7,10 +7,11 @@ import ( "strings" "github.com/google/uuid" + "github.com/steebchen/prisma-client-go/runtime/transaction" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/validator" - "github.com/steebchen/prisma-client-go/runtime/transaction" ) type workerRepository struct { diff --git a/internal/repository/user.go b/internal/repository/user.go index 99e02745b..81588cf61 100644 --- a/internal/repository/user.go +++ b/internal/repository/user.go @@ -3,8 +3,9 @@ package repository import ( "fmt" - "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "golang.org/x/crypto/bcrypt" + + "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" ) type CreateUserOpts struct { diff --git a/internal/repository/user_session.go b/internal/repository/user_session.go index c1b21981d..9bd3115a7 100644 --- a/internal/repository/user_session.go +++ b/internal/repository/user_session.go @@ -3,8 +3,9 @@ package repository import ( "time" - "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/steebchen/prisma-client-go/runtime/types" + + "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" ) type CreateSessionOpts struct { diff --git a/internal/services/dispatcher/dispatcher.go b/internal/services/dispatcher/dispatcher.go index 6743b4f1a..2c7b48bf7 100644 --- a/internal/services/dispatcher/dispatcher.go +++ b/internal/services/dispatcher/dispatcher.go @@ -8,6 +8,8 @@ import ( "github.com/go-co-op/gocron/v2" "github.com/google/uuid" + "github.com/rs/zerolog" + "github.com/hatchet-dev/hatchet/internal/datautils" "github.com/hatchet-dev/hatchet/internal/logger" "github.com/hatchet-dev/hatchet/internal/repository" @@ -16,7 +18,6 @@ import ( "github.com/hatchet-dev/hatchet/internal/taskqueue" "github.com/hatchet-dev/hatchet/internal/telemetry" "github.com/hatchet-dev/hatchet/internal/telemetry/servertel" - "github.com/rs/zerolog" ) type Dispatcher interface { diff --git a/internal/services/eventscontroller/controller.go b/internal/services/eventscontroller/controller.go index 087041ec5..80a17d996 100644 --- a/internal/services/eventscontroller/controller.go +++ b/internal/services/eventscontroller/controller.go @@ -5,6 +5,9 @@ import ( "fmt" "sync" + "github.com/rs/zerolog" + "golang.org/x/sync/errgroup" + "github.com/hatchet-dev/hatchet/internal/datautils" "github.com/hatchet-dev/hatchet/internal/logger" "github.com/hatchet-dev/hatchet/internal/repository" @@ -12,8 +15,6 @@ import ( "github.com/hatchet-dev/hatchet/internal/services/shared/tasktypes" "github.com/hatchet-dev/hatchet/internal/taskqueue" "github.com/hatchet-dev/hatchet/internal/telemetry" - "github.com/rs/zerolog" - "golang.org/x/sync/errgroup" ) type EventsController interface { diff --git a/internal/services/heartbeat/heartbeater.go b/internal/services/heartbeat/heartbeater.go index 79118c09b..a9b0e2c9d 100644 --- a/internal/services/heartbeat/heartbeater.go +++ b/internal/services/heartbeat/heartbeater.go @@ -6,10 +6,11 @@ import ( "time" "github.com/go-co-op/gocron/v2" + "github.com/rs/zerolog" + "github.com/hatchet-dev/hatchet/internal/logger" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/taskqueue" - "github.com/rs/zerolog" ) type Heartbeater interface { diff --git a/internal/services/ingestor/ingestor.go b/internal/services/ingestor/ingestor.go index d5dcc6081..f44151aaa 100644 --- a/internal/services/ingestor/ingestor.go +++ b/internal/services/ingestor/ingestor.go @@ -4,6 +4,8 @@ import ( "context" "fmt" + "github.com/steebchen/prisma-client-go/runtime/types" + "github.com/hatchet-dev/hatchet/internal/datautils" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" @@ -11,7 +13,6 @@ import ( "github.com/hatchet-dev/hatchet/internal/services/shared/tasktypes" "github.com/hatchet-dev/hatchet/internal/taskqueue" "github.com/hatchet-dev/hatchet/internal/telemetry" - "github.com/steebchen/prisma-client-go/runtime/types" ) type Ingestor interface { diff --git a/internal/services/ingestor/server.go b/internal/services/ingestor/server.go index 08a492bce..84de4419e 100644 --- a/internal/services/ingestor/server.go +++ b/internal/services/ingestor/server.go @@ -5,11 +5,12 @@ import ( "encoding/json" "fmt" + "google.golang.org/protobuf/types/known/timestamppb" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/repository/prisma/dbsqlc" "github.com/hatchet-dev/hatchet/internal/services/ingestor/contracts" - "google.golang.org/protobuf/types/known/timestamppb" "github.com/jackc/pgx/v5/pgtype" ) diff --git a/internal/services/ticker/cron.go b/internal/services/ticker/cron.go index e93f3c168..2184ba0d9 100644 --- a/internal/services/ticker/cron.go +++ b/internal/services/ticker/cron.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-co-op/gocron/v2" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/services/shared/tasktypes" diff --git a/internal/services/ticker/schedule_workflow.go b/internal/services/ticker/schedule_workflow.go index a6bc3a57b..27c0b8919 100644 --- a/internal/services/ticker/schedule_workflow.go +++ b/internal/services/ticker/schedule_workflow.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-co-op/gocron/v2" + "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/repository/prisma/db" "github.com/hatchet-dev/hatchet/internal/services/shared/tasktypes" diff --git a/internal/services/ticker/ticker.go b/internal/services/ticker/ticker.go index 5329f2400..7a3f3918b 100644 --- a/internal/services/ticker/ticker.go +++ b/internal/services/ticker/ticker.go @@ -8,12 +8,13 @@ import ( "github.com/go-co-op/gocron/v2" "github.com/google/uuid" + "github.com/rs/zerolog" + "github.com/hatchet-dev/hatchet/internal/datautils" "github.com/hatchet-dev/hatchet/internal/logger" "github.com/hatchet-dev/hatchet/internal/repository" "github.com/hatchet-dev/hatchet/internal/services/shared/tasktypes" "github.com/hatchet-dev/hatchet/internal/taskqueue" - "github.com/rs/zerolog" ) type Ticker interface {