From a31cd5d1a93bf013e9b2bb6ecbb31af2be58a226 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Fri, 25 Jul 2025 09:31:52 +0100 Subject: [PATCH] idresolver: move package out of appview Change-Id: kluuwrpktsllxoxtulmzptmkozzlyukk Signed-off-by: oppiliappan --- appview/ingester.go | 2 +- appview/issues/issues.go | 2 +- appview/knots/knots.go | 2 +- appview/middleware/middleware.go | 2 +- appview/oauth/handler/handler.go | 2 +- appview/pipelines/pipelines.go | 2 +- appview/pulls/pulls.go | 2 +- appview/repo/repo.go | 2 +- appview/reporesolver/resolver.go | 2 +- appview/spindles/spindles.go | 2 +- appview/state/state.go | 4 ++-- guard/guard.go | 2 +- {appview/idresolver => idresolver}/resolver.go | 5 ++--- knotserver/ingester.go | 2 +- 14 files changed, 16 insertions(+), 17 deletions(-) rename {appview/idresolver => idresolver}/resolver.go (94%) diff --git a/appview/ingester.go b/appview/ingester.go index c8b54d8..62eb5cd 100644 --- a/appview/ingester.go +++ b/appview/ingester.go @@ -14,8 +14,8 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/spindleverify" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/issues/issues.go b/appview/issues/issues.go index b6d236d..3e2d058 100644 --- a/appview/issues/issues.go +++ b/appview/issues/issues.go @@ -18,12 +18,12 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/notify" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/pagination" "tangled.sh/tangled.sh/core/appview/reporesolver" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/tid" ) diff --git a/appview/knots/knots.go b/appview/knots/knots.go index 68125f4..a014f7a 100644 --- a/appview/knots/knots.go +++ b/appview/knots/knots.go @@ -15,11 +15,11 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/middleware" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/eventconsumer" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/rbac" "tangled.sh/tangled.sh/core/tid" diff --git a/appview/middleware/middleware.go b/appview/middleware/middleware.go index c859caa..e427eb2 100644 --- a/appview/middleware/middleware.go +++ b/appview/middleware/middleware.go @@ -13,11 +13,11 @@ import ( "github.com/bluesky-social/indigo/atproto/identity" "github.com/go-chi/chi/v5" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/pagination" "tangled.sh/tangled.sh/core/appview/reporesolver" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go index f522890..d9d23a7 100644 --- a/appview/oauth/handler/handler.go +++ b/appview/oauth/handler/handler.go @@ -16,11 +16,11 @@ import ( sessioncache "tangled.sh/tangled.sh/core/appview/cache/session" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/middleware" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/oauth/client" "tangled.sh/tangled.sh/core/appview/pages" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/pipelines/pipelines.go b/appview/pipelines/pipelines.go index e650813..c15d527 100644 --- a/appview/pipelines/pipelines.go +++ b/appview/pipelines/pipelines.go @@ -11,11 +11,11 @@ import ( "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/reporesolver" "tangled.sh/tangled.sh/core/eventconsumer" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/log" "tangled.sh/tangled.sh/core/rbac" spindlemodel "tangled.sh/tangled.sh/core/spindle/models" diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index ef34ab0..824f702 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -16,11 +16,11 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/notify" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/reporesolver" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/patchutil" "tangled.sh/tangled.sh/core/tid" diff --git a/appview/repo/repo.go b/appview/repo/repo.go index a68c1d1..45b59f9 100644 --- a/appview/repo/repo.go +++ b/appview/repo/repo.go @@ -19,13 +19,13 @@ import ( "tangled.sh/tangled.sh/core/appview/commitverify" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/notify" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/pages/markup" "tangled.sh/tangled.sh/core/appview/reporesolver" "tangled.sh/tangled.sh/core/eventconsumer" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/patchutil" "tangled.sh/tangled.sh/core/rbac" diff --git a/appview/reporesolver/resolver.go b/appview/reporesolver/resolver.go index 8efdced..ad2fdd9 100644 --- a/appview/reporesolver/resolver.go +++ b/appview/reporesolver/resolver.go @@ -17,10 +17,10 @@ import ( "github.com/go-chi/chi/v5" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/appview/pages/repoinfo" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/spindles/spindles.go b/appview/spindles/spindles.go index bf7dfbd..bb91dad 100644 --- a/appview/spindles/spindles.go +++ b/appview/spindles/spindles.go @@ -12,11 +12,11 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/middleware" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" verify "tangled.sh/tangled.sh/core/appview/spindleverify" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/rbac" "tangled.sh/tangled.sh/core/tid" diff --git a/appview/state/state.go b/appview/state/state.go index 85aae4f..8945552 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -20,13 +20,13 @@ import ( "tangled.sh/tangled.sh/core/appview/cache/session" "tangled.sh/tangled.sh/core/appview/config" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/idresolver" "tangled.sh/tangled.sh/core/appview/notify" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" posthog_service "tangled.sh/tangled.sh/core/appview/posthog" "tangled.sh/tangled.sh/core/appview/reporesolver" "tangled.sh/tangled.sh/core/eventconsumer" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/jetstream" "tangled.sh/tangled.sh/core/knotclient" tlog "tangled.sh/tangled.sh/core/log" @@ -63,7 +63,7 @@ func Make(ctx context.Context, config *config.Config) (*State, error) { pgs := pages.NewPages(config) - res, err := idresolver.RedisResolver(config.Redis) + res, err := idresolver.RedisResolver(config.Redis.ToURL()) if err != nil { log.Printf("failed to create redis resolver: %v", err) res = idresolver.DefaultResolver() diff --git a/guard/guard.go b/guard/guard.go index bbb7edb..8bc21ff 100644 --- a/guard/guard.go +++ b/guard/guard.go @@ -13,7 +13,7 @@ import ( "github.com/bluesky-social/indigo/atproto/identity" securejoin "github.com/cyphar/filepath-securejoin" "github.com/urfave/cli/v3" - "tangled.sh/tangled.sh/core/appview/idresolver" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/log" ) diff --git a/appview/idresolver/resolver.go b/idresolver/resolver.go similarity index 94% rename from appview/idresolver/resolver.go rename to idresolver/resolver.go index f85006d..cf67df5 100644 --- a/appview/idresolver/resolver.go +++ b/idresolver/resolver.go @@ -11,7 +11,6 @@ import ( "github.com/bluesky-social/indigo/atproto/identity/redisdir" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/carlmjohnson/versioninfo" - "tangled.sh/tangled.sh/core/appview/config" ) type Resolver struct { @@ -56,8 +55,8 @@ func DefaultResolver() *Resolver { } } -func RedisResolver(config config.RedisConfig) (*Resolver, error) { - directory, err := RedisDirectory(config.ToURL()) +func RedisResolver(redisUrl string) (*Resolver, error) { + directory, err := RedisDirectory(redisUrl) if err != nil { return nil, err } diff --git a/knotserver/ingester.go b/knotserver/ingester.go index 97ba272..bc6011d 100644 --- a/knotserver/ingester.go +++ b/knotserver/ingester.go @@ -17,7 +17,7 @@ import ( "github.com/bluesky-social/jetstream/pkg/models" securejoin "github.com/cyphar/filepath-securejoin" "tangled.sh/tangled.sh/core/api/tangled" - "tangled.sh/tangled.sh/core/appview/idresolver" + "tangled.sh/tangled.sh/core/idresolver" "tangled.sh/tangled.sh/core/knotserver/db" "tangled.sh/tangled.sh/core/knotserver/git" "tangled.sh/tangled.sh/core/log" -- 2.43.0