diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 00000000..1a191c43 --- /dev/null +++ b/_typos.toml @@ -0,0 +1,23 @@ +[files] +# Don't check these files +extend-exclude = [ + ".git/", + "*.lock", + "go.mod", + "go.sum", +] + +[default.extend-words] +# False positives - words that typos incorrectly flags +# Go variable name commonly used for NiceDiff +"nd" = "nd" +# Acronym for "Does Not Exist" used in label operations +"DNE" = "DNE" +# CSS class for syntax highlighting (other) +"ot" = "ot" +# Brand name HashiCorp +"Hashi" = "Hashi" +# External API from goldmark-callout package (unfixable upstream typo) +"Extention" = "Extention" +# External API from goldmark package (unfixable upstream typo) +"Precending" = "Precending" diff --git a/appview/db/issues.go b/appview/db/issues.go index 8016a2a1..244b9f5d 100644 --- a/appview/db/issues.go +++ b/appview/db/issues.go @@ -252,11 +252,11 @@ func GetIssuesPaginated(e Execer, page pagination.Page, filters ...orm.Filter) ( } // collect references for each issue - allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", issueAts)) + allReferences, err := GetReferencesAll(e, orm.FilterIn("from_at", issueAts)) if err != nil { return nil, fmt.Errorf("failed to query reference_links: %w", err) } - for issueAt, references := range allReferencs { + for issueAt, references := range allReferences { if issue, ok := issueMap[issueAt.String()]; ok { issue.References = references } @@ -452,11 +452,11 @@ func GetIssueComments(e Execer, filters ...orm.Filter) ([]models.IssueComment, e // collect references for each comments commentAts := slices.Collect(maps.Keys(commentMap)) - allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) + allReferences, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) if err != nil { return nil, fmt.Errorf("failed to query reference_links: %w", err) } - for commentAt, references := range allReferencs { + for commentAt, references := range allReferences { if comment, ok := commentMap[commentAt.String()]; ok { comment.References = references } diff --git a/appview/db/notifications.go b/appview/db/notifications.go index a244fb84..c8fcafbc 100644 --- a/appview/db/notifications.go +++ b/appview/db/notifications.go @@ -191,7 +191,7 @@ func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...orm return nil, fmt.Errorf("failed to parse created timestamp: %w", err) } - nwe := &models.NotificationWithEntity{Notification: &n} + entry := &models.NotificationWithEntity{Notification: &n} // populate repo if present if rId.Valid { @@ -211,7 +211,7 @@ func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...orm if rTopicStr.Valid { repo.Topics = strings.Fields(rTopicStr.String) } - nwe.Repo = &repo + entry.Repo = &repo } // populate issue if present @@ -229,7 +229,7 @@ func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...orm if iOpen.Valid { issue.Open = iOpen.Bool } - nwe.Issue = &issue + entry.Issue = &issue } // populate pull if present @@ -247,10 +247,10 @@ func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...orm if pState.Valid { pull.State = models.PullState(pState.Int64) } - nwe.Pull = &pull + entry.Pull = &pull } - notifications = append(notifications, nwe) + notifications = append(notifications, entry) } return notifications, nil diff --git a/appview/db/pulls.go b/appview/db/pulls.go index e5256923..a8da391b 100644 --- a/appview/db/pulls.go +++ b/appview/db/pulls.go @@ -487,11 +487,11 @@ func GetPullComments(e Execer, filters ...orm.Filter) ([]models.PullComment, err // collect references for each comments commentAts := slices.Collect(maps.Keys(commentMap)) - allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) + allReferences, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) if err != nil { return nil, fmt.Errorf("failed to query reference_links: %w", err) } - for commentAt, references := range allReferencs { + for commentAt, references := range allReferences { if comment, ok := commentMap[commentAt.String()]; ok { comment.References = references } diff --git a/appview/indexer/issues/indexer.go b/appview/indexer/issues/indexer.go index d5a13425..0da7d3cf 100644 --- a/appview/indexer/issues/indexer.go +++ b/appview/indexer/issues/indexer.go @@ -48,7 +48,7 @@ func NewIndexer(indexDir string) *Indexer { // Init initializes the indexer func (ix *Indexer) Init(ctx context.Context, e db.Execer) { l := tlog.FromContext(ctx) - existed, err := ix.intialize(ctx) + existed, err := ix.initialize(ctx) if err != nil { log.Fatalln("failed to initialize issue indexer", err) } @@ -117,7 +117,7 @@ func generateIssueIndexMapping() (mapping.IndexMapping, error) { return mapping, nil } -func (ix *Indexer) intialize(ctx context.Context) (bool, error) { +func (ix *Indexer) initialize(ctx context.Context) (bool, error) { if ix.indexer != nil { return false, errors.New("indexer is already initialized") } diff --git a/appview/indexer/pulls/indexer.go b/appview/indexer/pulls/indexer.go index ed225f7a..beb79e47 100644 --- a/appview/indexer/pulls/indexer.go +++ b/appview/indexer/pulls/indexer.go @@ -47,7 +47,7 @@ func NewIndexer(indexDir string) *Indexer { // Init initializes the indexer func (ix *Indexer) Init(ctx context.Context, e db.Execer) { l := tlog.FromContext(ctx) - existed, err := ix.intialize(ctx) + existed, err := ix.initialize(ctx) if err != nil { log.Fatalln("failed to initialize pull indexer", err) } @@ -112,7 +112,7 @@ func generatePullIndexMapping() (mapping.IndexMapping, error) { return mapping, nil } -func (ix *Indexer) intialize(ctx context.Context) (bool, error) { +func (ix *Indexer) initialize(ctx context.Context) (bool, error) { if ix.indexer != nil { return false, errors.New("indexer is already initialized") } diff --git a/appview/indexer/repos/indexer.go b/appview/indexer/repos/indexer.go index d2aef059..b34fade4 100644 --- a/appview/indexer/repos/indexer.go +++ b/appview/indexer/repos/indexer.go @@ -51,7 +51,7 @@ func NewIndexer(indexDir string) *Indexer { // Init initializes the indexer func (ix *Indexer) Init(ctx context.Context, e db.Execer) { l := tlog.FromContext(ctx) - existed, err := ix.intialize(ctx) + existed, err := ix.initialize(ctx) if err != nil { log.Fatalln("failed to initialize repo indexer", err) } @@ -188,7 +188,7 @@ func generateRepoIndexMapping() (mapping.IndexMapping, error) { return mapping, nil } -func (ix *Indexer) intialize(ctx context.Context) (bool, error) { +func (ix *Indexer) initialize(ctx context.Context) (bool, error) { if ix.indexer != nil { return false, errors.New("indexer is already initialized") } diff --git a/appview/ingester.go b/appview/ingester.go index e8d85ae4..eee1c438 100644 --- a/appview/ingester.go +++ b/appview/ingester.go @@ -818,7 +818,7 @@ func (i *Ingester) ingestKnot(e *jmodels.Event) error { return fmt.Errorf("failed to get registration: %w", err) } if len(registrations) != 1 { - return fmt.Errorf("got incorret number of registrations: %d, expected 1", len(registrations)) + return fmt.Errorf("got incorrect number of registrations: %d, expected 1", len(registrations)) } registration := registrations[0] @@ -1100,7 +1100,7 @@ func (i *Ingester) ingestLabelOp(e *jmodels.Event) error { } repo = i[0].Repo default: - return fmt.Errorf("unsupport label subject: %s", collection) + return fmt.Errorf("unsupported label subject: %s", collection) } actx, err := db.NewLabelApplicationCtx(ddb, orm.FilterIn("at_uri", repo.Labels)) diff --git a/appview/issues/issues.go b/appview/issues/issues.go index 7b98dd9c..34bdcb0d 100644 --- a/appview/issues/issues.go +++ b/appview/issues/issues.go @@ -602,7 +602,7 @@ func (rp *Issues) EditIssueComment(w http.ResponseWriter, r *http.Request) { _, err = db.AddIssueComment(tx, newComment) if err != nil { - l.Error("failed to perferom update-description query", "err", err) + l.Error("failed to perform update-description query", "err", err) rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") return } diff --git a/appview/knots/knots.go b/appview/knots/knots.go index dab18290..4f266ca2 100644 --- a/appview/knots/knots.go +++ b/appview/knots/knots.go @@ -97,7 +97,7 @@ func (k *Knots) dashboard(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) return } registration := registrations[0] @@ -285,7 +285,7 @@ func (k *Knots) delete(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) fail() return } @@ -394,7 +394,7 @@ func (k *Knots) retry(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) fail() return } @@ -485,7 +485,7 @@ func (k *Knots) retry(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) fail() return } @@ -521,7 +521,7 @@ func (k *Knots) addMember(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) return } registration := registrations[0] @@ -629,7 +629,7 @@ func (k *Knots) removeMember(w http.ResponseWriter, r *http.Request) { return } if len(registrations) != 1 { - l.Error("got incorret number of registrations", "got", len(registrations), "expected", 1) + l.Error("got incorrect number of registrations", "got", len(registrations), "expected", 1) return } diff --git a/appview/middleware/middleware.go b/appview/middleware/middleware.go index f76f50b8..74906314 100644 --- a/appview/middleware/middleware.go +++ b/appview/middleware/middleware.go @@ -124,7 +124,7 @@ func (mw Middleware) knotRoleMiddleware(group string) middlewareFunc { if actor == nil { // we need a logged in user l.Warn("not logged in, redirecting") - http.Error(w, "Forbiden", http.StatusUnauthorized) + http.Error(w, "Forbidden", http.StatusUnauthorized) return } domain := chi.URLParam(r, "domain") @@ -136,7 +136,7 @@ func (mw Middleware) knotRoleMiddleware(group string) middlewareFunc { ok, err := mw.enforcer.E.HasGroupingPolicy(actor.Active.Did, group, domain) if err != nil || !ok { l.Warn("permission denied", "did", actor.Active.Did, "group", group, "domain", domain) - http.Error(w, "Forbiden", http.StatusUnauthorized) + http.Error(w, "Forbidden", http.StatusUnauthorized) return } @@ -158,7 +158,7 @@ func (mw Middleware) RepoPermissionMiddleware(requiredPerm string) middlewareFun if actor == nil { // we need a logged in user l.Warn("not logged in, redirecting") - http.Error(w, "Forbiden", http.StatusUnauthorized) + http.Error(w, "Forbidden", http.StatusUnauthorized) return } f, err := mw.repoResolver.Resolve(r) @@ -170,7 +170,7 @@ func (mw Middleware) RepoPermissionMiddleware(requiredPerm string) middlewareFun ok, err := mw.enforcer.E.Enforce(actor.Active.Did, f.Knot, f.RepoIdentifier(), requiredPerm) if err != nil || !ok { l.Warn("permission denied", "did", actor.Active.Did, "perm", requiredPerm, "repo", f.RepoIdentifier()) - http.Error(w, "Forbiden", http.StatusUnauthorized) + http.Error(w, "Forbidden", http.StatusUnauthorized) return } @@ -332,7 +332,7 @@ func (mw Middleware) ResolveIssue(next http.Handler) http.Handler { // a 404 like tangled.sh/oppi.li/go-git/v5 // // we're keeping the tangled.sh go-import tag too to maintain backward -// compatiblity for modules that still point there. they will be redirected +// compatibility for modules that still point there. they will be redirected // to fetch source from tangled.org func (mw Middleware) GoImport() middlewareFunc { return func(next http.Handler) http.Handler { diff --git a/appview/models/notifications.go b/appview/models/notifications.go index e35281b2..57b2e747 100644 --- a/appview/models/notifications.go +++ b/appview/models/notifications.go @@ -104,7 +104,7 @@ func (prefs *NotificationPreferences) ShouldNotify(t NotificationType) bool { case NotificationTypeIssueClosed: return prefs.IssueClosed case NotificationTypeIssueReopen: - return prefs.IssueCreated // smae pref for now + return prefs.IssueCreated // same pref for now case NotificationTypePullCreated: return prefs.PullCreated case NotificationTypePullCommented: diff --git a/appview/pages/markup/reference_link.go b/appview/pages/markup/reference_link.go index 97788196..1eba8507 100644 --- a/appview/pages/markup/reference_link.go +++ b/appview/pages/markup/reference_link.go @@ -16,7 +16,7 @@ import ( // FindReferences collects all links referencing tangled-related objects // like issues, PRs, comments or even @-mentions -// This funciton doesn't actually check for the existence of records in the DB +// This function doesn't actually check for the existence of records in the DB // or the PDS; it merely returns a list of what are presumed to be references. func FindReferences(host string, source string) ([]string, []models.ReferenceLink) { var ( diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 3d251e42..6cd98733 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -52,7 +52,7 @@ type Pages struct { } func NewPages(config *config.Config, res *idresolver.Resolver, database *db.DB, logger *slog.Logger) *Pages { - // initialized with safe defaults, can be overriden per use + // initialized with safe defaults, can be overridden per use rctx := &markup.RenderContext{ IsDev: config.Core.Dev, Hostname: config.Core.AppviewHost, diff --git a/appview/pages/templates/repo/pipelines/workflow.html b/appview/pages/templates/repo/pipelines/workflow.html index a90f9c4f..9600818f 100644 --- a/appview/pages/templates/repo/pipelines/workflow.html +++ b/appview/pages/templates/repo/pipelines/workflow.html @@ -12,7 +12,7 @@ {{ block "sidebar" . }} {{ end }}
- + {{ if $.RepoInfo.Roles.IsOwner }}
diff --git a/appview/pages/templates/repo/settings/general.html b/appview/pages/templates/repo/settings/general.html index 92287714..76e3f8a1 100644 --- a/appview/pages/templates/repo/settings/general.html +++ b/appview/pages/templates/repo/settings/general.html @@ -103,7 +103,7 @@

