Fix some rebase conflicts

2026-01-05 13:07:14 +00:00 · 2024-11-11 10:33:01 -06:00
parent f9e1dd4bec
commit 76f6b725b8
4 changed files with 33 additions and 32 deletions
--- a/internal/plog/plog.go
+++ b/internal/plog/plog.go
@@ -33,8 +33,9 @@ import (
 	"slices"

 	"github.com/go-logr/logr"
-	"go.pinniped.dev/internal/auditevent"
 	"k8s.io/apiserver/pkg/audit"
+
+	"go.pinniped.dev/internal/auditevent"
 )

 const errorKey = "error" // this matches zapr's default for .Error calls (which is asserted via tests)
--- a/internal/plog/plog_test.go
+++ b/internal/plog/plog_test.go
@@ -4,7 +4,6 @@
 package plog

 import (
-	"bytes"
 	"fmt"
 	"runtime"
 	"strings"