Monorepo for Tangled tangled.org

knotserver: add repo DID migration on startup #1144

open opened by oyster.cafe targeting master from oyster.cafe/tangled-core: master
Labels

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:3fwecdnvtcscjnrx2p4n7alz/sh.tangled.repo.pull/3mgprvt2exw22
+4 -2
Interdiff #9 #10
appview/db/db.go

This file has not been changed.

+3 -1
appview/state/router.go
··· 1 1 package state 2 2 3 3 import ( 4 + "context" 4 5 "database/sql" 5 6 "errors" 6 7 "net/http" ··· 61 62 r2 := r.Clone(r.Context()) 62 63 r2.URL.Path = rewritten 63 64 r2.URL.RawPath = rewritten 65 + ctx := context.WithValue(r2.Context(), "repoDidCanonical", true) 66 + userRouter.ServeHTTP(w, r2.WithContext(ctx)) 64 - userRouter.ServeHTTP(w, r2) 65 67 case errors.Is(err, sql.ErrNoRows): 66 68 userRouter.ServeHTTP(w, r) 67 69 default:
eventconsumer/consumer.go

This file has not been changed.

knotserver/db/db.go

This patch was likely rebased, as context lines do not match.

knotserver/events.go

This file has not been changed.

+1 -1
knotserver/migrate.go
··· 170 170 return "", fmt.Errorf("PLC submission: %w", err) 171 171 } 172 172 173 - if err := d.StoreRepoKey(prepared.RepoDid, prepared.SigningKeyRaw, repo.ownerDid, repo.repoName); err != nil { 173 + if err := d.StoreRepoKey(prepared.RepoDid, prepared.SigningKeyRaw, repo.ownerDid, repo.repoName, ""); err != nil { 174 174 return "", fmt.Errorf("storing repo key: %w", err) 175 175 } 176 176
knotserver/server.go

This file has not been changed.

spindle/db/db.go

This file has not been changed.

spindle/stream.go

This file has not been changed.

History

12 rounds 1 comment
sign up or login to add to the discussion
1 commit
expand
knotserver: add repo DID migration on startup
merge conflicts detected
expand
  • go.mod:34
  • go.sum:339
expand 0 comments
oyster.cafe submitted #10
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 1 comment
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
2/3 failed, 1/3 success
expand
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments
1 commit
expand
knotserver: add repo DID migration on startup
expand 0 comments