From 2dfab0430aafd5c239d92df9feba482e0e770b6a Mon Sep 17 00:00:00 2001 From: Eugene Blikh Date: Sat, 18 Jul 2026 22:01:26 +0300 Subject: [PATCH] rename module to sourcecraft.dev/bigbes/sr-ht-dolt; depend on sourcecraft sr-ht-core --- README.md | 4 ++-- authn/authn_test.go | 6 +++--- authn/backend.go | 2 +- authn/cookie.go | 4 ++-- authn/cookie_test.go | 2 +- authn/ctx.go | 4 ++-- authn/ctx_test.go | 4 ++-- authn/grpc.go | 2 +- authn/grpc_test.go | 2 +- authn/jwt.go | 2 +- authn/jwt_test.go | 2 +- authn/token.go | 4 ++-- authn/token_test.go | 4 ++-- cmd/doltsrht-migrate/main.go | 2 +- cmd/doltsrht/main.go | 16 ++++++++-------- db/access.go | 2 +- db/access_test.go | 2 +- db/db_test.go | 2 +- db/keys.go | 2 +- db/keys_test.go | 2 +- db/repos.go | 2 +- db/repos_test.go | 2 +- db/store.go | 2 +- docs/DESIGN.md | 2 +- go.mod | 6 ++---- go.sum | 6 ++---- remoteapi/credsvc.go | 6 +++--- remoteapi/integration_test.go | 12 ++++++------ remoteapi/interceptors.go | 12 ++++++------ remoteapi/interceptors_test.go | 10 +++++----- remoteapi/keystore.go | 4 ++-- remoteapi/server.go | 4 ++-- storage/dbcache.go | 2 +- web/adapters.go | 10 +++++----- web/chrome.go | 6 +++--- web/deps.go | 10 +++++----- web/handlers_browse.go | 4 ++-- web/handlers_keys.go | 2 +- web/handlers_repo.go | 8 ++++---- web/handlers_settings.go | 4 ++-- web/router.go | 2 +- web/web_test.go | 10 +++++----- 42 files changed, 96 insertions(+), 100 deletions(-) diff --git a/README.md b/README.md index 72f947e9e6a2224181d7466c1c4445ba845a0001..ba928152badcc782cc02c563891fba6a5366e14d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ git.sr.ht hosts git repos: `dolt clone`/`push`/`pull` over HTTPS plus an integrated web UI that shares the SourceHut nav, unified login, and Bootstrap theme. -Pure Go, one module (`go.bigb.es/sourcehut-dolt`), no upstream SourceHut +Pure Go, one module (`sourcecraft.dev/bigbes/sr-ht-dolt`), no upstream SourceHut modification — integration is config-driven: a `[dolt.sr.ht]` section in the shared instance `config.ini` puts the service into every other service's nav. @@ -59,7 +59,7 @@ remotesrv assembly plus CredentialsService, the read-only `browse/` UI, the ## Pinned dependencies (and why) -- **`git.sr.ht/~sircmpwn/core-go`, replaced by the instance fork +- **`sourcecraft.dev/bigbes/sr-ht-core`, replaced by the instance fork `git.srht.bigb.es/~bigbes/core-go`** (pinned via a `replace` directive to the fork's `master`, currently `c2c2f38` = upstream + instance patches). The fork is what production actually runs; token validation, config, and crypto must diff --git a/authn/authn_test.go b/authn/authn_test.go index ce6f2b450589a9f9e3576471af2fddabdd75aebe..2d7870dae00e6fb1a47db5c0023f7e473337dc66 100644 --- a/authn/authn_test.go +++ b/authn/authn_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/config" - "git.sr.ht/~sircmpwn/core-go/crypto" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/config" + "sourcecraft.dev/bigbes/sr-ht-core/crypto" "github.com/dolthub/dolt/go/libraries/doltcore/creds" "github.com/fernet/fernet-go" "github.com/vaughan0/go-ini" diff --git a/authn/backend.go b/authn/backend.go index e071c1590c96ae9ca00cefb23002624d0b7da62a..e38e20c45faab285bf8beaadc9632fafe8dcb3d2 100644 --- a/authn/backend.go +++ b/authn/backend.go @@ -5,7 +5,7 @@ import ( "errors" "strings" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" ) // ErrInvalidToken is the sentinel wrapped by every *permanent* credential diff --git a/authn/cookie.go b/authn/cookie.go index f1321c80f63c556789c2a5a9a77898b1a972d922..8084e2e75e855a511404a632991c7bc4487bde99 100644 --- a/authn/cookie.go +++ b/authn/cookie.go @@ -5,8 +5,8 @@ import ( "log" "net/http" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/crypto" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/crypto" ) // CookieName is the unified-login cookie shared across every SourceHut service. diff --git a/authn/cookie_test.go b/authn/cookie_test.go index 0d5b6622c2fdb15870682796a1326c84ea309746..04a322be3b02d571cf07e6dadea13b23339478a8 100644 --- a/authn/cookie_test.go +++ b/authn/cookie_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" ) // captureHandler records the caller present on the request context when reached. diff --git a/authn/ctx.go b/authn/ctx.go index a45b060ae3966ac52e6925189a44715a7a7638ae..f727dc19e8c10509ea01250f417a83f42ce3f3f3 100644 --- a/authn/ctx.go +++ b/authn/ctx.go @@ -22,9 +22,9 @@ package authn import ( "context" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // AuthMethodDoltKey labels an AuthContext resolved from a dolt Ed25519 keypair diff --git a/authn/ctx_test.go b/authn/ctx_test.go index 29448bc28e685f076196eb8e9d84b148a1398fa5..032bf2690518be40ed30d0d3211cd97d6932bfa1 100644 --- a/authn/ctx_test.go +++ b/authn/ctx_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) func TestCallerFromContext_Anonymous(t *testing.T) { diff --git a/authn/grpc.go b/authn/grpc.go index ba999199202a154c8ddd709e850c9fd024e314cf..ea6f24bf44bc7d3f02e420c582bbfb81d7d527d3 100644 --- a/authn/grpc.go +++ b/authn/grpc.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" ) // ResolveGRPCAuth resolves the caller from a remotesapi gRPC "authorization" diff --git a/authn/grpc_test.go b/authn/grpc_test.go index 691ec6140fcfe0f755f5f1432e693907a65d3c48..e0be976a984aa1e2e019462ced37b48ddd342ccb 100644 --- a/authn/grpc_test.go +++ b/authn/grpc_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" "github.com/dolthub/dolt/go/libraries/doltcore/creds" ) diff --git a/authn/jwt.go b/authn/jwt.go index a6a1a3270858c94615dd642e9a0d14ed17f26b6b..e02a1c4a92ca49a4ed3dac097553eebda05215fc 100644 --- a/authn/jwt.go +++ b/authn/jwt.go @@ -8,7 +8,7 @@ import ( "log" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" "github.com/dolthub/dolt/go/libraries/doltcore/creds" jose "gopkg.in/go-jose/go-jose.v2" "gopkg.in/go-jose/go-jose.v2/jwt" diff --git a/authn/jwt_test.go b/authn/jwt_test.go index 073e5e3d24e2f8460d7d43e31363cd0853e8af17..4194cec580d65bf07f28ea14d89cb7c581924b25 100644 --- a/authn/jwt_test.go +++ b/authn/jwt_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" "github.com/dolthub/dolt/go/libraries/doltcore/creds" ) diff --git a/authn/token.go b/authn/token.go index daa08ec99494a43f50c757e8aa0861c900ef2ab2..b1107ec2392c92aa725faa249311ae6bed2797dc 100644 --- a/authn/token.go +++ b/authn/token.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // RepoScope is the OAuth grant scope a meta.sr.ht personal access token must diff --git a/authn/token_test.go b/authn/token_test.go index 624ee0ddf20e140f79eb580ee2bd20052ed59993..a859739997b95debd39a477753af66af536226b7 100644 --- a/authn/token_test.go +++ b/authn/token_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) func TestResolveBasic_ValidToken(t *testing.T) { diff --git a/cmd/doltsrht-migrate/main.go b/cmd/doltsrht-migrate/main.go index 4735b5c17a1f7a6c739556f44568810dee6ff1bc..205fd574059952ce23e05e5d63657473bbf3d84f 100644 --- a/cmd/doltsrht-migrate/main.go +++ b/cmd/doltsrht-migrate/main.go @@ -27,7 +27,7 @@ import ( _ "github.com/lib/pq" // registers the "postgres" database/sql driver "github.com/vaughan0/go-ini" - "git.sr.ht/~sircmpwn/core-go/config" + "sourcecraft.dev/bigbes/sr-ht-core/config" ) // serviceName is the SourceHut service identifier and config section name. diff --git a/cmd/doltsrht/main.go b/cmd/doltsrht/main.go index 54dbfc249bbcf9ecf18515cc3115b4347d00c191..996151c27a7e8d5bd0dc31fd31fb9935da3d58ec 100644 --- a/cmd/doltsrht/main.go +++ b/cmd/doltsrht/main.go @@ -31,14 +31,14 @@ import ( "github.com/sirupsen/logrus" "github.com/vaughan0/go-ini" - "git.sr.ht/~sircmpwn/core-go/config" - "git.sr.ht/~sircmpwn/core-go/database" - "git.sr.ht/~sircmpwn/core-go/server" - - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/remoteapi" - "go.bigb.es/sourcehut-dolt/storage" - "go.bigb.es/sourcehut-dolt/web" + "sourcecraft.dev/bigbes/sr-ht-core/config" + "sourcecraft.dev/bigbes/sr-ht-core/database" + "sourcecraft.dev/bigbes/sr-ht-core/server" + + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/remoteapi" + "sourcecraft.dev/bigbes/sr-ht-dolt/storage" + "sourcecraft.dev/bigbes/sr-ht-dolt/web" ) // serviceName is the SourceHut service identifier and config section name. diff --git a/db/access.go b/db/access.go index f2f0e586745e9171566a9f3b6bd6adb68ae11528..d4fda313242d6ee849d0dfacf4fdd9a9460ab302 100644 --- a/db/access.go +++ b/db/access.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // ACLEntry is one row of the access table, joined with the grantee's username diff --git a/db/access_test.go b/db/access_test.go index 317de446d7c225f9d91e57b1cab3eb5dde2868a4..c59fad82aab927f5ca432322711fe7c2232a0c4d 100644 --- a/db/access_test.go +++ b/db/access_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) func TestEffectiveAccessAndACL(t *testing.T) { diff --git a/db/db_test.go b/db/db_test.go index ddf0daa7e0e44b957ab7de199dea44dc26f70b79..f1efb9ab5f5bb90eb4f92e617d0bdf7cf00f624f 100644 --- a/db/db_test.go +++ b/db/db_test.go @@ -13,7 +13,7 @@ import ( _ "github.com/lib/pq" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // testEnv names the DSN env var that gates the Postgres-backed tests. When diff --git a/db/keys.go b/db/keys.go index 9acdb847c074d363aa6f6f0a52d6d32c0a98b29b..375ba47c20355eb6504b9e9c5faf24018649d5c7 100644 --- a/db/keys.go +++ b/db/keys.go @@ -9,7 +9,7 @@ import ( "github.com/lib/pq" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // DoltKey is a registered Ed25519 credential (dolt creds / dolt login). PubKey diff --git a/db/keys_test.go b/db/keys_test.go index 9d0b850ed6bb1c3003d78de8930f83b66ed2eb79..6312a546638fd308c00172d1d1d47ffe5e696c19 100644 --- a/db/keys_test.go +++ b/db/keys_test.go @@ -6,7 +6,7 @@ import ( "errors" "testing" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) func TestDoltKeyLifecycle(t *testing.T) { diff --git a/db/repos.go b/db/repos.go index 2f524a61bcaf01917bc398f310f09c82520cc684..fd8b8231b1e8d7cc0469197cf13fae82159339b0 100644 --- a/db/repos.go +++ b/db/repos.go @@ -9,7 +9,7 @@ import ( "github.com/lib/pq" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // repoSelect is the common projection used by every repository read. It joins diff --git a/db/repos_test.go b/db/repos_test.go index 6a33b10db409a39029c84e1ea4e250bbf0dbca49..4499e7f7c2cae64fb6ca7deaa3438dda64d6b6d8 100644 --- a/db/repos_test.go +++ b/db/repos_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) func TestCreateAndGetRepo(t *testing.T) { diff --git a/db/store.go b/db/store.go index a1bf4f3426b76dd9a46ff2b3e26f878981f191fe..6a16f82929cbfe50bef0bc99657adaf105428284 100644 --- a/db/store.go +++ b/db/store.go @@ -26,7 +26,7 @@ import ( "database/sql" "errors" - "git.sr.ht/~sircmpwn/core-go/database" + "sourcecraft.dev/bigbes/sr-ht-core/database" ) // Querier is the common subset of *sql.DB, *sql.Tx and *sql.Conn used by this diff --git a/docs/DESIGN.md b/docs/DESIGN.md index f497583c193546ac756d37ef0b84e07fc96a253f..90df24d2bd4634edd90f667dfda7d7f4114b53e2 100644 --- a/docs/DESIGN.md +++ b/docs/DESIGN.md @@ -22,7 +22,7 @@ at `/Users/blikh/data/home/sourcehut` (core-go/, core.sr.ht/, git.sr.ht/, sr.ht- ## Architecture summary -One Go module **`go.bigb.es/sourcehut-dolt`**, two binaries: +One Go module **`sourcecraft.dev/bigbes/sr-ht-dolt`**, two binaries: - **`doltsrht`** — one process, three listeners: - web UI (chi) on `-b localhost:5307` - remotesapi (gRPC `ChunkStoreService` + HTTP chunk data plane, h2c-multiplexed diff --git a/go.mod b/go.mod index e2b7e34c7044b51c52015317997ea8d10f033465..5bdda5a4b63e32978032fc0c6cb6edfeacda45c2 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ -module go.bigb.es/sourcehut-dolt +module sourcecraft.dev/bigbes/sr-ht-dolt go 1.26.4 require ( git.sr.ht/~bitfehler/brant v0.5.1 - git.sr.ht/~sircmpwn/core-go v0.0.0-20260520082310-fdb3662452dc github.com/alexflint/go-arg v1.6.0 github.com/dolthub/dolt/go v0.40.5-0.20260626152440-45335d44ad79 github.com/fernet/fernet-go v0.0.0-20211208181803-9f70042a33ee @@ -14,6 +13,7 @@ require ( github.com/vaughan0/go-ini v0.0.0-20130923145212-a98ad7ee00ec google.golang.org/grpc v1.79.3 gopkg.in/go-jose/go-jose.v2 v2.6.3 + sourcecraft.dev/bigbes/sr-ht-core v0.0.0-20260718185800-dd418a200152 ) require ( @@ -163,5 +163,3 @@ require ( google.golang.org/protobuf v1.36.11 // indirect gopkg.in/src-d/go-errors.v1 v1.0.0 // indirect ) - -replace git.sr.ht/~sircmpwn/core-go => git.srht.bigb.es/~bigbes/core-go v0.0.0-20260718172441-c2c2f3848fa9 diff --git a/go.sum b/go.sum index 1f362b33380df36475f2f4196ce1ca11ee6b4eef..15d9a505c1d33aabde8baec5fefe6b4f940f6626 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ git.sr.ht/~bitfehler/brant v0.5.1 h1:emUbT5r1P0p2mgC/52NMAzGa2zw2To/Bim5ySeyGrks git.sr.ht/~bitfehler/brant v0.5.1/go.mod h1:XD6RmtKTOT/RL+2iQ+KBcPhLYAjeJWdLj3yfM5+7k/g= git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik= git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= -git.sr.ht/~sircmpwn/core-go v0.0.0-20260520082310-fdb3662452dc h1:txQeGOaDKWVsAbnMd8CziM9GxbFn+6ztolA+sNE22T4= -git.sr.ht/~sircmpwn/core-go v0.0.0-20260520082310-fdb3662452dc/go.mod h1:JmathMemB+hBk1IgrMn6RuBGusd+fTg1s/X6rNVKXXU= git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c h1:v2opuaN0C5ZpuCifRNR9ZQ8V9IG+Ja80otK1MFj5RnI= git.sr.ht/~sircmpwn/dowork v0.0.0-20241216125407-2b00aa42322c/go.mod h1:8neHEO3503w/rNtttnR0JFpQgM/GFhaafVwvkPsFIDw= git.sr.ht/~sircmpwn/getopt v0.0.0-20191230200459-23622cc906b3/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= @@ -34,8 +32,6 @@ git.sr.ht/~sircmpwn/getopt v1.0.0 h1:/pRHjO6/OCbBF4puqD98n6xtPEgE//oq5U8NXjP7ROc git.sr.ht/~sircmpwn/getopt v1.0.0/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9 h1:Ahny8Ud1LjVMMAlt8utUFKhhxJtwBAualvsbc/Sk7cE= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= -git.srht.bigb.es/~bigbes/core-go v0.0.0-20260718172441-c2c2f3848fa9 h1:S/CncMS83NIBz+V5OlZEHlnrl1Yd5I4C7hDQ7lzQsTM= -git.srht.bigb.es/~bigbes/core-go v0.0.0-20260718172441-c2c2f3848fa9/go.mod h1:JmathMemB+hBk1IgrMn6RuBGusd+fTg1s/X6rNVKXXU= github.com/99designs/gqlgen v0.17.36 h1:u/o/rv2SZ9s5280dyUOOrkpIIkr/7kITMXYD3rkJ9go= github.com/99designs/gqlgen v0.17.36/go.mod h1:6RdyY8puhCoWAQVr2qzF2OMVfudQzc8ACxzpzluoQm4= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28= @@ -669,3 +665,5 @@ modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw modernc.org/sqlite v1.38.2 h1:Aclu7+tgjgcQVShZqim41Bbw9Cho0y/7WzYptXqkEek= modernc.org/sqlite v1.38.2/go.mod h1:cPTJYSlgg3Sfg046yBShXENNtPrWrDX8bsbAQBzgQ5E= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +sourcecraft.dev/bigbes/sr-ht-core v0.0.0-20260718185800-dd418a200152 h1:9kQC+tDO2CO8avlKadb9Z0if4a6vJuEK80+4zcb6/fU= +sourcecraft.dev/bigbes/sr-ht-core v0.0.0-20260718185800-dd418a200152/go.mod h1:Mu1Vx39ws/OTKWGoVERXvkdRSPLBdhuFTYv0ftVV31c= diff --git a/remoteapi/credsvc.go b/remoteapi/credsvc.go index d244ef526773747fbe97657f69eadbc1a825d6b3..61ff4ebda0d743e3a094c6160dc541d74d7ccf22 100644 --- a/remoteapi/credsvc.go +++ b/remoteapi/credsvc.go @@ -8,8 +8,8 @@ import ( "net" "strings" - "git.sr.ht/~sircmpwn/core-go/config" - "git.sr.ht/~sircmpwn/core-go/database" + "sourcecraft.dev/bigbes/sr-ht-core/config" + "sourcecraft.dev/bigbes/sr-ht-core/database" remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" "github.com/sirupsen/logrus" "github.com/vaughan0/go-ini" @@ -18,7 +18,7 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.bigb.es/sourcehut-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" ) // credService implements remotesapi.CredentialsServiceServer.WhoAmI. `dolt diff --git a/remoteapi/integration_test.go b/remoteapi/integration_test.go index f7504f078fbf3ba809b85a9a58ce1f2f2c28652e..22eba90334673926a2b2dccbcc905e0a3be5b933 100644 --- a/remoteapi/integration_test.go +++ b/remoteapi/integration_test.go @@ -37,8 +37,8 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/crypto" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/crypto" remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" "github.com/dolthub/dolt/go/libraries/doltcore/creds" "github.com/fernet/fernet-go" @@ -51,10 +51,10 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" - "go.bigb.es/sourcehut-dolt/storage" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/storage" ) const doltBin = "/opt/homebrew/bin/dolt" diff --git a/remoteapi/interceptors.go b/remoteapi/interceptors.go index 3e255d2fa64868e73ef65e33d24f365c56920449..d3405ed102d657bf0d9a51929fdca2e73dbf8ef1 100644 --- a/remoteapi/interceptors.go +++ b/remoteapi/interceptors.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/config" - "git.sr.ht/~sircmpwn/core-go/database" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/config" + "sourcecraft.dev/bigbes/sr-ht-core/database" remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" "github.com/sirupsen/logrus" "github.com/vaughan0/go-ini" @@ -17,9 +17,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // Method-classification sets, copied verbatim from upstream remotesrv's diff --git a/remoteapi/interceptors_test.go b/remoteapi/interceptors_test.go index 5e662cec51ec02de1b2e9c345920c7f18aba3ec5..5fc4d8e38457c9d854c97428da7e27e4f4d44299 100644 --- a/remoteapi/interceptors_test.go +++ b/remoteapi/interceptors_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/config" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/config" remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" "github.com/sirupsen/logrus" "github.com/vaughan0/go-ini" @@ -13,9 +13,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) const ( diff --git a/remoteapi/keystore.go b/remoteapi/keystore.go index cbd8c83c52a81b71bcd18aa01b760cca5a44e31b..a58c18633bae23bbc423848af339305d72a4cd43 100644 --- a/remoteapi/keystore.go +++ b/remoteapi/keystore.go @@ -16,8 +16,8 @@ import ( "context" "database/sql" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // keyStore adapts the SQL persistence layer (db.Store over the shared *sql.DB diff --git a/remoteapi/server.go b/remoteapi/server.go index 5f16303d6798cce02e82c6542b016f366f1ee65c..cb8c12a370d252022801994fb85835b4dabd08ed 100644 --- a/remoteapi/server.go +++ b/remoteapi/server.go @@ -12,8 +12,8 @@ import ( "github.com/sirupsen/logrus" "github.com/vaughan0/go-ini" - "go.bigb.es/sourcehut-dolt/db" - "go.bigb.es/sourcehut-dolt/storage" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/storage" ) // serviceName is the SourceHut service identifier for dolt.sr.ht. It selects diff --git a/storage/dbcache.go b/storage/dbcache.go index 61e4340397359235a85e0e8ebae90d20c9871422..cda903be8d634feff6e3f0c7f76d0dc7b43f2fad 100644 --- a/storage/dbcache.go +++ b/storage/dbcache.go @@ -8,7 +8,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/remotesrv" "github.com/dolthub/dolt/go/store/nbs" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // defaultMemTableSize mirrors upstream utils/remotesrv LocalCSCache: the diff --git a/web/adapters.go b/web/adapters.go index 484c08f7823146ae34777d870bc8fceb9f81d2e4..a55a3df6b6c6cf0b5a5289a1f0cfe1635514b4c9 100644 --- a/web/adapters.go +++ b/web/adapters.go @@ -3,12 +3,12 @@ package web import ( "context" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/browse" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/browse" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // This file holds the production adapters that satisfy the small interfaces in diff --git a/web/chrome.go b/web/chrome.go index 67c07a2f341bb7db0ca8bef9c12616569fa75ccf..81ab25910105ed92d3ce47e0aefb841573d6bfee 100644 --- a/web/chrome.go +++ b/web/chrome.go @@ -6,11 +6,11 @@ import ( "sort" "strings" - "git.sr.ht/~sircmpwn/core-go/auth" - "git.sr.ht/~sircmpwn/core-go/config" + "sourcecraft.dev/bigbes/sr-ht-core/auth" + "sourcecraft.dev/bigbes/sr-ht-core/config" "github.com/vaughan0/go-ini" - "go.bigb.es/sourcehut-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" ) // serviceName is our own service key in the shared config and nav. diff --git a/web/deps.go b/web/deps.go index 6d7f257a496fb7dcd095806e8869e7a6cf03022f..df4c8becd3acd0b49d3ea6d2528104bbe7bbab39 100644 --- a/web/deps.go +++ b/web/deps.go @@ -20,12 +20,12 @@ import ( "github.com/vaughan0/go-ini" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/browse" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/browse" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // Config carries everything the router and handlers need. The Phase-3 main diff --git a/web/handlers_browse.go b/web/handlers_browse.go index d87196d083260b388d6d3923ecb5ca777be6621f..067bbe86d1d2c2bf037b06628bded032ab4bb8ab 100644 --- a/web/handlers_browse.go +++ b/web/handlers_browse.go @@ -7,8 +7,8 @@ import ( "github.com/go-chi/chi/v5" - "go.bigb.es/sourcehut-dolt/browse" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/browse" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) const ( diff --git a/web/handlers_keys.go b/web/handlers_keys.go index 7b1e13d79b417ceb326a196fb7cdd4f43654fea8..830d4b08f6096ab25c9e36f03686155258f29a61 100644 --- a/web/handlers_keys.go +++ b/web/handlers_keys.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // keysView is the dolt-key management page model. diff --git a/web/handlers_repo.go b/web/handlers_repo.go index d90f9bbf3b16b41b69062745ec65429ebe4e2b67..201853870d3d077f8ac5eed1ed817f7f947b1a38 100644 --- a/web/handlers_repo.go +++ b/web/handlers_repo.go @@ -5,12 +5,12 @@ import ( "net/http" "strings" - "git.sr.ht/~sircmpwn/core-go/config" + "sourcecraft.dev/bigbes/sr-ht-core/config" "github.com/go-chi/chi/v5" - "go.bigb.es/sourcehut-dolt/browse" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/browse" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // overviewCommitLimit is how many recent commits the database overview shows. diff --git a/web/handlers_settings.go b/web/handlers_settings.go index bf814e1a8a8fb9fa4368913acf3d29eb3585aeb7..3842b80eb5b4eeb05235f6136689f7debf8dfab8 100644 --- a/web/handlers_settings.go +++ b/web/handlers_settings.go @@ -8,8 +8,8 @@ import ( "github.com/go-chi/chi/v5" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) // loadRepoForAdmin loads the {user}/{db} repo and enforces the owner-only admin diff --git a/web/router.go b/web/router.go index 51b9bc53b4495d81704b7edf8fdac37a2ca92850..fd23ed006837e418e30546dfeb106c1569a76613 100644 --- a/web/router.go +++ b/web/router.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - "go.bigb.es/sourcehut-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" ) // app bundles the parsed templates, the discovered stylesheet href and the diff --git a/web/web_test.go b/web/web_test.go index 9e98357d1ed76e9b9f21cecbb18bb2a5f4aea424..bc4e1d0376945737740dc8435ba6642d8b67ac0c 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -12,15 +12,15 @@ import ( "testing" "time" - "git.sr.ht/~sircmpwn/core-go/auth" + "sourcecraft.dev/bigbes/sr-ht-core/auth" "github.com/dolthub/dolt/go/libraries/doltcore/creds" "github.com/go-chi/chi/v5" "github.com/vaughan0/go-ini" - "go.bigb.es/sourcehut-dolt/authn" - "go.bigb.es/sourcehut-dolt/browse" - "go.bigb.es/sourcehut-dolt/core" - "go.bigb.es/sourcehut-dolt/db" + "sourcecraft.dev/bigbes/sr-ht-dolt/authn" + "sourcecraft.dev/bigbes/sr-ht-dolt/browse" + "sourcecraft.dev/bigbes/sr-ht-dolt/core" + "sourcecraft.dev/bigbes/sr-ht-dolt/db" ) const selfOrigin = "https://dolt.example"