feat(BRIDGE-487): update go to 1.26.1

annatar · annatar · commit d2a0b8c83922 · 2026-03-19T12:23:03.000+01:00
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -14,10 +14,10 @@ jobs:
       - name: Get sources
         uses: actions/checkout@v4
 
-      - name: Set up Go 1.24.4
+      - name: Set up Go 1.26.1
         uses: actions/setup-go@v5
         with:
-          go-version: "1.24.4"
+          go-version: "1.26.1"
 
       - name: Run go mod tidy
         run: go mod tidy
@@ -32,7 +32,7 @@ jobs:
       - name: Run govulncheck
         uses: ./.github/actions/govulncheck
         with:
-          go-version-input: 1.24
+          go-version-input: 1.26.1
           go-package: ./...
 
       - name: Run tests
diff --git a/connector/dummy.go b/connector/dummy.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ProtonMail/gluon/constants"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ticker"
-	"github.com/bradenaw/juniper/xslices"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
 )
@@ -391,23 +391,23 @@ func (conn *Dummy) validateUpdate(oldName, newName []string) error {
 }
 
 func removeMessageMailboxesUpdatedFromSlice(updates []imap.Update, messageID imap.MessageID) []imap.Update {
-	return xslices.Filter(updates, func(update imap.Update) bool {
+	return utils.Filter(updates, func(update imap.Update) bool {
 		u, ok := update.(*imap.MessageMailboxesUpdated)
 
 		return (!ok) || (u.MessageID != messageID)
 	})
 }
 
 func removeMessageFlagsUpdatedFromSlice(updates []imap.Update, messageID imap.MessageID) []imap.Update {
-	return xslices.Filter(updates, func(update imap.Update) bool {
+	return utils.Filter(updates, func(update imap.Update) bool {
 		u, ok := update.(*imap.MessageFlagsUpdated)
 
 		return (!ok) || (u.MessageID != messageID)
 	})
 }
 
 func removeMailboxUpdatedFromSlice(updates []imap.Update, mailboxID imap.MailboxID) []imap.Update {
-	return xslices.Filter(updates, func(update imap.Update) bool {
+	return utils.Filter(updates, func(update imap.Update) bool {
 		u, ok := update.(*imap.MailboxUpdated)
 
 		return (!ok) || (u.MailboxID != mailboxID)
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/ProtonMail/gluon
 
-go 1.24
-
-toolchain go1.24.13
+go 1.26.1
 
 require (
 	github.com/ProtonMail/go-mbox v1.1.0
@@ -18,7 +16,7 @@ require (
 	github.com/stretchr/testify v1.8.3
 	go.uber.org/goleak v1.2.1
 	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
-	golang.org/x/sys v0.8.0
+	golang.org/x/sys v0.32.0
 	golang.org/x/text v0.9.0
 	gopkg.in/yaml.v3 v3.0.1
 )
diff --git a/go.sum b/go.sum
@@ -77,8 +77,8 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/imap/flags.go b/imap/flags.go
@@ -3,7 +3,6 @@ package imap
 import (
 	"strings"
 
-	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 )
@@ -98,22 +97,22 @@ func (fs FlagSet) ContainsUnchecked(flag string) bool {
 
 // ContainsAny returns true if and only if any of the flags are in the set.
 func (fs FlagSet) ContainsAny(flags ...string) bool {
-	return xslices.IndexFunc(flags, func(f string) bool {
+	return slices.IndexFunc(flags, func(f string) bool {
 		return fs.Contains(f)
 	}) >= 0
 }
 
 // ContainsAnyUnchecked returns true if and only if any of the flags are in the set. The flag list is not converted to
 // lower case.
 func (fs FlagSet) ContainsAnyUnchecked(flags ...string) bool {
-	return xslices.IndexFunc(flags, func(f string) bool {
+	return slices.IndexFunc(flags, func(f string) bool {
 		return fs.ContainsUnchecked(f)
 	}) >= 0
 }
 
 // ContainsAll returns true if and only if all of the flags are in the set.
 func (fs FlagSet) ContainsAll(flags ...string) bool {
-	return xslices.IndexFunc(flags, func(f string) bool {
+	return slices.IndexFunc(flags, func(f string) bool {
 		return !fs.Contains(f)
 	}) < 0
 }
diff --git a/internal/backend/connector_updates.go b/internal/backend/connector_updates.go
@@ -13,6 +13,7 @@ import (
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ids"
 	"github.com/ProtonMail/gluon/internal/state"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
@@ -388,7 +389,7 @@ func (user *user) applyMessagesCreated(ctx context.Context, update *imap.Message
 				return nil, err
 			}
 
-			toAdd := xslices.Filter(msgList, func(id db.MessageIDPair) bool {
+			toAdd := utils.Filter(msgList, func(id db.MessageIDPair) bool {
 				return !slices.Contains(inMailbox, id.InternalID)
 			})
 
@@ -536,7 +537,7 @@ func (user *user) setMessageMailboxes(ctx context.Context, tx db.Transaction, me
 
 	var updates []state.Update
 
-	for _, mboxID := range xslices.Filter(mboxIDs, func(mboxID imap.InternalMailboxID) bool { return !slices.Contains(curMailboxIDs, mboxID) }) {
+	for _, mboxID := range utils.Filter(mboxIDs, func(mboxID imap.InternalMailboxID) bool { return !slices.Contains(curMailboxIDs, mboxID) }) {
 		_, update, err := user.applyMessagesAddedToMailbox(ctx, tx, mboxID, []db.MessageIDPair{messageID})
 		if err != nil {
 			return nil, err
@@ -545,7 +546,7 @@ func (user *user) setMessageMailboxes(ctx context.Context, tx db.Transaction, me
 		updates = append(updates, update)
 	}
 
-	for _, mboxID := range xslices.Filter(curMailboxIDs, func(mboxID imap.InternalMailboxID) bool { return !slices.Contains(mboxIDs, mboxID) }) {
+	for _, mboxID := range utils.Filter(curMailboxIDs, func(mboxID imap.InternalMailboxID) bool { return !slices.Contains(mboxIDs, mboxID) }) {
 		update, err := user.applyMessagesRemovedFromMailbox(ctx, tx, mboxID, []imap.InternalMessageID{messageID.InternalID})
 		if err != nil {
 			return nil, err
diff --git a/internal/backend/user.go b/internal/backend/user.go
@@ -298,7 +298,7 @@ func (user *user) removeState(ctx context.Context, st *state.State) error {
 			return nil, fmt.Errorf("no such state")
 		}
 
-		messageIDs = xslices.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {
+		messageIDs = utils.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {
 			return xslices.CountFunc(maps.Values(user.states), func(other *state.State) bool {
 				return st != other && other.HasMessage(messageID)
 			}) == 0
@@ -372,7 +372,7 @@ func (user *user) cleanupStaleStoreData(ctx context.Context) error {
 		return err
 	}
 
-	idsToDelete := xslices.Filter(storeIds, func(id imap.InternalMessageID) bool {
+	idsToDelete := utils.Filter(storeIds, func(id imap.InternalMessageID) bool {
 		_, ok := dbIdMap[id]
 
 		return !ok
diff --git a/internal/state/actions.go b/internal/state/actions.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ProtonMail/gluon/db"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ids"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/ProtonMail/gluon/observability"
 	"github.com/ProtonMail/gluon/observability/metrics"
 	"github.com/ProtonMail/gluon/rfc822"
@@ -249,7 +250,7 @@ func (state *State) actionAddMessagesToMailbox(
 			return nil, nil, err
 		}
 
-		if remMessageIDs := xslices.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
+		if remMessageIDs := utils.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
 			return slices.Contains(haveMessageIDs, messageID.InternalID)
 		}); len(remMessageIDs) > 0 {
 			updates, err := state.actionRemoveMessagesFromMailboxUnchecked(ctx, tx, remMessageIDs, mboxID)
@@ -299,7 +300,7 @@ func (state *State) actionAddRecoveredMessagesToMailbox(
 		return nil, nil, err
 	}
 
-	toAdd := xslices.Filter(messageIDs, func(t db.MessageIDPair) bool {
+	toAdd := utils.Filter(messageIDs, func(t db.MessageIDPair) bool {
 		return !slices.Contains(filter, t.InternalID)
 	})
 
@@ -509,7 +510,7 @@ func (state *State) actionRemoveMessagesFromMailbox(
 		return nil, err
 	}
 
-	messageIDs = xslices.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
+	messageIDs = utils.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
 		return slices.Contains(haveMessageIDs, messageID.InternalID)
 	})
 
@@ -552,7 +553,7 @@ func (state *State) actionMoveMessages(
 			return nil, nil, err
 		}
 
-		if remMessageIDs := xslices.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
+		if remMessageIDs := utils.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
 			return slices.Contains(messageIDsToAdd, messageID.InternalID)
 		}); len(remMessageIDs) > 0 {
 			updates, err := state.actionRemoveMessagesFromMailboxUnchecked(ctx, tx, remMessageIDs, mboxToID)
@@ -569,7 +570,7 @@ func (state *State) actionMoveMessages(
 		return nil, nil, err
 	}
 
-	messagesIDsToMove := xslices.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
+	messagesIDsToMove := utils.Filter(messageIDs, func(messageID db.MessageIDPair) bool {
 		return slices.Contains(messageInFromMBox, messageID.InternalID)
 	})
 
diff --git a/internal/state/mailbox_fetch.go b/internal/state/mailbox_fetch.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ProtonMail/gluon/imap/command"
 	"github.com/ProtonMail/gluon/internal/contexts"
 	"github.com/ProtonMail/gluon/internal/response"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
@@ -177,7 +178,7 @@ func (m *Mailbox) Fetch(ctx context.Context, cmd *command.Fetch, ch chan respons
 		return err
 	}
 
-	msgsToBeMarkedSeen := xslices.Filter(snapMessages, func(s snapMsgWithSeq) bool {
+	msgsToBeMarkedSeen := utils.Filter(snapMessages, func(s snapMsgWithSeq) bool {
 		return s.snapMsg != nil
 	})
 
diff --git a/internal/state/mailbox_search.go b/internal/state/mailbox_search.go
@@ -14,10 +14,10 @@ import (
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/imap/command"
 	"github.com/ProtonMail/gluon/internal/contexts"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/ProtonMail/gluon/rfc5322"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/bradenaw/juniper/parallel"
-	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/text/encoding"
 )
 
@@ -78,7 +78,7 @@ func (m *Mailbox) Search(ctx context.Context, keys []command.SearchKey, decoder
 		return nil, err
 	}
 
-	return xslices.Filter(result, func(v uint32) bool {
+	return utils.Filter(result, func(v uint32) bool {
 		return v != 0
 	}), nil
 }
diff --git a/internal/state/paths.go b/internal/state/paths.go
@@ -3,6 +3,7 @@ package state
 import (
 	"strings"
 
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/exp/slices"
 )
@@ -32,7 +33,7 @@ func listSuperiors(name, delimiter string) []string {
 }
 
 func listInferiors(parent, delimiter string, names []string) []string {
-	inferiors := xslices.Filter(names, func(name string) bool {
+	inferiors := utils.Filter(names, func(name string) bool {
 		return slices.Contains(listSuperiors(name, delimiter), parent)
 	})
 
diff --git a/internal/state/snapshot_messages.go b/internal/state/snapshot_messages.go
@@ -6,7 +6,6 @@ import (
 	"github.com/ProtonMail/gluon/db"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/imap/command"
-	"github.com/bradenaw/juniper/xslices"
 	"golang.org/x/exp/slices"
 )
 
@@ -80,7 +79,7 @@ func (list *snapMsgList) insertOutOfOrder(msgID db.MessageIDPair, msgUID imap.UI
 		toExpunge: flags.ContainsUnchecked(imap.FlagDeletedLowerCase),
 	}
 
-	list.msg = xslices.Insert(list.msg, index, snapMsg)
+	list.msg = slices.Insert(list.msg, index, snapMsg)
 
 	list.idx[msgID.InternalID] = snapMsg
 }
diff --git a/internal/state/state.go b/internal/state/state.go
@@ -13,6 +13,7 @@ import (
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ids"
 	"github.com/ProtonMail/gluon/internal/response"
+	"github.com/ProtonMail/gluon/internal/utils"
 	"github.com/ProtonMail/gluon/limits"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/rfc822"
@@ -95,7 +96,7 @@ func (state *State) List(ctx context.Context, ref, pattern string, lsub bool, fn
 			recoveryMBoxMessageCount = 0
 		}
 
-		mailboxes = xslices.Filter(mailboxes, func(mailbox *db.MailboxWithAttr) bool {
+		mailboxes = utils.Filter(mailboxes, func(mailbox *db.MailboxWithAttr) bool {
 			if mailbox.ID == recoveryMailboxID && recoveryMBoxMessageCount == 0 {
 				return false
 			}
diff --git a/internal/utils/slice_filter.go b/internal/utils/slice_filter.go
@@ -0,0 +1,9 @@
+package utils
+
+import "slices"
+
+func Filter[S ~[]E, E any](s S, keep func(E) bool) S {
+	return slices.DeleteFunc(slices.Clone(s), func(e E) bool {
+		return !keep(e)
+	})
+}
diff --git a/rfc822/header_test.go b/rfc822/header_test.go
@@ -1,10 +1,10 @@
 package rfc822
 
 import (
+	"slices"
 	"strings"
 	"testing"
 
-	"github.com/bradenaw/juniper/xslices"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -293,7 +293,7 @@ func TestSetHeaderValue(t *testing.T) {
 	const literal = "To: user@pm.me"
 
 	// Create a clone so we can test this with mutable memory.
-	literalBytes := xslices.Clone([]byte(literal))
+	literalBytes := slices.Clone([]byte(literal))
 
 	newHeader, err := SetHeaderValue(literalBytes, "foo", "bar")
 	require.NoError(t, err)
diff --git a/tests/connection_test.go b/tests/connection_test.go
@@ -89,7 +89,7 @@ func (s *testConnection) Sx(want ...string) *testConnection {
 	var bad []string
 
 	for _, have := range s.readN(len(want)) {
-		if idx := xslices.IndexFunc(want, func(want string) bool {
+		if idx := slices.IndexFunc(want, func(want string) bool {
 			return regexp.MustCompile(want).Match(have)
 		}); idx >= 0 {
 			want = slices.Delete(want, idx, idx+1)
@@ -119,7 +119,7 @@ func (s *testConnection) Sxe(want ...string) *testConnection {
 	for len(want) > 0 {
 		have := s.read()
 
-		if idx := xslices.IndexFunc(want, func(want string) bool {
+		if idx := slices.IndexFunc(want, func(want string) bool {
 			return regexp.MustCompile(want).Match(have)
 		}); idx >= 0 {
 			want = slices.Delete(want, idx, idx+1)
diff --git a/tests/server_test.go b/tests/server_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/store"
 	"github.com/ProtonMail/gluon/version"
-	"github.com/bradenaw/juniper/xslices"
 	"github.com/emersion/go-imap/client"
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
@@ -92,7 +91,7 @@ func (s *serverOptions) defaultPassword() string {
 }
 
 func (s *serverOptions) password(username string) string {
-	return s.credentials[xslices.IndexFunc(s.credentials, func(cred credentials) bool {
+	return s.credentials[slices.IndexFunc(s.credentials, func(cred credentials) bool {
 		return slices.Contains(cred.usernames, username)
 	})].password
 }

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ func (user user) removeState(ctx context.Context, st state.State) error {`
`298`	`298`	`return nil, fmt.Errorf("no such state")`
`299`	`299`	`}`
`300`	`300`
`301`		`- messageIDs = xslices.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {`
	`301`	`+ messageIDs = utils.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {`
`302`	`302`	`return xslices.CountFunc(maps.Values(user.states), func(other *state.State) bool {`
`303`	`303`	`return st != other && other.HasMessage(messageID)`
`304`	`304`	`}) == 0`
`@@ -372,7 +372,7 @@ func (user *user) cleanupStaleStoreData(ctx context.Context) error {`
`372`	`372`	`return err`
`373`	`373`	`}`
`374`	`374`
`375`		`- idsToDelete := xslices.Filter(storeIds, func(id imap.InternalMessageID) bool {`
	`375`	`+ idsToDelete := utils.Filter(storeIds, func(id imap.InternalMessageID) bool {`
`376`	`376`	`_, ok := dbIdMap[id]`
`377`	`377`
`378`	`378`	`return !ok`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ import (`
`14`	`14`	`"github.com/ProtonMail/gluon/imap"`
`15`	`15`	`"github.com/ProtonMail/gluon/imap/command"`
`16`	`16`	`"github.com/ProtonMail/gluon/internal/contexts"`
	`17`	`+ "github.com/ProtonMail/gluon/internal/utils"`
`17`	`18`	`"github.com/ProtonMail/gluon/rfc5322"`
`18`	`19`	`"github.com/ProtonMail/gluon/rfc822"`
`19`	`20`	`"github.com/bradenaw/juniper/parallel"`
`20`		`- "github.com/bradenaw/juniper/xslices"`
`21`	`21`	`"golang.org/x/text/encoding"`
`22`	`22`	`)`
`23`	`23`
`@@ -78,7 +78,7 @@ func (m *Mailbox) Search(ctx context.Context, keys []command.SearchKey, decoder`
`78`	`78`	`return nil, err`
`79`	`79`	`}`
`80`	`80`
`81`		`- return xslices.Filter(result, func(v uint32) bool {`
	`81`	`+ return utils.Filter(result, func(v uint32) bool {`
`82`	`82`	`return v != 0`
`83`	`83`	`}), nil`
`84`	`84`	`}`