- {{ $title := "Unubscribe from all labels" }} + {{ $title := "Unsubscribe from all labels" }} {{ $icon := "x" }} {{ $text := "unsubscribe all" }} {{ $action := "unsubscribe" }} diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index 83cab478..f2fc451c 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -1469,7 +1469,7 @@ func (s *Pulls) ValidatePatch(w http.ResponseWriter, r *http.Request) { } if err := s.validator.ValidatePatch(&patch); err != nil { - s.logger.Error("faield to validate patch", "err", err) + s.logger.Error("failed to validate patch", "err", err) s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.") return } @@ -1983,7 +1983,7 @@ func (s *Pulls) resubmitStackedPullHelper( deletions := make(map[string]*models.Pull) updated := make(map[string]struct{}) - // pulls in orignal stack but not in new one + // pulls in original stack but not in new one for _, op := range origStack { if _, ok := newById[op.ChangeId]; !ok { deletions[op.ChangeId] = op diff --git a/appview/repo/repo.go b/appview/repo/repo.go index 345f1dc8..606898ea 100644 --- a/appview/repo/repo.go +++ b/appview/repo/repo.go @@ -1073,7 +1073,7 @@ func (rp *Repo) ForkRepo(w http.ResponseWriter, r *http.Request) { rkey := tid.TID() - // TODO: this could coordinate better with the knot to recieve a clone status + // TODO: this could coordinate better with the knot to receive a clone status client, err := rp.oauth.ServiceClient( r, oauth.WithService(targetKnot), diff --git a/appview/repo/settings.go b/appview/repo/settings.go index 6215d991..0d8179b5 100644 --- a/appview/repo/settings.go +++ b/appview/repo/settings.go @@ -631,7 +631,7 @@ func (rp *Repo) EditBaseSettings(w http.ResponseWriter, r *http.Request) { }) if err != nil { - l.Error("failed to perferom update-repo query", "err", err) + l.Error("failed to perform update-repo query", "err", err) // failed to get record rp.pages.Notice(w, noticeId, "Failed to save repository information, unable to save to PDS.") return diff --git a/blog/posts/6-months.md b/blog/posts/6-months.md index a4276be2..10ee6bb3 100644 --- a/blog/posts/6-months.md +++ b/blog/posts/6-months.md @@ -86,7 +86,7 @@ easier to follow! ## hosted PDS -A complaint we often recieved was the need for a Bluesky account to use +A complaint we often received was the need for a Bluesky account to use Tangled; and besides, we realised that the overlap between Bluesky users and possible Tangled users only goes so far -- we aim to be a generic code forge after all, AT just happens to be an implementation diff --git a/blog/posts/intro.md b/blog/posts/intro.md index 9ac5ebfd..7d4a8b71 100644 --- a/blog/posts/intro.md +++ b/blog/posts/intro.md @@ -51,7 +51,7 @@ should feel natural and stay out of the way. Tangled's architecture enables common workflows to work as you'd expect, all while remaining decentralized. -We believe that atproto has greatly simplfied one of the hardest parts +We believe that atproto has greatly simplified one of the hardest parts of social media: having your friends on it. Today, we're rolling out invite-only access to Tangled -- join us on IRC at `#tangled` on [libera.chat](https://libera.chat) and we'll get you set up. diff --git a/blog/posts/seed.md b/blog/posts/seed.md index 94dc056e..f038be90 100644 --- a/blog/posts/seed.md +++ b/blog/posts/seed.md @@ -36,7 +36,7 @@ generation of open source. Whatever that looks like: hundreds of devs building artisanal libraries, or one dev and a hundred agents building a micro-SaaS. -And finding the right investors to help us acheive this vision wasn't +And finding the right investors to help us achieve this vision wasn't something we took lightly. We spent months getting to know potential partners -- among which, byFounders stood out immediately. Like us, they're community-driven at their core, and their commitment to diff --git a/docs/DOCS.md b/docs/DOCS.md index b07bab78..ac71a138 100644 --- a/docs/DOCS.md +++ b/docs/DOCS.md @@ -1657,7 +1657,7 @@ you are using Apple Silicon). > > to store the builder VM in a temporary dir. > -> You should read and follow [all the other intructions][darwin builder vm] to +> You should read and follow [all the other instructions][darwin builder vm] to > avoid subtle problems. Alternatively, you can use any other method to set up a diff --git a/flake.nix b/flake.nix index 9e66decc..69501f4b 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ flake = false; }; htmx-ws-src = { - # strange errors in consle that i can't really make out + # strange errors in console that i can't really make out # url = "https://unpkg.com/htmx.org@2.0.4/dist/ext/ws.js"; url = "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"; flake = false; diff --git a/knotmirror/tapclient.go b/knotmirror/tapclient.go index 14ba6d20..bd424640 100644 --- a/knotmirror/tapclient.go +++ b/knotmirror/tapclient.go @@ -119,7 +119,7 @@ func (t *Tap) processRepo(ctx context.Context, evt *tapc.RecordEventData) error if evt.Action == tapc.RecordUpdateAction { exist, err := t.gitm.Exist(repo) if err != nil { - return fmt.Errorf("checking git repo existance: %w", err) + return fmt.Errorf("checking git repo existence: %w", err) } if exist { // update git repo remote url diff --git a/knotserver/git/merge.go b/knotserver/git/merge.go index c2999c57..cd882026 100644 --- a/knotserver/git/merge.go +++ b/knotserver/git/merge.go @@ -233,7 +233,7 @@ func (g *GitRepo) applyMailbox(patchData string) error { func (g *GitRepo) applySingleMailbox(singlePatch types.FormatPatch) (plumbing.Hash, error) { tmpPatch, err := createTemp(singlePatch.Raw) if err != nil { - return plumbing.ZeroHash, fmt.Errorf("failed to create temporary patch file for singluar mailbox patch: %w", err) + return plumbing.ZeroHash, fmt.Errorf("failed to create temporary patch file for singular mailbox patch: %w", err) } var stderr bytes.Buffer diff --git a/knotserver/xrpc/delete_branch.go b/knotserver/xrpc/delete_branch.go index fc09a5a3..36c9c3ce 100644 --- a/knotserver/xrpc/delete_branch.go +++ b/knotserver/xrpc/delete_branch.go @@ -68,7 +68,7 @@ func (x *Xrpc) DeleteBranch(w http.ResponseWriter, r *http.Request) { } if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, repoDid); !ok || err != nil { - l.Error("insufficent permissions", "did", actorDid.String(), "repo", repoDid) + l.Error("insufficient permissions", "did", actorDid.String(), "repo", repoDid) writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) return } diff --git a/knotserver/xrpc/set_default_branch.go b/knotserver/xrpc/set_default_branch.go index 10c50166..ebca66c0 100644 --- a/knotserver/xrpc/set_default_branch.go +++ b/knotserver/xrpc/set_default_branch.go @@ -70,7 +70,7 @@ func (x *Xrpc) SetDefaultBranch(w http.ResponseWriter, r *http.Request) { } if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, repoDid); !ok || err != nil { - l.Error("insufficent permissions", "did", actorDid.String()) + l.Error("insufficient permissions", "did", actorDid.String()) writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) return } diff --git a/nix/pkgs/appview-static-files.nix b/nix/pkgs/appview-static-files.nix index 6aba1e37..0d127241 100644 --- a/nix/pkgs/appview-static-files.nix +++ b/nix/pkgs/appview-static-files.nix @@ -12,7 +12,7 @@ src, }: runCommandLocal "appview-static-files" { - # TOOD(winter): figure out why this is even required after + # TODO(winter): figure out why this is even required after # changing the libraries that the tailwindcss binary loads sandboxProfile = '' (allow file-read* (subpath "/System/Library/OpenSSL")) diff --git a/patchutil/interdiff.go b/patchutil/interdiff.go index fa89720e..9239a60f 100644 --- a/patchutil/interdiff.go +++ b/patchutil/interdiff.go @@ -288,7 +288,7 @@ func Interdiff(patch1, patch2 []*gitdiff.File) *InterdiffResult { // we have f1 and f2, calculate interdiff interdiffFile = interdiffFiles(f1, f2) } else { - // only in patch 1, this change would have to be "inverted" to dissapear + // only in patch 1, this change would have to be "inverted" to disappear // from patch 2, so we reverseDiff(f1) reverseDiff(f1) diff --git a/patchutil/patchutil.go b/patchutil/patchutil.go index 90c81ad7..40f653b4 100644 --- a/patchutil/patchutil.go +++ b/patchutil/patchutil.go @@ -153,7 +153,7 @@ func reverseDiff(file *gitdiff.File) { file.BinaryFragment, file.ReverseBinaryFragment = file.ReverseBinaryFragment, file.BinaryFragment for _, fragment := range file.TextFragments { - // swap postions + // swap positions fragment.OldPosition, fragment.NewPosition = fragment.NewPosition, fragment.OldPosition fragment.OldLines, fragment.NewLines = fragment.NewLines, fragment.OldLines fragment.LinesAdded, fragment.LinesDeleted = fragment.LinesDeleted, fragment.LinesAdded diff --git a/sets/set_test.go b/sets/set_test.go index a4a4b35c..64ee4551 100644 --- a/sets/set_test.go +++ b/sets/set_test.go @@ -240,7 +240,7 @@ func TestCollect(t *testing.T) { } } -func TestPropertySingleonLen(t *testing.T) { +func TestPropertySingletonLen(t *testing.T) { f := func(item int) bool { single := Singleton(item) return single.Len() == 1 diff --git a/spindle/engine/engine.go b/spindle/engine/engine.go index 9b83558b..5a5d7fcc 100644 --- a/spindle/engine/engine.go +++ b/spindle/engine/engine.go @@ -85,7 +85,7 @@ func StartWorkflows(l *slog.Logger, vault secrets.Manager, cfg *config.Config, d if err != nil { // TODO(winter): Should this always set StatusFailed? // In the original, we only do in a subset of cases. - l.Error("setting up worklow", "wid", wid, "err", err) + l.Error("setting up workflow", "wid", wid, "err", err) destroyErr := eng.DestroyWorkflow(ctx, wid) if destroyErr != nil { diff --git a/spindle/engines/nixery/engine.go b/spindle/engines/nixery/engine.go index cb46edc9..f2eb67da 100644 --- a/spindle/engines/nixery/engine.go +++ b/spindle/engines/nixery/engine.go @@ -245,7 +245,7 @@ func (e *Engine) SetupWorkflow(ctx context.Context, wid models.WorkflowId, wf *m Target: "/tmp", ReadOnly: false, TmpfsOptions: &mount.TmpfsOptions{ - Mode: 0o1777, // world-writeable sticky bit + Mode: 0o1777, // world-writable sticky bit Options: [][]string{ {"exec"}, }, diff --git a/spindle/xrpc/add_secret.go b/spindle/xrpc/add_secret.go index e2ebb47a..8574a704 100644 --- a/spindle/xrpc/add_secret.go +++ b/spindle/xrpc/add_secret.go @@ -69,7 +69,7 @@ func (x *Xrpc) AddSecret(w http.ResponseWriter, r *http.Request) { } if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { - l.Error("insufficent permissions", "did", actorDid.String()) + l.Error("insufficient permissions", "did", actorDid.String()) writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) return } diff --git a/spindle/xrpc/list_secrets.go b/spindle/xrpc/list_secrets.go index 4a013e45..a2c8df83 100644 --- a/spindle/xrpc/list_secrets.go +++ b/spindle/xrpc/list_secrets.go @@ -64,7 +64,7 @@ func (x *Xrpc) ListSecrets(w http.ResponseWriter, r *http.Request) { } if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { - l.Error("insufficent permissions", "did", actorDid.String()) + l.Error("insufficient permissions", "did", actorDid.String()) writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) return } diff --git a/spindle/xrpc/pipeline_cancel_pipeline.go b/spindle/xrpc/pipeline_cancel_pipeline.go index 6dc6c391..16ced9ae 100644 --- a/spindle/xrpc/pipeline_cancel_pipeline.go +++ b/spindle/xrpc/pipeline_cancel_pipeline.go @@ -80,7 +80,7 @@ func (x *Xrpc) CancelPipeline(w http.ResponseWriter, r *http.Request) { return } for _, engine := range x.Engines { - l.Debug("destorying workflow", "wid", wid) + l.Debug("destroying workflow", "wid", wid) err = engine.DestroyWorkflow(r.Context(), wid) if err != nil { fail(xrpcerr.GenericError(fmt.Errorf("failed to destroy workflow: %w", err))) diff --git a/spindle/xrpc/remove_secret.go b/spindle/xrpc/remove_secret.go index 5d670367..009ee5c0 100644 --- a/spindle/xrpc/remove_secret.go +++ b/spindle/xrpc/remove_secret.go @@ -63,7 +63,7 @@ func (x *Xrpc) RemoveSecret(w http.ResponseWriter, r *http.Request) { } if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { - l.Error("insufficent permissions", "did", actorDid.String()) + l.Error("insufficient permissions", "did", actorDid.String()) writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) return } diff --git a/tapc/tap.go b/tapc/tap.go index 67e9e881..c5be61af 100644 --- a/tapc/tap.go +++ b/tapc/tap.go @@ -133,9 +133,9 @@ func (c *Client) handleConnection(ctx context.Context, conn *websocket.Conn, han defer func() { conn.Close() - l.Warn("closed tap conection") + l.Warn("closed tap connection") }() - l.Info("established tap conection") + l.Info("established tap connection") for { select { diff --git a/types/repo.go b/types/repo.go index c2d3dc6a..24f5273b 100644 --- a/types/repo.go +++ b/types/repo.go @@ -1,8 +1,6 @@ package types import ( - "encoding/json" - "github.com/bluekeyes/go-gitdiff/gitdiff" "github.com/go-git/go-git/v5/plumbing/object" ) @@ -71,25 +69,6 @@ type Branch struct { IsDefault bool `json:"is_default,omitempty"` } -func (b *Branch) UnmarshalJSON(data []byte) error { - aux := &struct { - Reference `json:"reference"` - Commit *object.Commit `json:"commit,omitempty"` - IsDefault bool `json:"is_default,omitempty"` - MispelledIsDefault bool `json:"is_deafult,omitempty"` // mispelled name - }{} - - if err := json.Unmarshal(data, aux); err != nil { - return err - } - - b.Reference = aux.Reference - b.Commit = aux.Commit - b.IsDefault = aux.IsDefault || aux.MispelledIsDefault // whichever was set - - return nil -} - type RepoTagsResponse struct { Tags []*TagReference `json:"tags,omitempty"` } diff --git a/xrpc/errors/errors.go b/xrpc/errors/errors.go index ef3b6d16..de508002 100644 --- a/xrpc/errors/errors.go +++ b/xrpc/errors/errors.go @@ -90,7 +90,7 @@ var GitError = func(e error) XrpcError { var AccessControlError = func(d string) XrpcError { return NewXrpcError( WithTag("AccessControl"), - WithError(fmt.Errorf("DID does not have sufficent access permissions for this operation: %s", d)), + WithError(fmt.Errorf("DID does not have sufficient access permissions for this operation: %s", d)), ) }