From a8daf9c57942e586f45a1f3514eee484633871dc Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Tue, 20 May 2025 17:37:59 +0100 Subject: [PATCH] knotclient: extract knotclient into top level package --- appview/oauth/handler/handler.go | 2 +- appview/state/artifact.go | 2 +- appview/state/pull.go | 2 +- appview/state/repo.go | 2 +- appview/state/repo_util.go | 2 +- appview/state/state.go | 2 +- {appview/knotclient => knotclient}/signer.go | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename {appview/knotclient => knotclient}/signer.go (100%) diff --git a/appview/oauth/handler/handler.go b/appview/oauth/handler/handler.go index 79ac43f..992ede7 100644 --- a/appview/oauth/handler/handler.go +++ b/appview/oauth/handler/handler.go @@ -15,11 +15,11 @@ import ( "github.com/posthog/posthog-go" "tangled.sh/tangled.sh/core/appview" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "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/knotclient" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/state/artifact.go b/appview/state/artifact.go index 471a155..043fc94 100644 --- a/appview/state/artifact.go +++ b/appview/state/artifact.go @@ -16,8 +16,8 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "tangled.sh/tangled.sh/core/appview/pages" + "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/types" ) diff --git a/appview/state/pull.go b/appview/state/pull.go index 17d59e0..8081030 100644 --- a/appview/state/pull.go +++ b/appview/state/pull.go @@ -16,9 +16,9 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" + "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/patchutil" "tangled.sh/tangled.sh/core/types" diff --git a/appview/state/repo.go b/appview/state/repo.go index aa63406..9474f79 100644 --- a/appview/state/repo.go +++ b/appview/state/repo.go @@ -19,12 +19,12 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "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/pages/repoinfo" "tangled.sh/tangled.sh/core/appview/pagination" + "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/types" "github.com/bluesky-social/indigo/atproto/data" diff --git a/appview/state/repo_util.go b/appview/state/repo_util.go index aaf643e..f5302c9 100644 --- a/appview/state/repo_util.go +++ b/appview/state/repo_util.go @@ -16,9 +16,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-git/go-git/v5/plumbing/object" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages/repoinfo" + "tangled.sh/tangled.sh/core/knotclient" ) func (s *State) fullyResolvedRepo(r *http.Request) (*FullyResolvedRepo, error) { diff --git a/appview/state/state.go b/appview/state/state.go index da50f23..abbd7f8 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -21,10 +21,10 @@ import ( "tangled.sh/tangled.sh/core/api/tangled" "tangled.sh/tangled.sh/core/appview" "tangled.sh/tangled.sh/core/appview/db" - "tangled.sh/tangled.sh/core/appview/knotclient" "tangled.sh/tangled.sh/core/appview/oauth" "tangled.sh/tangled.sh/core/appview/pages" "tangled.sh/tangled.sh/core/jetstream" + "tangled.sh/tangled.sh/core/knotclient" "tangled.sh/tangled.sh/core/rbac" ) diff --git a/appview/knotclient/signer.go b/knotclient/signer.go similarity index 100% rename from appview/knotclient/signer.go rename to knotclient/signer.go -- 2.51.2