state: add new state package as a foundation for v2

Author: ecordell

cachekeys/keys.go

@@ -34,14 +34,12 @@ func GVRMetaNamespaceKeyFunc(gvr schema.GroupVersionResource, obj interface{}) (
 func SplitGVRMetaNamespaceKey(key string) (gvr *schema.GroupVersionResource, namespace, name string, err error) {
 	before, after, ok := strings.Cut(key, "::")
 	if !ok {
-		err = fmt.Errorf("error parsing key: %s", key)
-		return
+		return nil, "", "", fmt.Errorf("error parsing key: %s", key)
 	}
 	gvr, _ = schema.ParseResourceArg(before)
 	if gvr == nil {
-		err = fmt.Errorf("error parsing gvr from key: %s", before)
-		return
+		return nil, "", "", fmt.Errorf("error parsing gvr from key: %s", before)
 	}
 	namespace, name, err = cache.SplitMetaNamespaceKey(after)
-	return
+	return gvr, namespace, name, err
 }

component/component.go

@@ -58,7 +58,7 @@ func (c *Component[K]) List(ctx context.Context, indexValue fmt.Stringer) (out [
 	ownedObjects, err := c.indexer.ByIndex(c.indexName, indexValue.String())
 	if err != nil {
 		utilruntime.HandleError(err)
-		return
+		return out
 	}
 	for _, d := range ownedObjects {
 		ls := d.GetLabels()

go.mod

@@ -1,8 +1,6 @@
 module github.com/authzed/controller-idioms
 
-go 1.24.0
-
-toolchain go1.24.4
+go 1.25.0
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0
@@ -89,6 +87,7 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+	github.com/authzed/ctxkey v0.0.0-20260210154927-ca132876f62c // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
 	github.com/fxamacker/cbor/v2 v2.8.0 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8
 github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/authzed/ctxkey v0.0.0-20260210154927-ca132876f62c h1:kcjpI9wcj5yFYWJ7bEeiY6hqH2I6Es3lVz6PB7RKblQ=
+github.com/authzed/ctxkey v0.0.0-20260210154927-ca132876f62c/go.mod h1:ve6DXRv9l2HcM2lxSUmZKWXl7Iq/00xYixBuHOtST+4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=

manager/controller_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"sync"
 	"testing"
 	"time"
 
@@ -32,7 +33,7 @@ func ExampleNewOwnedResourceController() {
 	CtxQueue := queue.NewQueueOperationsCtx()
 	registry := typed.NewRegistry()
 	broadcaster := record.NewBroadcaster()
-	eventSink := &typedcorev1.EventSinkImpl{Interface: fake.NewSimpleClientset().CoreV1().Events("")}
+	eventSink := &typedcorev1.EventSinkImpl{Interface: fake.NewClientset().CoreV1().Events("")}
 
 	// the controller processes objects on the queue, but doesn't set up any
 	// informers by default.
@@ -120,11 +121,12 @@ func TestControllerEventsBroadcast(t *testing.T) {
 	recorder.Event(&v1.ObjectReference{Namespace: "test", Name: "a"}, v1.EventTypeNormal, "test", "test")
 
 	require.Eventually(t, func() bool {
-		return len(eventSink.Events) > 0
+		return eventSink.Len() > 0
 	}, 5*time.Second, 1*time.Millisecond)
 }
 
 type fakeEventSink struct {
+	mu     sync.Mutex
 	Events map[types.UID]*v1.Event
 }
 
@@ -134,18 +136,30 @@ func newFakeEventSink() *fakeEventSink {
 	}
 }
 
+func (f *fakeEventSink) Len() int {
+	f.mu.Lock()
+	defer f.mu.Unlock()
+	return len(f.Events)
+}
+
 func (f *fakeEventSink) Create(event *v1.Event) (*v1.Event, error) {
+	f.mu.Lock()
 	f.Events[event.UID] = event
+	f.mu.Unlock()
 	return event, nil
 }
 
 func (f *fakeEventSink) Update(event *v1.Event) (*v1.Event, error) {
+	f.mu.Lock()
 	f.Events[event.UID] = event
+	f.mu.Unlock()
 	return event, nil
 }
 
 func (f *fakeEventSink) Patch(oldEvent *v1.Event, _ []byte) (*v1.Event, error) {
+	f.mu.Lock()
 	f.Events[oldEvent.UID] = oldEvent
+	f.mu.Unlock()
 	return oldEvent, nil
 }