diff --git a/.github/workflows/middlewares.yml b/.github/workflows/middlewares.yml
index edec427..f15a85f 100644
--- a/.github/workflows/middlewares.yml
+++ b/.github/workflows/middlewares.yml
@@ -14,18 +14,18 @@ jobs:
sudo echo "127.0.0.1 domain.com" | sudo tee -a /etc/hosts
-
name: Install Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v7
with:
- go-version: 1.19
+ go-version: "1.27"
-
name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v7
-
name: Install xcaddy
run: go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
-
name: Build go-esi as caddy module
- run: cd middleware/caddy && xcaddy build --with github.com/darkweak/go-esi/middleware/caddy=./ --with github.com/darkweak/go-esi@latest=../..
+ run: cd middleware/caddy && xcaddy build --with github.com/darkweak/go-esi=../.. --with github.com/darkweak/go-esi/middleware/caddy=./
-
name: Run Caddy tests
run: cd middleware/caddy && go test -v ./...
@@ -39,12 +39,12 @@ jobs:
steps:
-
name: Install Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v7
with:
- go-version: 1.19
+ go-version: "1.27"
-
name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v7
-
name: Run Roadrunner tests
run: cd middleware/roadrunner && go test -v ./...
diff --git a/.github/workflows/non-regression.yml b/.github/workflows/non-regression.yml
index 276a958..6deca48 100644
--- a/.github/workflows/non-regression.yml
+++ b/.github/workflows/non-regression.yml
@@ -15,15 +15,17 @@ jobs:
sudo echo "127.0.0.1 domain.com" | sudo tee -a /etc/hosts
-
name: checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v7
-
name: install Go
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v7
with:
- go-version: 1.19
+ go-version: "1.27"
-
name: golangci-lint
- uses: golangci/golangci-lint-action@v3
+ uses: golangci/golangci-lint-action@v9
+ with:
+ version: v2.15
-
name: install xcaddy
run: go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5928221..0c352e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,20 +11,20 @@ jobs:
steps:
-
name: Set up Go
- uses: actions/setup-go@v2
+ uses: actions/setup-go@v7
with:
- go-version: 1.19
+ go-version: "1.27"
-
name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v7
with:
fetch-depth: 0
-
name: Run GoReleaser
- uses: goreleaser/goreleaser-action@v3
+ uses: goreleaser/goreleaser-action@v7
with:
- version: latest
- args: release --rm-dist
+ version: "~> v2"
+ args: release --clean
workdir: ./middleware/server
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.golangci.yml b/.golangci.yml
index 88ad0e9..17620d7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,25 +1,53 @@
+version: "2"
run:
- timeout: 30s
issues-exit-code: 1
-
linters:
- enable-all: true
+ default: all
disable:
- bodyclose
- cyclop
- - exhaustivestruct
+ - depguard
+ - embeddedstructfieldcheck
- exhaustruct
+ - exhaustruct_v5
- forbidigo
+ - funcorder
- gochecknoglobals
- - gci
- - golint
- - gomnd
- - ifshort
+ - inamedparam
- ireturn
+ - mnd
- nestif
+ - noinlineerr
- nonamedreturns
- - nosnakecase
- revive
- testpackage
- - stylecheck
- varnamelen
+ - wrapcheck
+ - wsl
+ exclusions:
+ generated: lax
+ rules:
+ - path: _test\.go
+ linters:
+ - gosec
+ - noctx
+ presets:
+ - comments
+ - common-false-positives
+ - legacy
+ - std-error-handling
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
+formatters:
+ enable:
+ - gofmt
+ - gofumpt
+ - goimports
+ exclusions:
+ generated: lax
+ paths:
+ - third_party$
+ - builtin$
+ - examples$
diff --git a/README.md b/README.md
index 9ab2c50..dabefa7 100644
--- a/README.md
+++ b/README.md
@@ -26,16 +26,17 @@ go get -u github.com/darkweak/go-esi
```
## Usage
+### Parse a whole document
```go
import (
// ...
- github.com/darkweak/go-esi/esi
+ "github.com/darkweak/go-esi/esi"
)
//...
func functionToParseESITags(b []byte, r *http.Request) []byte {
- // Returns the parsed response.
+ // Returns the parsed response. The include tags are fetched in parallel.
res := esi.Parse(b, r)
//...
@@ -43,6 +44,37 @@ func functionToParseESITags(b []byte, r *http.Request) []byte {
}
```
+### Stream a document
+`esi.Stream` processes the ESI tags while the document is written to it. The static content is forwarded as soon as it is
+read, the include tags are fetched concurrently, and their content is written in the document order. The destination is
+flushed (if it implements `http.Flusher`) whenever the output has to wait for an include or for more input.
+```go
+func streamESI(dst io.Writer, src io.Reader, r *http.Request) error {
+ s := esi.NewStream(dst, r)
+ if _, err := io.Copy(s, src); err != nil {
+ _ = s.Close()
+
+ return err
+ }
+
+ // Close processes the remaining content and waits for the pending includes.
+ return s.Close()
+}
+```
+
+### Wrap an `http.ResponseWriter`
+```go
+import "github.com/darkweak/go-esi/writer"
+
+func esiMiddleware(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ cw := writer.NewWriter(rw, r)
+ next.ServeHTTP(cw, r)
+ _ = cw.Close()
+ })
+}
+```
+
## Available as middleware
- [x] Caddy
- [x] Træfik
@@ -99,7 +131,7 @@ experimental:
plugins:
souin:
moduleName: github.com/darkweak/go-esi
- version: v0.0.6
+ version: v0.0.7
```
```yaml
# anywhere/dynamic-configuration
diff --git a/esi/choose.go b/esi/choose.go
index 5c4030d..ae2cddb 100644
--- a/esi/choose.go
+++ b/esi/choose.go
@@ -1,6 +1,7 @@
package esi
import (
+ "bytes"
"net/http"
"regexp"
)
@@ -8,7 +9,7 @@ import (
const choose = "choose"
var (
- closeChoose = regexp.MustCompile("")
+ closeChoose = []byte("")
whenRg = regexp.MustCompile(`(?s)(.+?)`)
otherwiseRg = regexp.MustCompile(`(?s)(.+?)`)
)
@@ -33,12 +34,12 @@ type chooseTag struct {
//
// ).
func (c *chooseTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeChoose.FindIndex(b)
- if found == nil {
+ end := closeEnd(b, closeChoose)
+ if end == 0 {
return nil, len(b)
}
- c.length = found[1]
+ c.length = end
tagIdxs := whenRg.FindAllSubmatch(b, -1)
var res []byte
@@ -60,13 +61,9 @@ func (c *chooseTag) Process(b []byte, req *http.Request) ([]byte, int) {
}
func (*chooseTag) HasClose(b []byte) bool {
- return closeChoose.FindIndex(b) != nil
+ return bytes.Contains(b, closeChoose)
}
func (*chooseTag) GetClosePosition(b []byte) int {
- if idx := closeChoose.FindIndex(b); idx != nil {
- return idx[1]
- }
-
- return 0
+ return closeEnd(b, closeChoose)
}
diff --git a/esi/comment.go b/esi/comment.go
index 0aef0e6..5056aa6 100644
--- a/esi/comment.go
+++ b/esi/comment.go
@@ -1,36 +1,47 @@
package esi
import (
+ "bytes"
"net/http"
- "regexp"
)
const comment = "comment"
-var closeComment = regexp.MustCompile("/>((\n| +)+)?")
+var closeComment = []byte("/>")
type commentTag struct {
*baseTag
}
+// commentEnd returns the end of the closing "/>" including the spaces and
+// newlines following it, or 0.
+func commentEnd(b []byte) int {
+ end := closeEnd(b, closeComment)
+ if end == 0 {
+ return 0
+ }
+
+ for end < len(b) && isSpace(b[end]) {
+ end++
+ }
+
+ return end
+}
+
// Input (e.g. comment text="This is a comment." />).
-func (c *commentTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeComment.FindIndex(b)
- if found == nil {
+func (c *commentTag) Process(b []byte, _ *http.Request) ([]byte, int) {
+ end := commentEnd(b)
+ if end == 0 {
return nil, len(b)
}
- return []byte{}, found[1]
+ return []byte{}, end
}
func (*commentTag) HasClose(b []byte) bool {
- return closeComment.FindIndex(b) != nil
+ return bytes.Contains(b, closeComment)
}
func (*commentTag) GetClosePosition(b []byte) int {
- if idx := closeComment.FindIndex(b); idx != nil {
- return idx[1]
- }
-
- return 0
+ return commentEnd(b)
}
diff --git a/esi/escape.go b/esi/escape.go
index 9bf7564..1a39047 100644
--- a/esi/escape.go
+++ b/esi/escape.go
@@ -1,48 +1,38 @@
package esi
import (
+ "bytes"
"net/http"
- "regexp"
)
const escape = "")
- startEscape = regexp.MustCompile("((\n| +)+)?")
-)
+var closeEscape = []byte("-->")
type escapeTag struct {
*baseTag
}
func (e *escapeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeEscape.FindIndex(b)
-
- if closeIdx == nil {
+ closeStart, end := findClose(b, closeEscape)
+ if closeStart == -1 {
return nil, len(b)
}
startPosition := 0
- if startIdx := startEscape.FindIndex(b); startIdx != nil {
- startPosition = startIdx[1]
+ for startPosition < closeStart && isSpace(b[startPosition]) {
+ startPosition++
}
- e.length = closeIdx[1]
- b = b[startPosition:closeIdx[0]]
+ e.length = end
- return b, e.length
+ return b[startPosition:closeStart], e.length
}
func (*escapeTag) HasClose(b []byte) bool {
- return closeEscape.FindIndex(b) != nil
+ return bytes.Contains(b, closeEscape)
}
func (*escapeTag) GetClosePosition(b []byte) int {
- if idx := closeEscape.FindIndex(b); idx != nil {
- return idx[1]
- }
-
- return 0
+ return closeEnd(b, closeEscape)
}
diff --git a/esi/esi.go b/esi/esi.go
index c6ce30e..6e539f6 100644
--- a/esi/esi.go
+++ b/esi/esi.go
@@ -1,50 +1,26 @@
package esi
import (
+ "bytes"
"net/http"
+ "sync"
)
func findTagName(b []byte) Tag {
- name := tagname.FindSubmatch(b)
- if name == nil {
- return nil
+ if bytes.HasPrefix(b, escapePrefix) {
+ return &escapeTag{baseTag: newBaseTag()}
}
- switch string(name[1]) {
- case comment:
- return &commentTag{
- baseTag: newBaseTag(),
- }
- case choose:
- return &chooseTag{
- baseTag: newBaseTag(),
- }
- case escape:
- return &escapeTag{
- baseTag: newBaseTag(),
- }
- case include:
- return &includeTag{
- baseTag: newBaseTag(),
- }
- case remove:
- return &removeTag{
- baseTag: newBaseTag(),
- }
- case try:
- case vars:
- return &varsTag{
- baseTag: newBaseTag(),
- }
- default:
- return nil
- }
+ name, _ := readTagName(b)
- return nil
+ return newTag(name)
}
+// HasOpenedTags reports whether b contains an ESI opening sequence.
func HasOpenedTags(b []byte) bool {
- return esi.FindIndex(b) != nil || escapeRg.FindIndex(b) != nil
+ _, kind := nextTagStart(b, true)
+
+ return kind != kindNone
}
func CanProcess(b []byte) bool {
@@ -55,64 +31,107 @@ func CanProcess(b []byte) bool {
return false
}
-func ReadToTag(next []byte, pointer int) (startTagPosition, esiPointer int, t Tag) {
- var isEscapeTag bool
+// ReadToTag returns the position of the next ESI tag in next, the position
+// right after its opening sequence and the matching Tag.
+//
+// Deprecated: use Parse or NewStream which handle the whole tag lifecycle.
+func ReadToTag(next []byte, _ int) (startTagPosition, esiPointer int, t Tag) {
+ i, kind := nextTagStart(next, true)
+ if kind == kindNone {
+ return len(next), 0, nil
+ }
+
+ if kind == kindEscape {
+ return i, i + len(escapePrefix), &escapeTag{baseTag: newBaseTag()}
+ }
+
+ esiPointer = i + len(esiPrefix)
+
+ return i, esiPointer, findTagName(next[esiPointer:])
+}
+
+// asyncPart is a tag processed concurrently whose output fills a slot of the
+// final document.
+type asyncPart struct {
+ t Tag
+ body []byte
+ out []byte
+}
+
+type part struct {
+ static []byte
+ async *asyncPart
+}
- tagIdx := esi.FindIndex(next)
+// collector is the sink used by Parse. It runs I/O-bound tags concurrently,
+// except the last one which is processed on the calling goroutine since it
+// would wait anyway.
+type collector struct {
+ req *http.Request
+ parts []part
+ pending *asyncPart
+ wg sync.WaitGroup
+}
- if escIdx := escapeRg.FindIndex(next); escIdx != nil && (tagIdx == nil || escIdx[0] < tagIdx[0]) {
- tagIdx = escIdx
- tagIdx[1] = escIdx[0]
- isEscapeTag = true
+func (c *collector) static(b []byte) {
+ if len(b) > 0 {
+ c.parts = append(c.parts, part{static: b})
}
+}
- if tagIdx == nil {
- return len(next), 0, nil
+func (c *collector) tag(t Tag, body []byte) {
+ if !isAsync(t, body) {
+ c.static(process(t, body, c.req))
+
+ return
}
- esiPointer = tagIdx[1]
- startTagPosition = tagIdx[0]
- t = findTagName(next[esiPointer:])
+ a := &asyncPart{t: t, body: body}
+ c.parts = append(c.parts, part{async: a})
- if isEscapeTag {
- esiPointer += 7
+ if p := c.pending; p != nil {
+ c.wg.Go(func() { p.out = process(p.t, p.body, c.req) })
}
- return
+ c.pending = a
}
+// Parse processes the ESI tags of b and returns the resulting document.
+// Independent include tags are fetched in parallel. b is not modified but the
+// result may alias it.
func Parse(b []byte, req *http.Request) []byte {
- pointer := 0
+ if !HasOpenedTags(b) {
+ return b
+ }
- for pointer < len(b) {
- var escapeTag bool
+ c := collector{req: req}
+ scan(b, true, &c)
- next := b[pointer:]
- tagIdx := esi.FindIndex(next)
+ if p := c.pending; p != nil {
+ p.out = process(p.t, p.body, req)
+ }
- if escIdx := escapeRg.FindIndex(next); escIdx != nil && (tagIdx == nil || escIdx[0] < tagIdx[0]) {
- tagIdx = escIdx
- tagIdx[1] = escIdx[0]
- escapeTag = true
- }
+ c.wg.Wait()
- if tagIdx == nil {
- break
- }
+ size := 0
- esiPointer := tagIdx[1]
- t := findTagName(next[esiPointer:])
-
- if escapeTag {
- esiPointer += 7
+ for _, p := range c.parts {
+ if p.async != nil {
+ size += len(p.async.out)
+ } else {
+ size += len(p.static)
}
+ }
- res, p := t.Process(next[esiPointer:], req)
- esiPointer += p
+ out := make([]byte, 0, size)
- b = append(b[:pointer], append(next[:tagIdx[0]], append(res, next[esiPointer:]...)...)...)
- pointer += len(res) + tagIdx[0]
+ for _, p := range c.parts {
+ if p.async != nil {
+ out = append(out, p.async.out...)
+ } else {
+ out = append(out, p.static...)
+ }
}
- return b
+ return out
}
diff --git a/esi/esi_test.go b/esi/esi_test.go
index 24f3b47..3771b55 100644
--- a/esi/esi_test.go
+++ b/esi/esi_test.go
@@ -1,14 +1,55 @@
package esi_test
import (
+ "errors"
+ "net"
"net/http"
"net/http/httptest"
"os"
"testing"
+ "time"
"github.com/darkweak/go-esi/esi"
)
+// fixtureRoutes mirrors the routes of middleware/caddy/Caddyfile.
+func fixtureRoutes() *http.ServeMux {
+ mux := http.NewServeMux()
+ respond := func(path, body string) {
+ mux.HandleFunc(path, func(w http.ResponseWriter, _ *http.Request) {
+ w.Header().Set("Content-Type", "text/html")
+ _, _ = w.Write([]byte(body))
+ })
+ }
+
+ respond("/chained-esi-include-1", ``)
+ respond("/chained-esi-include-2", "
CHAINED 2
")
+ respond("/esi-include", "ESI INCLUDE
")
+ respond("/alt-esi-include", "ALTERNATE ESI INCLUDE
")
+
+ return mux
+}
+
+// TestMain serves the fixture routes on :9080 (domain.com must resolve to
+// the loopback) unless another server, e.g. the detached caddy of the CI,
+// already listens there.
+func TestMain(m *testing.M) {
+ srv := &http.Server{Handler: fixtureRoutes(), ReadHeaderTimeout: time.Second}
+
+ if ln, err := net.Listen("tcp", "127.0.0.1:9080"); err == nil {
+ go func() {
+ if e := srv.Serve(ln); e != nil && !errors.Is(e, http.ErrServerClosed) {
+ panic(e)
+ }
+ }()
+ }
+
+ code := m.Run()
+ _ = srv.Close()
+
+ os.Exit(code)
+}
+
func loadFromFixtures(name string) []byte {
b, e := os.ReadFile("../fixtures/" + name)
if e != nil {
@@ -114,7 +155,7 @@ func Test_Parse_fullMock(t *testing.T) {
// Benchmarks.
func BenchmarkInclude(b *testing.B) {
- for i := 0; i < b.N; i++ {
+ for b.Loop() {
esi.Parse(
[]byte(
``,
@@ -132,7 +173,7 @@ var remove = `
`
func BenchmarkRemove(b *testing.B) {
- for i := 0; i < b.N; i++ {
+ for b.Loop() {
esi.Parse(
[]byte(remove),
httptest.NewRequest(http.MethodGet, "http://domain.com:9080", nil),
@@ -171,7 +212,7 @@ const full = `
`
func BenchmarkFull(b *testing.B) {
- for i := 0; i < b.N; i++ {
+ for b.Loop() {
esi.Parse(
[]byte(full),
httptest.NewRequest(http.MethodGet, "http://domain.com:9080", nil),
diff --git a/esi/include.go b/esi/include.go
index 09a34bd..5147774 100644
--- a/esi/include.go
+++ b/esi/include.go
@@ -2,17 +2,19 @@ package esi
import (
"bytes"
- "context"
"io"
"net/http"
"net/url"
"regexp"
)
-const include = "include"
+const (
+ include = "include"
+ maxIdleConnsPerHost = 64
+)
var (
- closeInclude = regexp.MustCompile("/>")
+ closeInclude = []byte("/>")
srcAttribute = regexp.MustCompile(`src="?(.+?)"?( |/>)`)
altAttribute = regexp.MustCompile(`alt="?(.+?)"?( |/>)`)
onErrorAttribute = regexp.MustCompile(`onerror="?(.+?)"?( |/>)`)
@@ -73,45 +75,84 @@ func addHeaders(headers []string, req *http.Request, rq *http.Request) {
}
}
+// client is shared by every include so connections are pooled and reused.
+// Includes run in parallel, so keep more idle connections per host than the
+// default (2) to avoid reconnecting on every page.
+var client = &http.Client{Transport: newTransport()}
+
+func newTransport() http.RoundTripper {
+ t, ok := http.DefaultTransport.(*http.Transport)
+ if !ok {
+ return http.DefaultTransport
+ }
+
+ t = t.Clone()
+ t.MaxIdleConnsPerHost = maxIdleConnsPerHost
+
+ return t
+}
+
+func fetch(src string, req *http.Request) (*http.Request, *http.Response, error) {
+ //nolint:gosec // G704: fetching the include source is the purpose of the tag.
+ rq, err := http.NewRequestWithContext(req.Context(), http.MethodGet, sanitizeURL(src, req.URL), nil)
+ if err != nil {
+ return nil, nil, err
+ }
+
+ addHeaders(headersSafe, req, rq)
+
+ if rq.URL.Scheme == req.URL.Scheme && rq.URL.Host == req.URL.Host {
+ addHeaders(headersUnsafe, req, rq)
+ }
+
+ response, err := client.Do(rq) //nolint:gosec // G704: same as above.
+
+ return rq, response, err
+}
+
+func failed(response *http.Response, err error) bool {
+ return err != nil || response.StatusCode >= http.StatusBadRequest
+}
+
// Input (e.g. include src="https://domain.com/esi-include" alt="https://domain.com/alt-esi-include" />)
// With or without the alt
// With or without a space separator before the closing
// With or without the quotes around the src/alt value.
func (i *includeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeInclude.FindIndex(b)
-
- if closeIdx == nil {
+ closeIdx := bytes.Index(b, closeInclude)
+ if closeIdx == -1 {
return nil, len(b)
}
- i.length = closeIdx[1]
+ i.length = closeIdx + len(closeInclude)
if e := i.loadAttributes(b[8:i.length]); e != nil {
return nil, len(b)
}
- rq, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, sanitizeURL(i.src, req.URL), nil)
- addHeaders(headersSafe, req, rq)
-
- if rq.URL.Scheme == req.URL.Scheme && rq.URL.Host == req.URL.Host {
- addHeaders(headersUnsafe, req, rq)
+ rq, response, err := fetch(i.src, req)
+ if rq == nil {
+ return nil, i.length
}
- client := &http.Client{}
- response, err := client.Do(rq)
- req = rq
+ if failed(response, err) && i.alt != "" {
+ if response != nil {
+ _ = response.Body.Close()
+ }
- if (err != nil || response.StatusCode >= 400) && i.alt != "" {
- rq, _ = http.NewRequestWithContext(context.Background(), http.MethodGet, sanitizeURL(i.alt, req.URL), nil)
- addHeaders(headersSafe, req, rq)
+ var altRq *http.Request
- if rq.URL.Scheme == req.URL.Scheme && rq.URL.Host == req.URL.Host {
- addHeaders(headersUnsafe, req, rq)
+ altRq, response, err = fetch(i.alt, rq)
+ if altRq == nil {
+ return nil, i.length
}
- response, err = client.Do(rq)
- req = rq
+ rq = altRq
+
+ if !i.silent && failed(response, err) {
+ if response != nil {
+ _ = response.Body.Close()
+ }
- if !i.silent && (err != nil || response.StatusCode >= 400) {
return nil, len(b)
}
}
@@ -120,23 +161,23 @@ func (i *includeTag) Process(b []byte, req *http.Request) ([]byte, int) {
return nil, i.length
}
- var buf bytes.Buffer
+ body, err := io.ReadAll(response.Body)
+ _ = response.Body.Close()
- defer response.Body.Close()
- _, _ = io.Copy(&buf, response.Body)
-
- b = Parse(buf.Bytes(), req)
+ if err != nil {
+ return nil, i.length
+ }
- return b, i.length
+ return Parse(body, rq), i.length
}
func (*includeTag) HasClose(b []byte) bool {
- return closeInclude.FindIndex(b) != nil
+ return bytes.Contains(b, closeInclude)
}
func (*includeTag) GetClosePosition(b []byte) int {
- if idx := closeInclude.FindIndex(b); idx != nil {
- return idx[1]
+ if idx := bytes.Index(b, closeInclude); idx != -1 {
+ return idx + len(closeInclude)
}
return 0
diff --git a/esi/remove.go b/esi/remove.go
index 1c9df9a..d839860 100644
--- a/esi/remove.go
+++ b/esi/remove.go
@@ -1,37 +1,33 @@
package esi
import (
+ "bytes"
"net/http"
- "regexp"
)
const remove = "remove"
-var closeRemove = regexp.MustCompile("")
+var closeRemove = []byte("")
type removeTag struct {
*baseTag
}
func (r *removeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeRemove.FindIndex(b)
- if closeIdx == nil {
+ end := closeEnd(b, closeRemove)
+ if end == 0 {
return []byte{}, len(b)
}
- r.length = closeIdx[1]
+ r.length = end
return []byte{}, r.length
}
func (*removeTag) HasClose(b []byte) bool {
- return closeRemove.FindIndex(b) != nil
+ return bytes.Contains(b, closeRemove)
}
func (*removeTag) GetClosePosition(b []byte) int {
- if idx := closeRemove.FindIndex(b); idx != nil {
- return idx[1]
- }
-
- return 0
+ return closeEnd(b, closeRemove)
}
diff --git a/esi/scanner.go b/esi/scanner.go
new file mode 100644
index 0000000..1ab8019
--- /dev/null
+++ b/esi/scanner.go
@@ -0,0 +1,225 @@
+package esi
+
+import (
+ "bytes"
+ "net/http"
+)
+
+var (
+ esiPrefix = []byte("= 'a' && b[n] <= 'z' {
+ n++
+ }
+
+ return b[:n], n < len(b)
+}
+
+func newTag(name []byte) Tag {
+ switch string(name) {
+ case comment:
+ return &commentTag{baseTag: newBaseTag()}
+ case choose:
+ return &chooseTag{baseTag: newBaseTag()}
+ case escape:
+ return &escapeTag{baseTag: newBaseTag()}
+ case include:
+ return &includeTag{baseTag: newBaseTag()}
+ case remove:
+ return &removeTag{baseTag: newBaseTag()}
+ case vars:
+ return &varsTag{baseTag: newBaseTag()}
+ default:
+ return nil
+ }
+}
+
+// needsLookahead reports whether the closing sequence of t may extend beyond
+// its first match (e.g. trailing whitespace), in which case a match ending at
+// the very end of a non-final buffer must wait for more data.
+func needsLookahead(t Tag) bool {
+ _, ok := t.(*commentTag)
+
+ return ok
+}
+
+// isAsync reports whether processing t may block on I/O and is therefore
+// worth running concurrently.
+func isAsync(t Tag, body []byte) bool {
+ switch t.(type) {
+ case *includeTag:
+ return true
+ case *chooseTag:
+ return bytes.Contains(body, includePrefix)
+ default:
+ return false
+ }
+}
+
+// scan walks b, sending static content and complete tags to s in document
+// order, and returns the number of bytes consumed. When final is false it
+// stops before the first construct that may still be incomplete so the caller
+// can retry once more data is available.
+func scan(b []byte, final bool, s sink) int {
+ pos := 0
+
+ for pos < len(b) {
+ rest := b[pos:]
+
+ i, kind := nextTagStart(rest, final)
+ if kind == kindNone {
+ s.static(rest)
+
+ return len(b)
+ }
+
+ if i > 0 {
+ s.static(rest[:i])
+ }
+
+ pos += i
+ if kind == kindPartial {
+ return pos
+ }
+
+ rest = rest[i:]
+
+ var (
+ t Tag
+ prefix int
+ )
+
+ if kind == kindEscape {
+ t, prefix = &escapeTag{baseTag: newBaseTag()}, len(escapePrefix)
+ } else {
+ name, complete := readTagName(rest[len(esiPrefix):])
+ if !complete && !final {
+ return pos
+ }
+
+ if t = newTag(name); t == nil {
+ // Unsupported tag: emit the opening sequence verbatim.
+ s.static(rest[:len(esiPrefix)])
+ pos += len(esiPrefix)
+
+ continue
+ }
+
+ prefix = len(esiPrefix)
+ }
+
+ end := t.GetClosePosition(rest)
+ if end == 0 || (!final && end == len(rest) && needsLookahead(t)) {
+ if !final {
+ return pos
+ }
+
+ // Unclosed tag at the end of the document: drop the remainder.
+ return len(b)
+ }
+
+ s.tag(t, rest[prefix:end])
+ pos += end
+ }
+
+ return pos
+}
+
+// process runs t on body. A panic in a tag implementation is contained so it
+// cannot take down the whole process when running in its own goroutine.
+func process(t Tag, body []byte, req *http.Request) (out []byte) {
+ defer func() {
+ if recover() != nil {
+ out = nil
+ }
+ }()
+
+ out, _ = t.Process(body, req)
+
+ return out
+}
+
+func isSpace(c byte) bool {
+ return c == ' ' || c == '\n'
+}
+
+// findClose locates the first occurrence of lit in b, extended backwards over
+// the spaces and newlines preceding it. It is the byte-level equivalent of the
+// leftmost match of `((\n| +)+)?lit`, without the regexp engine cost.
+func findClose(b, lit []byte) (start, end int) {
+ i := bytes.Index(b, lit)
+ if i == -1 {
+ return -1, -1
+ }
+
+ start = i
+ for start > 0 && isSpace(b[start-1]) {
+ start--
+ }
+
+ return start, i + len(lit)
+}
+
+// closeEnd returns the end of the first occurrence of lit in b, or 0.
+func closeEnd(b, lit []byte) int {
+ if i := bytes.Index(b, lit); i != -1 {
+ return i + len(lit)
+ }
+
+ return 0
+}
diff --git a/esi/stream.go b/esi/stream.go
new file mode 100644
index 0000000..074ad51
--- /dev/null
+++ b/esi/stream.go
@@ -0,0 +1,331 @@
+package esi
+
+import (
+ "bytes"
+ "context"
+ "errors"
+ "io"
+ "net/http"
+ "sync"
+)
+
+// ErrClosed is returned when writing to a closed Stream.
+var ErrClosed = errors.New("esi: write to closed stream")
+
+// result is the output of a tag processed concurrently.
+type result struct {
+ done chan struct{}
+ data []byte
+}
+
+// segment is a piece of output: either ready bytes or a pending result.
+type segment struct {
+ data []byte
+ async *result
+}
+
+// queue is an unbounded FIFO between the producer (Write) and the output
+// goroutine. Being unbounded, the producer never blocks so every include is
+// started as soon as it is parsed. Batches are swapped between two slices so
+// the steady state does not allocate.
+type queue struct {
+ mu sync.Mutex
+ items []segment
+ closed bool
+ notify chan struct{}
+}
+
+func (q *queue) push(s segment) {
+ q.mu.Lock()
+ q.items = append(q.items, s)
+ q.mu.Unlock()
+ q.wake()
+}
+
+func (q *queue) close() {
+ q.mu.Lock()
+ q.closed = true
+ q.mu.Unlock()
+ q.wake()
+}
+
+func (q *queue) wake() {
+ select {
+ case q.notify <- struct{}{}:
+ default:
+ }
+}
+
+// take returns every queued segment, reusing buf as the next backing array of
+// the queue. It calls idle before blocking and returns false once the queue
+// is closed and drained.
+func (q *queue) take(buf []segment, idle func()) ([]segment, bool) {
+ for {
+ q.mu.Lock()
+ if len(q.items) > 0 {
+ batch := q.items
+ q.items = buf[:0]
+ q.mu.Unlock()
+
+ return batch, true
+ }
+
+ closed := q.closed
+ q.mu.Unlock()
+
+ if closed {
+ return buf, false
+ }
+
+ idle()
+ <-q.notify
+ }
+}
+
+// Stream processes ESI tags on the fly. Data written to it is scanned
+// incrementally: static content is forwarded as soon as possible, include
+// tags are fetched concurrently and their output is written in document
+// order. Close must be called once the input is complete; it waits for the
+// pending tags and returns the first error encountered while writing.
+//
+// Write, Flush and Close must not be called concurrently.
+type Stream struct {
+ dst io.Writer
+ req *http.Request
+ cancel context.CancelFunc
+
+ // buf holds the unprocessed tail of the input (an incomplete tag).
+ buf []byte
+ // pending accumulates static output not yet handed to the queue.
+ pending []byte
+
+ // q is nil until the first concurrent tag. Until then output is written
+ // synchronously by the caller, without copying.
+ q *queue
+ done chan struct{}
+
+ dirty bool // written since the last flush; owned by the writing goroutine.
+ closed bool
+
+ // err is the first write error. It is guarded by a mutex rather than an
+ // atomic.Pointer because Traefik's Yaegi interpreter cannot handle generic
+ // standard library types.
+ errMu sync.Mutex
+ err error
+}
+
+// NewStream returns a Stream writing the processed document to dst. The
+// context of req bounds the lifetime of the include requests. If dst
+// implements http.Flusher (or Flush() error), it is flushed whenever the
+// output has to wait for a tag or for more input.
+func NewStream(dst io.Writer, req *http.Request) *Stream {
+ ctx, cancel := context.WithCancel(req.Context())
+
+ return &Stream{
+ dst: dst,
+ req: req.WithContext(ctx),
+ cancel: cancel,
+ }
+}
+
+// Write processes p. It never blocks on include requests.
+func (s *Stream) Write(p []byte) (int, error) {
+ if s.closed {
+ return 0, ErrClosed
+ }
+
+ if err := s.loadErr(); err != nil {
+ return 0, err
+ }
+
+ data := p
+ if len(s.buf) > 0 {
+ s.buf = append(s.buf, p...)
+ data = s.buf
+ }
+
+ n := scan(data, false, s)
+ // Keep the unprocessed tail. copy handles the overlap when data is s.buf.
+ s.buf = append(s.buf[:0], data[n:]...)
+ s.flushPending()
+
+ return len(p), s.loadErr()
+}
+
+// Flush forwards the processed output to the destination as soon as possible.
+func (s *Stream) Flush() {
+ if s.closed {
+ return
+ }
+
+ if s.q == nil {
+ s.flush()
+
+ return
+ }
+
+ // The output goroutine flushes when it becomes idle.
+ s.flushPending()
+}
+
+// Close processes the remaining input, waits for the pending tags and
+// releases the resources. It is safe to call it more than once.
+func (s *Stream) Close() error {
+ if s.closed {
+ return s.loadErr()
+ }
+
+ s.closed = true
+
+ if len(s.buf) > 0 {
+ scan(s.buf, true, s)
+ s.buf = nil
+ }
+
+ if s.q != nil {
+ s.flushPending()
+ s.q.close()
+ <-s.done
+ }
+
+ s.cancel()
+
+ return s.loadErr()
+}
+
+func (s *Stream) static(b []byte) {
+ if len(b) == 0 {
+ return
+ }
+
+ if s.q == nil {
+ s.write(b)
+
+ return
+ }
+
+ s.pending = append(s.pending, b...)
+}
+
+func (s *Stream) tag(t Tag, body []byte) {
+ if !isAsync(t, body) {
+ s.static(process(t, body, s.req))
+
+ return
+ }
+
+ if s.q == nil {
+ s.q = &queue{notify: make(chan struct{}, 1)}
+ s.done = make(chan struct{})
+
+ go s.run()
+ }
+
+ s.flushPending()
+
+ r := &result{done: make(chan struct{})}
+ body = bytes.Clone(body)
+
+ go func() {
+ defer close(r.done)
+
+ r.data = process(t, body, s.req)
+ }()
+
+ s.q.push(segment{async: r})
+}
+
+func (s *Stream) flushPending() {
+ if s.q != nil && len(s.pending) > 0 {
+ s.q.push(segment{data: s.pending})
+ s.pending = nil
+ }
+}
+
+// run writes the queued segments in order until the queue is closed.
+func (s *Stream) run() {
+ defer close(s.done)
+
+ var batch []segment
+
+ for {
+ var ok bool
+ if batch, ok = s.q.take(batch, s.flush); !ok {
+ return
+ }
+
+ for i := range batch {
+ seg := &batch[i]
+ if r := seg.async; r != nil {
+ select {
+ case <-r.done:
+ default:
+ s.flush()
+ <-r.done
+ }
+
+ seg.data = r.data
+ }
+
+ s.write(seg.data)
+ }
+
+ // Release the references (the clear builtin is unknown to Yaegi).
+ for i := range batch {
+ batch[i] = segment{}
+ }
+ }
+}
+
+func (s *Stream) write(b []byte) {
+ if len(b) == 0 || s.loadErr() != nil {
+ return
+ }
+
+ if _, err := s.dst.Write(b); err != nil {
+ s.setErr(err)
+ // Nobody will read the output anymore: abort the pending includes.
+ s.cancel()
+
+ return
+ }
+
+ s.dirty = true
+}
+
+func (s *Stream) flush() {
+ if !s.dirty || s.loadErr() != nil {
+ return
+ }
+
+ s.dirty = false
+
+ switch f := s.dst.(type) {
+ case http.Flusher:
+ f.Flush()
+ case interface{ Flush() error }:
+ if err := f.Flush(); err != nil {
+ s.setErr(err)
+ s.cancel()
+ }
+ }
+}
+
+func (s *Stream) loadErr() error {
+ s.errMu.Lock()
+ defer s.errMu.Unlock()
+
+ return s.err
+}
+
+// setErr records err unless an error was already recorded.
+func (s *Stream) setErr(err error) {
+ s.errMu.Lock()
+ defer s.errMu.Unlock()
+
+ if s.err == nil {
+ s.err = err
+ }
+}
+
+var _ io.WriteCloser = (*Stream)(nil)
diff --git a/esi/stream_test.go b/esi/stream_test.go
new file mode 100644
index 0000000..bf28cad
--- /dev/null
+++ b/esi/stream_test.go
@@ -0,0 +1,294 @@
+package esi_test
+
+import (
+ "bytes"
+ "errors"
+ "fmt"
+ "net/http"
+ "net/http/httptest"
+ "slices"
+ "strings"
+ "sync"
+ "testing"
+ "time"
+
+ "github.com/darkweak/go-esi/esi"
+)
+
+// offline exercises every tag that does not need the network, including
+// unsupported tags and constructs straddling chunk boundaries.
+const offline = `Hello from $(HTTP_HOST)
+
+
+
+before
www.example.comafter
+unsupported
+$(HTTP_COOKIE{missing}|'fallback') $(QUERY_STRING{q})
+< esi not a tag `
+
+func streamInChunks(t *testing.T, input []byte, req *http.Request, chunks ...int) string {
+ t.Helper()
+
+ var out bytes.Buffer
+
+ s := esi.NewStream(&out, req)
+
+ for _, n := range chunks {
+ n = min(n, len(input))
+ if _, err := s.Write(input[:n]); err != nil {
+ t.Fatal(err)
+ }
+
+ input = input[n:]
+ }
+
+ if _, err := s.Write(input); err != nil {
+ t.Fatal(err)
+ }
+
+ if err := s.Close(); err != nil {
+ t.Fatal(err)
+ }
+
+ return out.String()
+}
+
+func Test_Stream_offline_everySplit(t *testing.T) {
+ t.Parallel()
+
+ input := []byte(offline)
+ req := getRequest()
+ want := string(esi.Parse(bytes.Clone(input), req))
+
+ for i := range len(input) + 1 {
+ if got := streamInChunks(t, input, req, i); got != want {
+ t.Fatalf("split at %d:\nwant:\n%s\ngot:\n%s", i, want, got)
+ }
+ }
+
+ ones := make([]int, len(input))
+ for i := range ones {
+ ones[i] = 1
+ }
+
+ if got := streamInChunks(t, input, req, ones...); got != want {
+ t.Fatalf("byte by byte:\nwant:\n%s\ngot:\n%s", want, got)
+ }
+}
+
+func Test_Stream_fixtures(t *testing.T) {
+ t.Parallel()
+
+ for fixture, want := range expected {
+ if fixture == "vars" {
+ continue // needs a dedicated request, covered by the offline test.
+ }
+
+ input := loadFromFixtures(fixture)
+
+ ones := make([]int, len(input))
+ for i := range ones {
+ ones[i] = 1
+ }
+
+ for name, chunks := range map[string][]int{"whole": nil, "half": {len(input) / 2}, "byte by byte": ones} {
+ if got := streamInChunks(t, input, getRequest(), chunks...); got != want {
+ t.Errorf("%s (%s):\nwant:\n%s\ngot:\n%s", fixture, name, want, got)
+ }
+ }
+ }
+}
+
+// slowServer answers /?d= with after the delay.
+func slowServer(t *testing.T) *httptest.Server {
+ t.Helper()
+
+ srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ d, _ := time.ParseDuration(r.URL.Query().Get("d"))
+ time.Sleep(d)
+
+ _, _ = w.Write([]byte(strings.TrimPrefix(r.URL.Path, "/")))
+ }))
+ t.Cleanup(srv.Close)
+
+ return srv
+}
+
+func includes(srv *httptest.Server, n int, delay time.Duration) (doc, want string) {
+ var d, w strings.Builder
+ for i := range n {
+ fmt.Fprintf(&d, `[%d]`, i, srv.URL, i, delay)
+ fmt.Fprintf(&w, `[%d]inc%d`, i, i)
+ }
+
+ return d.String(), w.String()
+}
+
+func Test_Parse_parallel(t *testing.T) {
+ t.Parallel()
+
+ const (
+ n = 20
+ delay = 200 * time.Millisecond
+ )
+
+ srv := slowServer(t)
+ doc, want := includes(srv, n, delay)
+
+ start := time.Now()
+ got := string(esi.Parse([]byte(doc), httptest.NewRequest(http.MethodGet, srv.URL, nil)))
+ elapsed := time.Since(start)
+
+ if got != want {
+ t.Fatalf("want %q, got %q", want, got)
+ }
+
+ if elapsed > 3*delay {
+ t.Fatalf("%d includes of %s took %s, they are not processed in parallel", n, delay, elapsed)
+ }
+}
+
+func Test_Stream_parallel(t *testing.T) {
+ t.Parallel()
+
+ const (
+ n = 20
+ delay = 200 * time.Millisecond
+ )
+
+ srv := slowServer(t)
+ doc, want := includes(srv, n, delay)
+
+ start := time.Now()
+ got := streamInChunks(t, []byte(doc), httptest.NewRequest(http.MethodGet, srv.URL, nil), 7, 13, 50)
+ elapsed := time.Since(start)
+
+ if got != want {
+ t.Fatalf("want %q, got %q", want, got)
+ }
+
+ if elapsed > 3*delay {
+ t.Fatalf("%d includes of %s took %s, they are not processed in parallel", n, delay, elapsed)
+ }
+}
+
+// recorder records the writes and flushes with their timestamp.
+type recorder struct {
+ mu sync.Mutex
+ buf bytes.Buffer
+ flushed []string
+ first time.Time
+}
+
+func (r *recorder) Write(b []byte) (int, error) {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+
+ if r.first.IsZero() {
+ r.first = time.Now()
+ }
+
+ return r.buf.Write(b)
+}
+
+func (r *recorder) Flush() {
+ r.mu.Lock()
+ defer r.mu.Unlock()
+
+ r.flushed = append(r.flushed, r.buf.String())
+}
+
+func Test_Stream_flushesBeforeSlowInclude(t *testing.T) {
+ t.Parallel()
+
+ const delay = 300 * time.Millisecond
+
+ srv := slowServer(t)
+ rec := &recorder{}
+ s := esi.NewStream(rec, httptest.NewRequest(http.MethodGet, srv.URL, nil))
+ start := time.Now()
+
+ _, _ = s.Write([]byte(``))
+ _, _ = s.Write([]byte(``))
+
+ if err := s.Close(); err != nil {
+ t.Fatal(err)
+ }
+
+ if got, want := rec.buf.String(), "fastslow"; got != want {
+ t.Fatalf("want %q, got %q", want, got)
+ }
+
+ if rec.first.Sub(start) >= delay {
+ t.Fatal("the content before the slow include must be written without waiting for it")
+ }
+
+ if len(rec.flushed) == 0 || !strings.HasPrefix(rec.flushed[0], "") ||
+ strings.Contains(rec.flushed[0], "slow") {
+ t.Fatalf("the content preceding the slow include must be flushed while waiting, flushes: %q", rec.flushed)
+ }
+}
+
+type failingWriter struct{}
+
+var errBroken = errors.New("broken pipe")
+
+func (failingWriter) Write([]byte) (int, error) { return 0, errBroken }
+
+func Test_Stream_writeError(t *testing.T) {
+ t.Parallel()
+
+ s := esi.NewStream(failingWriter{}, getRequest())
+ if _, err := s.Write([]byte("hello")); !errors.Is(err, errBroken) {
+ t.Fatalf("want %v, got %v", errBroken, err)
+ }
+
+ if err := s.Close(); !errors.Is(err, errBroken) {
+ t.Fatalf("want %v, got %v", errBroken, err)
+ }
+
+ if _, err := s.Write([]byte("x")); !errors.Is(err, esi.ErrClosed) {
+ t.Fatalf("want %v, got %v", esi.ErrClosed, err)
+ }
+}
+
+func BenchmarkStreamFull(b *testing.B) {
+ input := []byte(full)
+
+ for b.Loop() {
+ s := esi.NewStream(&bytes.Buffer{}, httptest.NewRequest(http.MethodGet, "http://domain.com:9080", nil))
+ _, _ = s.Write(input[:len(input)/2])
+ _, _ = s.Write(input[len(input)/2:])
+ _ = s.Close()
+ }
+}
+
+var offlineBig = bytes.Repeat([]byte(offline), 200)
+
+func BenchmarkParseOffline(b *testing.B) {
+ req := getRequest()
+
+ b.SetBytes(int64(len(offlineBig)))
+
+ for b.Loop() {
+ esi.Parse(offlineBig, req)
+ }
+}
+
+func BenchmarkStreamOffline(b *testing.B) {
+ req := getRequest()
+
+ b.SetBytes(int64(len(offlineBig)))
+
+ for b.Loop() {
+ s := esi.NewStream(&bytes.Buffer{}, req)
+ for chunk := range slices.Chunk(offlineBig, 4096) {
+ _, _ = s.Write(chunk)
+ }
+
+ _ = s.Close()
+ }
+}
diff --git a/esi/tags.go b/esi/tags.go
deleted file mode 100644
index 81740c8..0000000
--- a/esi/tags.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package esi
-
-import "regexp"
-
-const try = "try"
-
-var (
- esi = regexp.MustCompile("")
+ varPrefix = []byte("$(")
+ closeVars = []byte("")
)
func parseVariables(b []byte, req *http.Request) string {
@@ -78,26 +80,33 @@ type varsTag struct {
// Input (e.g. comment text="This is a comment." />).
func (c *varsTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeVars.FindIndex(b)
- if found == nil {
+ closeStart, end := findClose(b, closeVars)
+ if closeStart == -1 {
return nil, len(b)
}
- c.length = found[1]
+ c.length = end
- return interpretedVar.ReplaceAllFunc(b[5:found[0]], func(b []byte) []byte {
+ // Skip the "vars>" remainder of the opening tag (the min builtin is unknown to Yaegi).
+ contentStart := len(vars) + 1
+ if contentStart > closeStart { //nolint:modernize // Yaegi (Traefik) does not support the min builtin.
+ contentStart = closeStart
+ }
+
+ content := b[contentStart:closeStart]
+ if !bytes.Contains(content, varPrefix) {
+ return content, c.length
+ }
+
+ return interpretedVar.ReplaceAllFunc(content, func(b []byte) []byte {
return []byte(parseVariables(b, req))
}), c.length
}
func (*varsTag) HasClose(b []byte) bool {
- return closeVars.FindIndex(b) != nil
+ return bytes.Contains(b, closeVars)
}
func (*varsTag) GetClosePosition(b []byte) int {
- if idx := closeVars.FindIndex(b); idx != nil {
- return idx[1]
- }
-
- return 0
+ return closeEnd(b, closeVars)
}
diff --git a/esi/when.go b/esi/when.go
index b4573de..e26968d 100644
--- a/esi/when.go
+++ b/esi/when.go
@@ -23,6 +23,7 @@ func validateTest(b []byte, req *http.Request) bool {
} else if r := comparison.FindSubmatch(b); r != nil {
r1 := strings.TrimSpace(parseVariables(r[1], req))
r2 := strings.TrimSpace(parseVariables(r[3], req))
+
switch string(r[2]) {
case "==":
return r1 == r2
diff --git a/go.mod b/go.mod
index 1524e8d..529ab09 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
module github.com/darkweak/go-esi
-go 1.19
+go 1.27.0
diff --git a/middleware/caddy/Makefile b/middleware/caddy/Makefile
index 443c265..5f7860c 100644
--- a/middleware/caddy/Makefile
+++ b/middleware/caddy/Makefile
@@ -3,7 +3,7 @@
build: ## Build caddy binary
go mod tidy
go mod download
- xcaddy build --with github.com/darkweak/go-esi@latest=../.. --with github.com/darkweak/go-esi/middleware/caddy=./
+ xcaddy build --with github.com/darkweak/go-esi=../.. --with github.com/darkweak/go-esi/middleware/caddy=./
run: ## Run caddy with go-esi
./caddy run
\ No newline at end of file
diff --git a/middleware/caddy/esi.go b/middleware/caddy/esi.go
index c643d8f..075062e 100644
--- a/middleware/caddy/esi.go
+++ b/middleware/caddy/esi.go
@@ -1,9 +1,8 @@
package caddy_esi
import (
- "bytes"
+ "errors"
"net/http"
- "sync"
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
@@ -12,12 +11,6 @@ import (
"github.com/darkweak/go-esi/writer"
)
-var bufPool *sync.Pool = &sync.Pool{
- New: func() any {
- return &bytes.Buffer{}
- },
-}
-
func init() {
caddy.RegisterModule(ESI{})
httpcaddyfile.RegisterGlobalOption("esi", func(h *caddyfile.Dispenser, _ interface{}) (interface{}, error) {
@@ -41,38 +34,10 @@ func (ESI) CaddyModule() caddy.ModuleInfo {
// ServeHTTP implements caddyhttp.MiddlewareHandler
func (e *ESI) ServeHTTP(rw http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
- buf := bufPool.Get().(*bytes.Buffer)
- buf.Reset()
- defer bufPool.Put(buf)
- cw := writer.NewWriter(buf, rw, r)
- go func(w *writer.Writer) {
- var i = 0
- for {
- if len(w.AsyncBuf) <= i {
- continue
- }
- rs := <-w.AsyncBuf[i]
- if rs == nil {
- w.Done <- true
- break
- }
- _, _ = rw.Write(rs)
- i++
- }
- }(cw)
- next.ServeHTTP(cw, r)
- cw.Header().Del("Content-Length")
- if cw.Rq.ProtoMajor == 1 {
- cw.Header().Set("Content-Encoding", "chunked")
- }
- cw.AsyncBuf = append(cw.AsyncBuf, make(chan []byte))
- go func(w *writer.Writer, iteration int) {
- w.AsyncBuf[iteration] <- nil
- }(cw, cw.Iteration)
+ cw := writer.NewWriter(rw, r)
+ err := next.ServeHTTP(cw, r)
- <-cw.Done
-
- return nil
+ return errors.Join(err, cw.Close())
}
// Provision implements caddy.Provisioner
diff --git a/middleware/caddy/go.mod b/middleware/caddy/go.mod
index 1e5bd77..d0aa9fb 100644
--- a/middleware/caddy/go.mod
+++ b/middleware/caddy/go.mod
@@ -1,140 +1,176 @@
module github.com/darkweak/go-esi/middleware/caddy
-go 1.19
+go 1.27.0
require (
- github.com/caddyserver/caddy/v2 v2.6.4
- github.com/darkweak/go-esi v0.0.6
+ github.com/caddyserver/caddy/v2 v2.11.9
+ github.com/darkweak/go-esi v0.0.7
)
require (
- filippo.io/edwards25519 v1.0.0 // indirect
+ cel.dev/cel-go v0.32.0 // indirect
+ cel.dev/expr v0.25.3 // indirect
+ cloud.google.com/go/auth v0.23.3 // indirect
+ cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+ cloud.google.com/go/compute/metadata v0.9.1 // indirect
+ dario.cat/mergo v1.0.2 // indirect
+ filippo.io/bigmod v0.1.0 // indirect
+ filippo.io/edwards25519 v1.2.0 // indirect
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
- github.com/BurntSushi/toml v1.2.1 // indirect
+ github.com/BurntSushi/toml v1.6.0 // indirect
+ github.com/DeRuina/timberjack v1.4.8 // indirect
+ github.com/KimMachineGun/automemlimit v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
- github.com/Masterminds/semver/v3 v3.2.0 // indirect
- github.com/Masterminds/sprig/v3 v3.2.3 // indirect
- github.com/Microsoft/go-winio v0.6.0 // indirect
- github.com/alecthomas/chroma/v2 v2.5.0 // indirect
- github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+ github.com/Masterminds/semver/v3 v3.5.0 // indirect
+ github.com/Masterminds/sprig/v3 v3.3.0 // indirect
+ github.com/alecthomas/chroma/v2 v2.27.0 // indirect
+ github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
github.com/beorn7/perks v1.0.1 // indirect
- github.com/caddyserver/certmagic v0.17.2 // indirect
- github.com/cenkalti/backoff/v4 v4.1.2 // indirect
+ github.com/bits-and-blooms/bitset v1.25.0 // indirect
+ github.com/caddyserver/certmagic v0.25.6 // indirect
+ github.com/caddyserver/zerossl v0.1.6 // indirect
+ github.com/ccoveille/go-safecast/v2 v2.0.1 // indirect
+ github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
- github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chzyer/readline v1.5.1 // indirect
- github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+ github.com/cloudflare/circl v1.6.5 // indirect
+ github.com/coreos/go-oidc/v3 v3.21.0 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
github.com/dgraph-io/badger v1.6.2 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
- github.com/dgraph-io/ristretto v0.1.1 // indirect
- github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
- github.com/dlclark/regexp2 v1.7.0 // indirect
- github.com/dustin/go-humanize v1.0.1 // indirect
- github.com/felixge/httpsnoop v1.0.3 // indirect
- github.com/fxamacker/cbor/v2 v2.4.0 // indirect
- github.com/go-chi/chi v4.1.2+incompatible // indirect
- github.com/go-kit/kit v0.12.0 // indirect
- github.com/go-kit/log v0.2.1 // indirect
- github.com/go-logfmt/logfmt v0.6.0 // indirect
- github.com/go-logr/logr v1.2.3 // indirect
+ github.com/dgraph-io/ristretto v0.2.0 // indirect
+ github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
+ github.com/dlclark/regexp2/v2 v2.8.0 // indirect
+ github.com/dunglas/go-urlpattern v1.0.0 // indirect
+ github.com/dunglas/httpsfv v1.1.1 // indirect
+ github.com/dustin/go-humanize v1.1.0 // indirect
+ github.com/felixge/httpsnoop v1.1.0 // indirect
+ github.com/fxamacker/cbor/v2 v2.9.4 // indirect
+ github.com/go-chi/chi/v5 v5.4.0 // indirect
+ github.com/go-jose/go-jose/v3 v3.0.5 // indirect
+ github.com/go-jose/go-jose/v4 v4.1.6 // indirect
+ github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
- github.com/go-sql-driver/mysql v1.7.0 // indirect
- github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
- github.com/golang/glog v1.1.1 // indirect
- github.com/golang/mock v1.6.0 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
- github.com/golang/snappy v0.0.4 // indirect
- github.com/google/cel-go v0.13.0 // indirect
- github.com/google/pprof v0.0.0-20230309165930-d61513b1440d // indirect
- github.com/google/uuid v1.3.0 // indirect
- github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
- github.com/huandu/xstrings v1.4.0 // indirect
- github.com/imdario/mergo v0.3.14 // indirect
+ github.com/go-sql-driver/mysql v1.10.1 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
+ github.com/golang/snappy v1.0.0 // indirect
+ github.com/google/certificate-transparency-go v1.3.3 // indirect
+ github.com/google/go-tpm v0.9.8 // indirect
+ github.com/google/go-tspi v0.3.0 // indirect
+ github.com/google/s2a-go v0.1.10 // indirect
+ github.com/google/uuid v1.6.0 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.3.22 // indirect
+ github.com/googleapis/gax-go/v2 v2.25.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect
+ github.com/huandu/xstrings v1.6.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
- github.com/jackc/chunkreader/v2 v2.0.1 // indirect
- github.com/jackc/pgconn v1.14.0 // indirect
- github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
- github.com/jackc/pgproto3/v2 v2.3.2 // indirect
- github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
- github.com/jackc/pgtype v1.14.0 // indirect
- github.com/jackc/pgx/v4 v4.18.1 // indirect
- github.com/klauspost/compress v1.16.3 // indirect
- github.com/klauspost/cpuid/v2 v2.2.4 // indirect
- github.com/libdns/libdns v0.2.1 // indirect
+ github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+ github.com/jackc/pgx/v5 v5.11.0 // indirect
+ github.com/jackc/puddle/v2 v2.2.2 // indirect
+ github.com/klauspost/compress v1.20.1 // indirect
+ github.com/klauspost/cpuid/v2 v2.4.0 // indirect
+ github.com/libdns/libdns v1.1.1 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
- github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.18 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/mattn/go-colorable v0.1.15 // indirect
+ github.com/mattn/go-isatty v0.0.24 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
- github.com/mholt/acmez v1.1.0 // indirect
- github.com/micromdm/scep/v2 v2.1.0 // indirect
- github.com/miekg/dns v1.1.52 // indirect
+ github.com/mholt/acmez/v3 v3.1.7 // indirect
+ github.com/miekg/dns v1.1.73 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
- github.com/onsi/ginkgo/v2 v2.9.1 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/nlnwa/whatwg-url v0.6.2 // indirect
+ github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+ github.com/pires/go-proxyproto v0.15.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/client_golang v1.14.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.42.0 // indirect
- github.com/prometheus/procfs v0.9.0 // indirect
- github.com/quic-go/qpack v0.4.0 // indirect
- github.com/quic-go/qtls-go1-19 v0.3.0 // indirect
- github.com/quic-go/qtls-go1-20 v0.2.0 // indirect
- github.com/quic-go/quic-go v0.33.0 // indirect
- github.com/rs/xid v1.4.0 // indirect
+ github.com/prometheus/client_golang v1.24.1 // indirect
+ github.com/prometheus/client_model v0.6.3 // indirect
+ github.com/prometheus/common v0.71.0 // indirect
+ github.com/prometheus/otlptranslator v1.0.0 // indirect
+ github.com/prometheus/procfs v0.22.0 // indirect
+ github.com/quic-go/qpack v0.6.0 // indirect
+ github.com/quic-go/quic-go v0.63.0 // indirect
+ github.com/rs/xid v1.6.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
- github.com/shopspring/decimal v1.3.1 // indirect
+ github.com/shopspring/decimal v1.4.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
- github.com/sirupsen/logrus v1.9.0 // indirect
- github.com/slackhq/nebula v1.6.1 // indirect
- github.com/smallstep/certificates v0.23.2 // indirect
- github.com/smallstep/nosql v0.6.0 // indirect
- github.com/smallstep/truststore v0.12.1 // indirect
- github.com/spf13/cast v1.5.0 // indirect
- github.com/spf13/cobra v1.6.1 // indirect
- github.com/spf13/pflag v1.0.5 // indirect
- github.com/stoewer/go-strcase v1.2.1 // indirect
- github.com/tailscale/tscert v0.0.0-20230124224810-c6dc1f4049b2 // indirect
- github.com/urfave/cli v1.22.12 // indirect
+ github.com/sirupsen/logrus v1.10.2 // indirect
+ github.com/slackhq/nebula v1.11.2 // indirect
+ github.com/smallstep/certificates v0.30.2 // indirect
+ github.com/smallstep/cli-utils v0.12.2 // indirect
+ github.com/smallstep/go-attestation v0.4.4-0.20260814222900-a849f4e2cd68 // indirect
+ github.com/smallstep/linkedca v0.26.0 // indirect
+ github.com/smallstep/nosql v0.8.0 // indirect
+ github.com/smallstep/pkcs7 v0.2.3 // indirect
+ github.com/smallstep/scep v0.0.0-20260331191114-261f960a40d1 // indirect
+ github.com/smallstep/truststore v0.13.0 // indirect
+ github.com/spf13/cast v1.10.0 // indirect
+ github.com/spf13/cobra v1.10.2 // indirect
+ github.com/spf13/pflag v1.0.10 // indirect
+ github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
+ github.com/tailscale/tscert v0.0.0-20251216020129-aea342f6d747 // indirect
+ github.com/urfave/cli v1.22.17 // indirect
github.com/x448/float16 v0.8.4 // indirect
- github.com/yuin/goldmark v1.5.4 // indirect
- github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87 // indirect
- go.etcd.io/bbolt v1.3.7 // indirect
- go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect
- go.opentelemetry.io/otel v1.13.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0 // indirect
- go.opentelemetry.io/otel/metric v0.36.0 // indirect
- go.opentelemetry.io/otel/sdk v1.13.0 // indirect
- go.opentelemetry.io/otel/trace v1.13.0 // indirect
- go.opentelemetry.io/proto/otlp v0.12.0 // indirect
- go.step.sm/cli-utils v0.7.5 // indirect
- go.step.sm/crypto v0.27.0 // indirect
- go.step.sm/linkedca v0.19.0 // indirect
- go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.10.0 // indirect
- go.uber.org/zap v1.24.0 // indirect
- golang.org/x/crypto v0.7.0 // indirect
- golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
- golang.org/x/mod v0.9.0 // indirect
- golang.org/x/net v0.8.0 // indirect
- golang.org/x/sync v0.1.0 // indirect
- golang.org/x/sys v0.6.0 // indirect
- golang.org/x/term v0.6.0 // indirect
- golang.org/x/text v0.8.0 // indirect
- golang.org/x/tools v0.7.0 // indirect
- google.golang.org/genproto v0.0.0-20230322174352-cde4c949918d // indirect
- google.golang.org/grpc v1.54.0 // indirect
- google.golang.org/protobuf v1.30.0 // indirect
- gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
- gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+ github.com/yuin/goldmark v1.8.6 // indirect
+ github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
+ github.com/zeebo/blake3 v0.2.4 // indirect
+ go.etcd.io/bbolt v1.5.0 // indirect
+ go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+ go.opentelemetry.io/contrib/bridges/prometheus v0.71.0 // indirect
+ go.opentelemetry.io/contrib/exporters/autoexport v0.71.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 // indirect
+ go.opentelemetry.io/contrib/propagators/autoprop v0.71.0 // indirect
+ go.opentelemetry.io/contrib/propagators/aws v1.46.0 // indirect
+ go.opentelemetry.io/contrib/propagators/b3 v1.46.0 // indirect
+ go.opentelemetry.io/contrib/propagators/jaeger v1.46.0 // indirect
+ go.opentelemetry.io/contrib/propagators/ot v1.46.0 // indirect
+ go.opentelemetry.io/otel v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.22.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.22.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/prometheus v0.68.0 // indirect
+ go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.22.0 // indirect
+ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 // indirect
+ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 // indirect
+ go.opentelemetry.io/otel/log v0.22.0 // indirect
+ go.opentelemetry.io/otel/metric v1.46.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.46.0 // indirect
+ go.opentelemetry.io/otel/sdk/log v0.22.0 // indirect
+ go.opentelemetry.io/otel/sdk/metric v1.46.0 // indirect
+ go.opentelemetry.io/otel/trace v1.46.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.11.0 // indirect
+ go.step.sm/crypto v0.91.0 // indirect
+ go.uber.org/automaxprocs v1.6.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ go.uber.org/zap v1.28.0 // indirect
+ go.uber.org/zap/exp v0.3.0 // indirect
+ go.yaml.in/yaml/v3 v3.0.5 // indirect
+ golang.org/x/crypto v0.57.0 // indirect
+ golang.org/x/crypto/x509roots/fallback v0.0.0-20261030153154-30a33513ff6d // indirect
+ golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirect
+ golang.org/x/net v0.60.0 // indirect
+ golang.org/x/oauth2 v0.37.0 // indirect
+ golang.org/x/sync v0.23.0 // indirect
+ golang.org/x/sys v0.48.0 // indirect
+ golang.org/x/term v0.46.0 // indirect
+ golang.org/x/text v0.42.0 // indirect
+ golang.org/x/time v0.16.0 // indirect
+ google.golang.org/api v0.298.0 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 // indirect
+ google.golang.org/grpc v1.83.2 // indirect
+ google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect
+ google.golang.org/protobuf v1.36.12 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- howett.net/plist v1.0.0 // indirect
+ howett.net/plist v1.0.1 // indirect
)
-replace github.com/darkweak/go-esi v0.0.6 => ../..
+replace github.com/darkweak/go-esi v0.0.7 => ../..
diff --git a/middleware/caddy/go.sum b/middleware/caddy/go.sum
index 6d4c763..799620a 100644
--- a/middleware/caddy/go.sum
+++ b/middleware/caddy/go.sum
@@ -1,60 +1,109 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys=
-cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY=
-cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
-cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE=
-cloud.google.com/go/kms v1.9.0 h1:b0votJQa/9DSsxgHwN33/tTLA7ZHVzfWhDCrfiXijSo=
-filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
-filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk=
+cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU=
+cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0=
+cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
+cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
+cloud.google.com/go/auth v0.23.3 h1:UMK+oBtuNGMCR/6i6mmySUItqjOazpJrbmZyhGbGBWo=
+cloud.google.com/go/auth v0.23.3/go.mod h1:fClbry28fo7XkxhSeT6AQtAVAp6Jy0fW9N99PoPNPFM=
+cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
+cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
+cloud.google.com/go/compute/metadata v0.9.1 h1:CTE1OWBQ0vnF5uHwdFAQJvMQ0Fi/KRcqqKTo9V0F8Ik=
+cloud.google.com/go/compute/metadata v0.9.1/go.mod h1:NtnlvB6X3t4R6xSWyVX/ZWk493PCxGQlhI/iqxh4M8I=
+cloud.google.com/go/iam v1.12.0 h1:Aki3bX9aHUDKPHfnRJfDcTdVedvy6quGBQcTqx3DRXk=
+cloud.google.com/go/iam v1.12.0/go.mod h1:FEZ4lXpADAC2AIpQY7LANNjjwyQ2jK439CI2VaD+sLY=
+cloud.google.com/go/kms v1.33.0 h1:pG0X78m212b2pv9N4fdMoUO69LuZGQ9kSvn8sHBOFAo=
+cloud.google.com/go/kms v1.33.0/go.mod h1:CSGvW6GnMQbY+1nOHcIzhMtHSbExXlOmCKjWtYVjcpA=
+cloud.google.com/go/longrunning v1.2.0 h1:WjYH3YHBGCxGJP9M4dWGHBfXr/cFIjMkNgWcJj7/iMM=
+cloud.google.com/go/longrunning v1.2.0/go.mod h1:5KMQALFGOCtFoi2xSOA1u3H7WKlhmckgiyFw7+LGQp0=
+code.pfad.fr/check v1.1.0 h1:GWvjdzhSEgHvEHe2uJujDcpmZoySKuHQNrZMfzfO0bE=
+code.pfad.fr/check v1.1.0/go.mod h1:NiUH13DtYsb7xp5wll0U4SXx7KhXQVCtRgdC96IPfoM=
+dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
+dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
+filippo.io/bigmod v0.1.0 h1:UNzDk7y9ADKST+axd9skUpBQeW7fG2KrTZyOE4uGQy8=
+filippo.io/bigmod v0.1.0/go.mod h1:OjOXDNlClLblvXdwgFFOQFJEocLhhtai8vGLy0JCZlI=
+filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
+filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
+github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/DeRuina/timberjack v1.4.8 h1:V7SIoCzkyWD93WmyKECSX+tMu/hLqQQvptlhEsbBIhI=
+github.com/DeRuina/timberjack v1.4.8/go.mod h1:DCXjOescYyzTrOryf57SEbSeCOqkBQ3QjH7Pn03i5Cs=
+github.com/KimMachineGun/automemlimit v1.0.0 h1:+MqlvDE/pkJNjk1rU+O14QsH8k10nJAD0frB0lsxyvw=
+github.com/KimMachineGun/automemlimit v1.0.0/go.mod h1:n+BSXxQWDFS1DKh67Rqo0lgTsowsg6x65ak5uyngML0=
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
-github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
-github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA=
-github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA=
-github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM=
-github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
-github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
+github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
+github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
+github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
+github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
-github.com/alecthomas/chroma/v2 v2.5.0 h1:CQCdj1BiBV17sD4Bd32b/Bzuiq/EqoNTrnIhyQAZ+Rk=
-github.com/alecthomas/chroma/v2 v2.5.0/go.mod h1:yrkMI9807G1ROx13fhe1v6PN2DDeaR73L3d+1nmYQtw=
+github.com/alecthomas/chroma/v2 v2.27.0 h1:FodwmyOBgJULFYmDqibcp9pvfDLWdtPRh9v/r5BXYZs=
+github.com/alecthomas/chroma/v2 v2.27.0/go.mod h1:NjJ3ciIgrqBNeIkWZ4e46nseoLDslxU1LmfCoL+wcY8=
github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
-github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
-github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
+github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
+github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b h1:uUXgbcPDK3KpW29o4iy7GtuappbWT0l5NaMo9H9pJDw=
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
-github.com/aws/aws-sdk-go v1.44.220 h1:yAj99qAt0Htjle9Up3DglgHfOP77lmFPrElA4jKnrBo=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/aws/aws-sdk-go-v2 v1.47.0 h1:0jsHallhJCeaU0Ko48c/3FK1ctOQ7NpzggxriJOQ8MQ=
+github.com/aws/aws-sdk-go-v2 v1.47.0/go.mod h1:bttEH6JqnUL8LepvDVfdrds/fZ5bCIxzpe3abyUrhDU=
+github.com/aws/aws-sdk-go-v2/config v1.33.4 h1:FzvkXKSzwqHni4U7nDigHg4jjtqMpVUuHgmZfSoJVQ0=
+github.com/aws/aws-sdk-go-v2/config v1.33.4/go.mod h1:VZqGZnZsCWVfK/iGPptJIyNIX3XEX6iQU2Rel4sLrr8=
+github.com/aws/aws-sdk-go-v2/credentials v1.20.4 h1:hTvrJJseKbvw32kmiE0G+u/9ZqpqscjDrTigHIXP2qs=
+github.com/aws/aws-sdk-go-v2/credentials v1.20.4/go.mod h1:gWp9O1ZBWwpcIrgV+mVHk4gZUurAEDkgypu/OXOlIaw=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.0 h1:AM4hHjww+PSFtt6E+UrBrPlZkWsePCLEt9AjkfQX+yM=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.0/go.mod h1:3x/yXezeQjpOvBb4jEMxrS8SXvpdvJ5abv6l5c1gWM8=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.3 h1:Hp/VgjP0BysR3OgLlR057Vz2LcbbVnoWeJ+3qWiS/fY=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.3/go.mod h1:nwGV5qw7F1IZPgxCvA/ph8N2TAuz+BkRG/bXn808qMA=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.3 h1:MUaM4f+kj1ZIBPZfUS8cxP1GKXXZtHJjAthy93AN7SM=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.3/go.mod h1:6YmVmEVRI5ZZzRjCSsb9SryKH0hAlMRdgA7kG9aDvBU=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.3 h1:fuSCw4Z2qfRCztMPO3GXJNSiEp6Wee+WOLwrHHUMy9c=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.3/go.mod h1:6SxcHheD1pPR5+kWm1wGvjlL/YqUsh267sAfEmN4K7A=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 h1:bAdDl/HkGCcGPoe25ToSHEw23VIxt6CT5fLcg111BKg=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19/go.mod h1:KaUzbLxv4CeSxh6ZCl9B4m7CuFenS8kUEaDs+f/DQr4=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.3 h1:bON1rJf67TSTDCKg816AAIE4xSTtoo9tl0XRkO72R+I=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.3/go.mod h1:c5BBpjJcQXpfeq9iASyVKA3T6vX6B6LEXY4mL/gklDY=
+github.com/aws/aws-sdk-go-v2/service/kms v1.60.0 h1:O/xKUsrz7J69Q0yca9XeYxwgi+NbBVbxczcZWudJdU0=
+github.com/aws/aws-sdk-go-v2/service/kms v1.60.0/go.mod h1:/eZ9xj8IZyb7fj+/t3HO7x89X+7Vn+gCDDbQ2NHCVtM=
+github.com/aws/aws-sdk-go-v2/service/signin v1.10.0 h1:ZD5qFpWcaOKdTuhBi431pIDkCgrMkMlMT6jlpSPoIRI=
+github.com/aws/aws-sdk-go-v2/service/signin v1.10.0/go.mod h1:8Nuuf+tR346PjJ3MvZPh9pekbLiLQFWJhzMXfwy7alA=
+github.com/aws/aws-sdk-go-v2/service/sso v1.38.0 h1:JGeeBcMlhg1xtOXYpeCaTQBZObtXMPQCUqBcmr65NRA=
+github.com/aws/aws-sdk-go-v2/service/sso v1.38.0/go.mod h1:XwteswG9EOMRFm73UT0t+MbTwyLxMrEXkU6e+v92Lzo=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.0 h1:obhahQXDEdVEv8y5bTKXR30LVaxYe1kyYM0L7l2Iq+k=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.0/go.mod h1:6twZZ/aXHNy1vXUO8koUbp++MYzMASkOgEBdkbJYmO0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.50.0 h1:khXV3+K5D3f4e8xtplaRdSFn1bEg3gj5EBHQvbCOZbQ=
+github.com/aws/aws-sdk-go-v2/service/sts v1.50.0/go.mod h1:/8JRcdTt//hG0Q4BTmGbuOplT7ABe+5rdtqUHqXvYIM=
+github.com/aws/smithy-go v1.28.1 h1:R/nXH00c8qcfCzQVELtRw+eLQWtzv+VAIEFJ1/xxXlQ=
+github.com/aws/smithy-go v1.28.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
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/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/caddyserver/caddy/v2 v2.6.4 h1:2hwYqiRwk1tf3VruhMpLcYTg+11fCdr8S3jhNAdnPy8=
-github.com/caddyserver/caddy/v2 v2.6.4/go.mod h1:p/PqEgaIrg249zmTLdgNMnQO4mBQ8uWYdi+TDOPwejc=
-github.com/caddyserver/certmagic v0.17.2 h1:o30seC1T/dBqBCNNGNHWwj2i5/I/FMjBbTAhjADP3nE=
-github.com/caddyserver/certmagic v0.17.2/go.mod h1:ouWUuC490GOLJzkyN35eXfV8bSbwMwSf4bdhkIxtdQE=
-github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo=
-github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bits-and-blooms/bitset v1.25.0 h1:0Ro0qF4abCkM6SqWPVj29sFhAbMPAZpaDD7xhJ10beM=
+github.com/bits-and-blooms/bitset v1.25.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/caddyserver/caddy/v2 v2.11.9 h1:bhZtcRKQOq0fuLvEgCdPYvUxXyGn9kzjG4lh2332DTE=
+github.com/caddyserver/caddy/v2 v2.11.9/go.mod h1:jctG0eTy0tC4ST/Q7GIPKIfxox7mhSCtcwlwF82HLVM=
+github.com/caddyserver/certmagic v0.25.6 h1:vHMtFSLKTa6kuZz6w0SnRMpQ388tSkww8ye355BgAM4=
+github.com/caddyserver/certmagic v0.25.6/go.mod h1:xq6cRNimqW+Tv91XNc5lNHs2XYTsLhQhYiH01H4AySs=
+github.com/caddyserver/zerossl v0.1.6 h1:1yrhTx5DWi43wOJPQ+Y4mVl++EPmSqqT/4REW//lsas=
+github.com/caddyserver/zerossl v0.1.6/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
+github.com/ccoveille/go-safecast/v2 v2.0.1 h1:2+mIu3gXtwmWelBia2kkxfB8eP4orTHDH7ClSlWkd6I=
+github.com/ccoveille/go-safecast/v2 v2.0.1/go.mod h1:JIYA4CAR33blIDuE6fSwCp2sz1oOBahXnvmdBhOAABs=
+github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
+github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
@@ -64,28 +113,18 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cloudflare/circl v1.6.5 h1:O64F26HEqNhznd/hrC5KZXVKYuKM2rx4deZDTc4ihQA=
+github.com/cloudflare/circl v1.6.5/go.mod h1:h5LNyxAc5nTue9DS5jT+48en2PSDYt3zdGnz5OstK6c=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-oidc/v3 v3.21.0 h1:wZo4Q9Pum8dYEj0eMUPrqR+kvuGkeUplbLpNCkBqoWM=
+github.com/coreos/go-oidc/v3 v3.21.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
+github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8=
github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE=
@@ -93,580 +132,456 @@ github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdw
github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk=
github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
-github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
-github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
+github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE=
+github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU=
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da h1:aIftn67I1fkbMa512G+w+Pxci9hJPB8oMnkcP3iZF38=
+github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2/v2 v2.8.0 h1:CekDhPLGfm+GAJmPVFIG+5dqMIQPkyHJll7BbdneDfw=
+github.com/dlclark/regexp2/v2 v2.8.0/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU=
+github.com/dunglas/go-urlpattern v1.0.0 h1:AmMwIDXWJFezeE1v38rxvQRGvvzTlityFuifLLVfoQQ=
+github.com/dunglas/go-urlpattern v1.0.0/go.mod h1:9qyjDljBPOWyWCGz7vo3Ek7cdnoG/DVk0Ucle7gWVS8=
+github.com/dunglas/httpsfv v1.1.1 h1:HoSs101zIE9I23DlqlmljJ/OIi7ILwrH347pXhRZdxI=
+github.com/dunglas/httpsfv v1.1.1/go.mod h1:zID2mqw9mFsnt7YC3vYQ9/cjq30q41W+1AnDwH8TiMg=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg=
+github.com/dustin/go-humanize v1.1.0/go.mod h1:hc1CvRkJMsgxqjmjMQF3QNRAZBwY8AXBAzKYoSX9sFI=
+github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc=
+github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
-github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
-github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-kit/kit v0.4.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4=
-github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
-github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
-github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo=
+github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-chi/chi/v5 v5.4.0 h1:+ufzvFTGKyin26Or5DLrlIDq4ygIDBVcj7oVNeeaYFE=
+github.com/go-chi/chi/v5 v5.4.0/go.mod h1:d1IG7GtKPSjPyBP365PH8sAGVHk3qfB/IhjFNRH1wWM=
+github.com/go-jose/go-jose/v3 v3.0.5 h1:BLLJWbC4nMZOfuPVxoZIxeYsn6Nl2r1fITaJ78UQlVQ=
+github.com/go-jose/go-jose/v3 v3.0.5/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
+github.com/go-jose/go-jose/v4 v4.1.6 h1:sNRkftxFJxwsILiQukqp5z83QBSmntVwmgRY7AqBDO4=
+github.com/go-jose/go-jose/v4 v4.1.6/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
-github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/glog v1.1.1 h1:jxpi2eWoU84wbX9iIEyAeeoac3FLuifZpY9tcNUD9kw=
-github.com/golang/glog v1.1.1/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/go-sql-driver/mysql v1.10.1 h1:arlSnNLq6a5yxGxV7qg9lF4j0C+KwD6NbQyKr9QL6ME=
+github.com/go-sql-driver/mysql v1.10.1/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/cel-go v0.13.0 h1:z+8OBOcmh7IeKyqwT/6IlnMvy621fYUqnTVPEdegGlU=
-github.com/google/cel-go v0.13.0/go.mod h1:K2hpQgEjDp18J76a2DKFRlPBPpgRZgi6EbnpDgIhJ8s=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/pprof v0.0.0-20230309165930-d61513b1440d h1:um9/pc7tKMINFfP1eE7Wv6PRGXlcCSJkVajF7KJw3uQ=
-github.com/google/pprof v0.0.0-20230309165930-d61513b1440d/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A=
-github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/mux v1.4.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/groob/finalizer v0.0.0-20170707115354-4c2ed49aabda/go.mod h1:MyndkAZd5rUMdNogn35MWXBX1UiBigrU8eTj8DoAC2c=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
+github.com/google/certificate-transparency-go v1.3.3 h1:hq/rSxztSkXN2tx/3jQqF6Xc0O565UQPdHrOWvZwybo=
+github.com/google/certificate-transparency-go v1.3.3/go.mod h1:iR17ZgSaXRzSa5qvjFl8TnVD5h8ky2JMVio+dzoKMgA=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-tpm v0.9.8 h1:slArAR9Ft+1ybZu0lBwpSmpwhRXaa85hWtMinMyRAWo=
+github.com/google/go-tpm v0.9.8/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY=
+github.com/google/go-tpm-tools v0.4.9 h1:jZEhnE4WRFbomSssBH2gWaIViIHU1gjH1jz76+xC9bI=
+github.com/google/go-tpm-tools v0.4.9/go.mod h1:Omb8zosA8qY9URn1gsrO2i4b6DFqGp29BqNx18V66c4=
+github.com/google/go-tspi v0.3.0 h1:ADtq8RKfP+jrTyIWIZDIYcKOMecRqNJFOew2IT0Inus=
+github.com/google/go-tspi v0.3.0/go.mod h1:xfMGI3G0PhxCdNVcYr1C4C+EizojDg/TXuX5by8CiHI=
+github.com/google/s2a-go v0.1.10 h1:EMp+aOuXN6l8cE/gjF5Bt+vyZxsUuyCWe9chDWR/+uU=
+github.com/google/s2a-go v0.1.10/go.mod h1:pz4tyvwXvJLLbyrkh6FW1eS2zPUXMaTmyNhYtyP2tNw=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.3.22 h1:NU4XpII6jD+Dxcot94fqjE+AfJoE/lQP9q3faYGzC/c=
+github.com/googleapis/enterprise-certificate-proxy v0.3.22/go.mod h1:L3D/IQExI6LqEjBdXcZQ1WluSgigQmSwBboFstVPM4w=
+github.com/googleapis/gax-go/v2 v2.25.0 h1:77gyzCOrTyzPKfzGZJG/V5DO4/Kuamek8W+cYJQ4U8k=
+github.com/googleapis/gax-go/v2 v2.25.0/go.mod h1:sMKqnMesnKH+3wiRJROcttA+cJoZoGbZl1vDQ8XYtGk=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
-github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
-github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
-github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
-github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/huandu/xstrings v1.6.1 h1:yYdKSd6Sjv3fNZt9BDjl1FDsPNfQEaYi19L5LzK2JKs=
+github.com/huandu/xstrings v1.6.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
-github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
-github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
-github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
-github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
-github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
-github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q=
-github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
-github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
-github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
-github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
-github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
-github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
-github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=
-github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
-github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
-github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
-github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
-github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
-github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
-github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
-github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
-github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg=
+github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY=
-github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/klauspost/compress v1.20.1 h1:T7kKElXUMXrUJ2E9QhQhxFtcK5rPyLdsGZvdbLMPdiQ=
+github.com/klauspost/compress v1.20.1/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI=
+github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw=
+github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
-github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis=
-github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/letsencrypt/challtestsrv v1.4.2 h1:0ON3ldMhZyWlfVNYYpFuWRTmZNnyfiL9Hh5YzC3JVwU=
+github.com/letsencrypt/challtestsrv v1.4.2/go.mod h1:GhqMqcSoeGpYd5zX5TgwA6er/1MbWzx/o7yuuVya+Wk=
+github.com/letsencrypt/pebble/v2 v2.10.1 h1:oKHx3lgN4e5Nno2LKTMrVx+b+NkDptkO9aDireiBDGE=
+github.com/letsencrypt/pebble/v2 v2.10.1/go.mod h1:KtYhQ4YTjT5MtoCZ6RTCXlbrrz6cKyXROCuTpIUDJFY=
+github.com/libdns/libdns v1.1.1 h1:wPrHrXILoSHKWJKGd0EiAVmiJbFShguILTg9leS/P/U=
+github.com/libdns/libdns v1.1.1/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
+github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
+github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI=
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
-github.com/mholt/acmez v1.1.0 h1:IQ9CGHKOHokorxnffsqDvmmE30mDenO1lptYZ1AYkHY=
-github.com/mholt/acmez v1.1.0/go.mod h1:zwo5+fbLLTowAX8o8ETfQzbDtwGEXnPhkmGdKIP+bgs=
-github.com/micromdm/scep/v2 v2.1.0 h1:2fS9Rla7qRR266hvUoEauBJ7J6FhgssEiq2OkSKXmaU=
-github.com/micromdm/scep/v2 v2.1.0/go.mod h1:BkF7TkPPhmgJAMtHfP+sFTKXmgzNJgLQlvvGoOExBcc=
-github.com/miekg/dns v1.1.52 h1:Bmlc/qsNNULOe6bpXcUTsuOajd0DzRHwup6D9k1An0c=
-github.com/miekg/dns v1.1.52/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
+github.com/mholt/acmez/v3 v3.1.7 h1:XTqpuUcRdRoIBuDoI+M4mCnRnPTPN4rqH3Mb723Rg4U=
+github.com/mholt/acmez/v3 v3.1.7/go.mod h1:Lwv6P/czh/AOq+c99tAzP68/VP92s+8y+hDs4FCgxvo=
+github.com/miekg/dns v1.1.73 h1:uhT8nJxmTrPJYClxVxTCX+CVn6qnzSiybRk72Z6DgrE=
+github.com/miekg/dns v1.1.73/go.mod h1:RW2Obtfd5NZHvOFe3zYG0W8koWOQtAzyHaLo8vASBuQ=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
-github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo=
-github.com/onsi/gomega v1.27.3 h1:5VwIwnBY3vbBDOJrNtA4rVdiTZCsq9B5F12pvy1Drmk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/nlnwa/whatwg-url v0.6.2 h1:jU61lU2ig4LANydbEJmA2nPrtCGiKdtgT0rmMd2VZ/Q=
+github.com/nlnwa/whatwg-url v0.6.2/go.mod h1:x0FPXJzzOEieQtsBT/AKvbiBbQ46YlL6Xa7m02M1ECk=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/peterbourgon/diskv/v3 v3.0.1 h1:x06SQA46+PKIUftmEujdwSEpIx8kR+M9eLYsUxeYveU=
+github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o=
+github.com/pires/go-proxyproto v0.15.0 h1:dTshmNbFm/D+0+sbrxUuddPOZ5Y0B7c5NhtsBkm6LqI=
+github.com/pires/go-proxyproto v0.15.0/go.mod h1:OXsCrKwrK2tXS9YrI5tkHx5xaQlO8FH3lFW76orFh24=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
-github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
-github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
-github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
-github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-19 v0.3.0 h1:aUBoQdpHzUWtPw5tQZbsD2GnrWCNu7/RIX1PtqGeLYY=
-github.com/quic-go/qtls-go1-19 v0.3.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
-github.com/quic-go/qtls-go1-20 v0.2.0 h1:jUHn+obJ6WI5JudqBO0Iy1ra5Vh5vsitQ1gXQvkmN+E=
-github.com/quic-go/qtls-go1-20 v0.2.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
-github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y0=
-github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
-github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
+github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
+github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
+github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE=
+github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo=
+github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
+github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
+github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=
+github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
+github.com/prometheus/procfs v0.22.0 h1:6q9+/JL9IKAPbCmBrv9n5O5Ty3NKnciV5X7YGw0oics=
+github.com/prometheus/procfs v0.22.0/go.mod h1:CvmFr/GVhIjIvWJZW3tgkODBQMRIf0EyWMQLHCHab58=
+github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0=
+github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk=
+github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/quic-go v0.63.0 h1:LIFGHI4PFUhhw2dDD1ARHdCff143ffMHwZtbnbuJ78A=
+github.com/quic-go/quic-go v0.63.0/go.mod h1:RAro2j2yN9a9EiPACLHT9IB2NXCvGQmmo/alT0yYI0w=
+github.com/rogpeppe/go-internal v1.16.0 h1:O9DK+vNMDVGLr2BeZqmpLeMjiMNkuXfcqntWbZV6S5g=
+github.com/rogpeppe/go-internal v1.16.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
+github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/schollz/jsonstore v1.1.0 h1:WZBDjgezFS34CHI+myb4s8GGpir3UMpy7vWoCeO0n6E=
+github.com/schollz/jsonstore v1.1.0/go.mod h1:15c6+9guw8vDRyozGjN3FoILt0wpruJk9Pi66vjaZfg=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/slackhq/nebula v1.6.1 h1:/OCTR3abj0Sbf2nGoLUrdDXImrCv0ZVFpVPP5qa0DsM=
-github.com/slackhq/nebula v1.6.1/go.mod h1:UmkqnXe4O53QwToSl/gG7sM4BroQwAB7dd4hUaT6MlI=
+github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=
+github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
+github.com/slackhq/nebula v1.11.2 h1:eP61cSfUuoEVGViD50gZBsAbBLPUAhoNOYewPmEwPG4=
+github.com/slackhq/nebula v1.11.2/go.mod h1:xz3SEyYeEhXY8MDlVu8S3Qt+SjncsSJ8bl4RXUgxtXQ=
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY=
github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc=
-github.com/smallstep/certificates v0.23.2 h1:7KSx9WfZ3CILV0XlsTrl+PK58YE4CHSgqobB6+ieQWs=
-github.com/smallstep/certificates v0.23.2/go.mod h1:YuQAlNuYrRA5z+meSH9D0XsUFH45TyAhNgyV5kYuQpQ=
-github.com/smallstep/nosql v0.6.0 h1:ur7ysI8s9st0cMXnTvB8tA3+x5Eifmkb6hl4uqNV5jc=
-github.com/smallstep/nosql v0.6.0/go.mod h1:jOXwLtockXORUPPZ2MCUcIkGR6w0cN1QGZniY9DITQA=
-github.com/smallstep/truststore v0.12.1 h1:guLUKkc1UlsXeS3t6BuVMa4leOOpdiv02PCRTiy1WdY=
-github.com/smallstep/truststore v0.12.1/go.mod h1:M4mebeNy28KusGX3lJxpLARIktLcyqBOrj3ZiZ46pqw=
+github.com/smallstep/certificates v0.30.2 h1:1G3xBi8sJ740iA1mMPW2Svv7EIZKJ4Zf/iQtA5QlN0Y=
+github.com/smallstep/certificates v0.30.2/go.mod h1:oyaE/aEYUGDr+YiCZLAxxP22bOQqcSHTeDgp8Vv2rlY=
+github.com/smallstep/cli-utils v0.12.2 h1:lGzM9PJrH/qawbzMC/s2SvgLdJPKDWKwKzx9doCVO+k=
+github.com/smallstep/cli-utils v0.12.2/go.mod h1:uCPqefO29goHLGqFnwk0i8W7XJu18X3WHQFRtOm/00Y=
+github.com/smallstep/go-attestation v0.4.4-0.20260814222900-a849f4e2cd68 h1:KcK2guFXrE5sX/nvF1b+atHP6DjRB1gCv3ppyTXB2Zk=
+github.com/smallstep/go-attestation v0.4.4-0.20260814222900-a849f4e2cd68/go.mod h1:vNAduivU014fubg6ewygkAvQC0IQVXqdc8vaGl/0er4=
+github.com/smallstep/linkedca v0.26.0 h1:NsxTVo3zI3KwOFFiVodeHtuGgKq0b5kOUXVLjjNTvXY=
+github.com/smallstep/linkedca v0.26.0/go.mod h1:Z8c7EgVrSHNhshIhRnUGfKfE796+TwF2eyErhqANmJQ=
+github.com/smallstep/nosql v0.8.0 h1:FBTCUfKPmWYbrozW+RBKu+fnvbn+zr5rVli/XB4Jp4A=
+github.com/smallstep/nosql v0.8.0/go.mod h1:5dUpNotHLHhOUapP0PLBVVfp3tG1DFC31VRccg+Cqwo=
+github.com/smallstep/pkcs7 v0.2.1/go.mod h1:RcXHsMfL+BzH8tRhmrF1NkkpebKpq3JEM66cOFxanf0=
+github.com/smallstep/pkcs7 v0.2.3 h1:bhoQ3TeZmdoXTatcwxCbk+FMcdsyr0gYrrW2Xq2qr+s=
+github.com/smallstep/pkcs7 v0.2.3/go.mod h1:7STkdKhZaZe4xNEXTtY4j1NGeST1gYM4GA40kC5iqr8=
+github.com/smallstep/scep v0.0.0-20260331191114-261f960a40d1 h1:lpXBkQKj1rT1oGX/2idvt8xbrOrnoQxH/+CjoeMxs9E=
+github.com/smallstep/scep v0.0.0-20260331191114-261f960a40d1/go.mod h1:QQhwLqCS13nhv8L5ov7NgusowENUtXdEzdytjmJHdZQ=
+github.com/smallstep/truststore v0.13.0 h1:90if9htAOblavbMeWlqNLnO9bsjjgVv2hQeQJCi/py4=
+github.com/smallstep/truststore v0.13.0/go.mod h1:3tmMp2aLKZ/OA/jnFUB0cYPcho402UG2knuJoPh4j7A=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
+github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/stoewer/go-strcase v1.2.1 h1:/1JWd+AcWPzkcGLEmjUCka99YqGOtTnp1H/wcP+uap4=
-github.com/stoewer/go-strcase v1.2.1/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/tailscale/tscert v0.0.0-20230124224810-c6dc1f4049b2 h1:TrgfmCXwtWyFw85UkRGXt9qZRzdzt3nWt2Rerdecn0w=
-github.com/tailscale/tscert v0.0.0-20230124224810-c6dc1f4049b2/go.mod h1:kNGUQ3VESx3VZwRwA9MSCUegIl6+saPL8Noq82ozCaU=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 h1:Gzfnfk2TWrk8Jj4P4c1a3CtQyMaTVCznlkLZI++hok4=
+github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55/go.mod h1:4k4QO+dQ3R5FofL+SanAUZe+/QfeK0+OIuwDIRu2vSg=
+github.com/tailscale/tscert v0.0.0-20251216020129-aea342f6d747 h1:RnBbFMmodYzhC6adOjTbtUQXyzV8dcvKYbolzs6Qch0=
+github.com/tailscale/tscert v0.0.0-20251216020129-aea342f6d747/go.mod h1:ejPAJui3kVK4u5TgMtqtXlWf5HnKh9fLy5kvpaeuas0=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
-github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
+github.com/urfave/cli v1.22.17 h1:SYzXoiPfQjHBbkYxbew5prZHS1TOLT3ierW8SYLqtVQ=
+github.com/urfave/cli v1.22.17/go.mod h1:b0ht0aqgH/6pBYzzxURyrM4xXNgsoT/n2ZzwQiEhNVo=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
-github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87 h1:Py16JEzkSdKAtEFJjiaYLYBOWGXc1r/xHj/Q/5lA37k=
-github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
-github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
-go.mozilla.org/pkcs7 v0.0.0-20210730143726-725912489c62/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
-go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
-go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
-go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 h1:vFEBG7SieZJzvnRWQ81jxpuEqe6J8Ex+hgc9CqOTzHc=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0/go.mod h1:9rgTcOKdIhDOC0IcAu8a+R+FChqSUBihKpM1lVNi6T0=
-go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk=
-go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y=
-go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0 h1:j7AwzDdAQBJjcqayAaYbvpYeZzII7cEe5qJTu+De6UY=
-go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0 h1:lRpP10E8oTGVmY1nVXcwelCT1Z8ca41/l5ce7AqLAss=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0/go.mod h1:3oS+j2WUoJVyj6/BzQN/52G17lNJDulngsOxDm1w2PY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0 h1:buSx4AMC/0Z232slPhicN/fU5KIlj0bMngct5pcZhkI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0/go.mod h1:ew1NcwkHo0QFT3uTm3m2IVZMkZdVIpbOYNPasgWwpdk=
-go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=
-go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk=
-go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE=
-go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM=
-go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I=
-go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE=
-go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=
-go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.opentelemetry.io/proto/otlp v0.12.0 h1:CMJ/3Wp7iOWES+CYLfnBv+DVmPbB+kmy9PJ92XvlR6c=
-go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ=
-go.step.sm/cli-utils v0.7.5 h1:jyp6X8k8mN1B0uWJydTid0C++8tQhm2kaaAdXKQQzdk=
-go.step.sm/cli-utils v0.7.5/go.mod h1:taSsY8haLmXoXM3ZkywIyRmVij/4Aj0fQbNTlJvv71I=
-go.step.sm/crypto v0.9.0/go.mod h1:+CYG05Mek1YDqi5WK0ERc6cOpKly2i/a5aZmU1sfGj0=
-go.step.sm/crypto v0.27.0 h1:MLRvcVCibCMcbcPlj9A6oOteyFqzy6lFfRAcE/ZTAqY=
-go.step.sm/crypto v0.27.0/go.mod h1:cee0F+IAmWe7AHIUcEBuOOCltHhcCON3kUSKaYjcn7c=
-go.step.sm/linkedca v0.19.0 h1:xuagkR35wrJI2gnu6FAM+q3VmjwsHScvGcJsfZ0GdsI=
-go.step.sm/linkedca v0.19.0/go.mod h1:b7vWPrHfYLEOTSUZitFEcztVCpTc+ileIN85CwEAluM=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
-go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
-go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+github.com/yuin/goldmark v1.8.6 h1:d0VcaP1sx9GkFVkoW+KtggpGi2KZ965i14b0+bDQST4=
+github.com/yuin/goldmark v1.8.6/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ=
+github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I=
+github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
+github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
+github.com/zeebo/blake3 v0.2.4 h1:KYQPkhpRtcqh0ssGYcKLG1JYvddkEA8QwCM/yBqhaZI=
+github.com/zeebo/blake3 v0.2.4/go.mod h1:7eeQ6d2iXWRGF6npfaxl2CU+xy2Fjo2gxeyZGCRUjcE=
+github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
+github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
+go.etcd.io/bbolt v1.5.0 h1:S7GAl7Fxv12yohbwFfIbQCGDWbQbtDGPET4P/bD4lxU=
+go.etcd.io/bbolt v1.5.0/go.mod h1:mkltfYE5aUHQxUct9N9V+Kp7aSjFqjgrhcXIS70Lrdk=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/contrib/bridges/prometheus v0.71.0 h1:9qgxsFLskbDMXl8WMqThoF6w8yGJgCumn9qRc67OmnI=
+go.opentelemetry.io/contrib/bridges/prometheus v0.71.0/go.mod h1:2rCjF4F2siiTeLCzJsaGZ3CK0XIoimCSKXEBPdv+Je0=
+go.opentelemetry.io/contrib/exporters/autoexport v0.71.0 h1:VCsJbp0YLyPtx2tu5Vgv2a2/qLoaMCj8hT2uZ34+Mx0=
+go.opentelemetry.io/contrib/exporters/autoexport v0.71.0/go.mod h1:qxZqn7e10f6ajmMCkg/47rMS7qQYfaOl2nj/4aytHUQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 h1:oECp5f+hN7nkwjU/8BxQ/q23bGPb8FIrD839owX222E=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 h1:3g7B90UzBltIDKq1/5mrTGxTnOFDV0ICOhLoxiZ8jlg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0/go.mod h1:Ef8SuTh59BT7+ofpDxN9z+yOlc4t2GjLmKDgYNJL/NU=
+go.opentelemetry.io/contrib/propagators/autoprop v0.71.0 h1:uy7dcw6v3XK3LMGj2sB9CXtJtTHX8QA9pjSrLhvf86c=
+go.opentelemetry.io/contrib/propagators/autoprop v0.71.0/go.mod h1:IknVHC4K/KkF0Kx+GpTlhlbW96XOq4m0O/FHauFVZtA=
+go.opentelemetry.io/contrib/propagators/aws v1.46.0 h1:JslT1wq/5vb6lQsbdOqShvIEs7sDlf0IvKxNZdadfjY=
+go.opentelemetry.io/contrib/propagators/aws v1.46.0/go.mod h1:JE4srRJf2cRJcJjRaNhViFjyFJqiCZJiDVlqe6GWXsA=
+go.opentelemetry.io/contrib/propagators/b3 v1.46.0 h1:OFVqWObn7xLIbOjE/koO0LS9fZJNgAyBD0msA+UQAoc=
+go.opentelemetry.io/contrib/propagators/b3 v1.46.0/go.mod h1:t/d64xy7xuuEDJN/4ThqohLgRhIuQxL9y7P1v02bYuM=
+go.opentelemetry.io/contrib/propagators/jaeger v1.46.0 h1:uxl0SGcmuBkHj/Adl9oftEAyiawQBPL5RzMAmt/Yvq4=
+go.opentelemetry.io/contrib/propagators/jaeger v1.46.0/go.mod h1:LiOkxCIvoLofmRps7f8l0NkBtmObnAyQ5trteFs6wj8=
+go.opentelemetry.io/contrib/propagators/ot v1.46.0 h1:SxC/1xmJJJdGQTNmavqW8ju85TRXiZHeFaQdnEMCWLE=
+go.opentelemetry.io/contrib/propagators/ot v1.46.0/go.mod h1:ZrntlVZOzRMetoU2y7eIHUbJ7riKEOqIyLXkuu91sxU=
+go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc=
+go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.22.0 h1:Bu39F5tzJct+f2IZbB8989fwyTps3c8e7EsUQsz+vs8=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.22.0/go.mod h1:dJUwod88EsFgYCqrDHaSPzhiY9pBUpt0d85/qSfua7k=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.22.0 h1:lYk7RmxdLK865qLwibroNGldHa1U7SWKYYvNjlK7PIo=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.22.0/go.mod h1:6GvlND0H0xdUJanOtIAn0xfwLkauh1tmsYEEVSMDdqY=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.46.0 h1:qkDYCAFiZXLcs1L4aY+tP2wguQ4kURANqHOQMA2et2s=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.46.0/go.mod h1:tkipS4DRzmpAmvg+Gw4++O1IdDq6TVDnvnYU6cmbQVs=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0 h1:AP23h/mFgb/lc7tdck1Kfn9qxsM8TAeNPCU5C3pzaps=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.46.0/go.mod h1:K4EqCe1b4kGk5WR690ntg9LaBfsPoV32FwthbyoptuA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 h1:OFnwLJr+pF3iHrlGSzbxyuo6/6HyBlnlN1CWEJmBVcw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0/go.mod h1:716wFneO0ov19A2beH5hjfh9AK5z/VWNAtDijp1Y0/g=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0 h1:w53CDeOA/Kurp7yRsegSr6pbbr759dOvJ+yNmWM6Hxs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0/go.mod h1:BOmGMCbAtvcJiSJ+hLuhgPLdDbimnraSl8irz3iY8sY=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.46.0 h1:KrC1YrQeSt46ITMWAbgQx1M1eV1/1TKzttrBzymPmss=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.46.0/go.mod h1:zDSEzoEqsOrgBeGvH66KRgxh90VonFyJqBHA0Pk3+rM=
+go.opentelemetry.io/otel/exporters/prometheus v0.68.0 h1:QOf2IftqQwITVRJpnn0M7M9ZCbgWfxz4P7i9C9yc2N4=
+go.opentelemetry.io/otel/exporters/prometheus v0.68.0/go.mod h1:bgSvqu2TWGXiz7yr5UTMfObH8oqxJWHTnubQ3ef9BO4=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.22.0 h1:kvMAiLEudKmk+CSG+iYbU8vTUGNNDaf/V09OO5lrTwI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.22.0/go.mod h1:L9Dlksri+MdT1cb2gIiA1cJJYW3Y92ipvDjNxYEyaDI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0 h1:PR9eAf7o0dQs3hshZNZpE9aW2dXWX/KdDf6pJilVD3U=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.46.0/go.mod h1:2Z4KyNdH1uuzivdinyfGsxzNNT/Rl45pwtVwfYVI0xk=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0 h1:KdRxPiAoMptR3vfWzvjjvutTsSiwbC2uG0496rzZNfo=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.46.0/go.mod h1:K/qSA+3G7Eovxi4K09wzrAgkWRnosS0DAOZeEpve7sM=
+go.opentelemetry.io/otel/log v0.22.0 h1:5DBNnfvaJ6CVdkJ+Jle8Tzs50aSSv49TXGj9XRsEYw0=
+go.opentelemetry.io/otel/log v0.22.0/go.mod h1:gzOt/R67vF2GniAqWu8Qv0SXy89f71muHcrkz76PCdc=
+go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8=
+go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o=
+go.opentelemetry.io/otel/metric/x v0.68.0 h1:TA/cBT23D3MnxYPwHL7YFOdYGdx0A0v+s7Mzotpd1dU=
+go.opentelemetry.io/otel/metric/x v0.68.0/go.mod h1:agudOmvWhwUTjgibWDzxD2PoWYnpw5Ht5jISYOD2Hd4=
+go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI=
+go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM=
+go.opentelemetry.io/otel/sdk/log v0.22.0 h1:PRL+s6P63XT4E/bheEflopPUpVxuvANqZwtt89yhoGk=
+go.opentelemetry.io/otel/sdk/log v0.22.0/go.mod h1:JNp0sBELrjCTcu5W3GzABVypeU6vDJjBS+X0JISuz+g=
+go.opentelemetry.io/otel/sdk/log/logtest v0.22.0 h1:infPnfNrhCNgOUZRs3gWUg8vhoBUHihq02gwK05gzlg=
+go.opentelemetry.io/otel/sdk/log/logtest v0.22.0/go.mod h1:gkQZA3z15Bv3KU9vigBTi8dFechSozRP7v94X4VZv+s=
+go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE=
+go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4=
+go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c=
+go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI=
+go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk=
+go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E=
+go.step.sm/crypto v0.91.0 h1:0mN0DwVOvUuh7VbyTnxABZuAkxwak/Grp8Y/b4YaZDU=
+go.step.sm/crypto v0.91.0/go.mod h1:NxxObRBymdbyXLoTCW5Ea6sLxuy5yI/xr9+hSBlbU/Q=
+go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
+go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
+go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
+go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
+go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
+golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
+golang.org/x/crypto/x509roots/fallback v0.0.0-20261030153154-30a33513ff6d h1:5NBkmd8MXirajj6AAEpi4HFVJnVkBNPTL1ggYAKqaws=
+golang.org/x/crypto/x509roots/fallback v0.0.0-20261030153154-30a33513ff6d/go.mod h1:HPze8vhfG6fO06AM+VSvxRm4E3+5Yk375mgrJ5M2z1E=
+golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba h1:Ck8QetSgk912qxWLMCKxd0in+aiyBQyDSMae6e/xmpU=
+golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba/go.mod h1:50RgIsmK7OwqzTTeqcSXQW8SswW0o8fRcDxmqGluJ8E=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20170726083632-f5079bd7f6f7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU=
+golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
+golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170728174421-0f826bdd13b5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
+golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211031064116-611d5d643895/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=
+golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.112.0 h1:iDmzvZ4C086R3+en4nSyIf07HlQKMOX1Xx2dmia/+KQ=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20230322174352-cde4c949918d h1:OE8TncEeAei3Tehf/P/Jdt/K+8GnTUrRY6wzYpbCes4=
-google.golang.org/genproto v0.0.0-20230322174352-cde4c949918d/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
-google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
+gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
+google.golang.org/api v0.298.0 h1:YW18RkHBMZBA1ergX0m4biagzgbiPTb2uTsRsDPWNRY=
+google.golang.org/api v0.298.0/go.mod h1:02qB8+Ox1ZFzcaKFMguy1nQLJmSIyvV6Ff4txJEXtl4=
+google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d h1:C9v1o0/4quuhOAfmRXA2j+we0PqZIp8traLdeogF3Ms=
+google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d/go.mod h1:Wz2wFJntZFmLGo7pLDXZ3wYk5hyc0Mb+SkHhDDXT+lU=
+google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 h1:GS9OIt/j7c8bvBjYNgnKQysVfmV7e4jM0H8ZK95G4t8=
+google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459/go.mod h1:PX5/4vemwVoXtwEcRDWwcR1/r0qrosfx3qoVADMwnVE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 h1:b0xCahf3FK2m2Cv0p4vTozGPWncCvLfwV86UNg8xWU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
+google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=
+google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8=
+google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
+google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI=
-gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM=
-howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
+howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
+howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
diff --git a/middleware/roadrunner/esi.go b/middleware/roadrunner/esi.go
index 1d09bf1..8ea12fe 100644
--- a/middleware/roadrunner/esi.go
+++ b/middleware/roadrunner/esi.go
@@ -1,21 +1,13 @@
package roadrunner_esi
import (
- "bytes"
"net/http"
- "sync"
"github.com/darkweak/go-esi/writer"
"github.com/roadrunner-server/errors"
"go.uber.org/zap"
)
-var bufPool *sync.Pool = &sync.Pool{
- New: func() any {
- return &bytes.Buffer{}
- },
-}
-
const configurationKey = "http.esi"
type (
@@ -50,35 +42,8 @@ func (p *Plugin) Init(cfg Configurer, log *zap.Logger) error {
// process the esi tags if present.
func (p *Plugin) Middleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
- buf := bufPool.Get().(*bytes.Buffer)
- buf.Reset()
- defer bufPool.Put(buf)
- cw := writer.NewWriter(buf, rw, r)
- go func(w *writer.Writer) {
- var i = 0
- for {
- if len(w.AsyncBuf) <= i {
- continue
- }
- rs := <-w.AsyncBuf[i]
- if rs == nil {
- w.Done <- true
- break
- }
- _, _ = rw.Write(rs)
- i++
- }
- }(cw)
+ cw := writer.NewWriter(rw, r)
next.ServeHTTP(cw, r)
- cw.Header().Del("Content-Length")
- if cw.Rq.ProtoMajor == 1 {
- cw.Header().Set("Content-Encoding", "chunked")
- }
- cw.AsyncBuf = append(cw.AsyncBuf, make(chan []byte))
- go func(w *writer.Writer, iteration int) {
- w.AsyncBuf[iteration] <- nil
- }(cw, cw.Iteration)
-
- <-cw.Done
+ _ = cw.Close()
})
}
diff --git a/middleware/roadrunner/go.mod b/middleware/roadrunner/go.mod
index eab3f98..6cafcae 100644
--- a/middleware/roadrunner/go.mod
+++ b/middleware/roadrunner/go.mod
@@ -1,9 +1,9 @@
module github.com/darkweak/go-esi/middleware/roadrunner
-go 1.19
+go 1.27.0
require (
- github.com/darkweak/go-esi v0.0.6
+ github.com/darkweak/go-esi v0.0.7
github.com/roadrunner-server/errors v1.2.0
go.uber.org/zap v1.24.0
)
@@ -15,4 +15,4 @@ require (
go.uber.org/multierr v1.10.0 // indirect
)
-replace github.com/darkweak/go-esi v0.0.6 => ../..
+replace github.com/darkweak/go-esi v0.0.7 => ../..
diff --git a/middleware/roadrunner/go.sum b/middleware/roadrunner/go.sum
index ffff7ea..84b589d 100644
--- a/middleware/roadrunner/go.sum
+++ b/middleware/roadrunner/go.sum
@@ -1,4 +1,5 @@
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -18,6 +19,7 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
diff --git a/middleware/server/main.go b/middleware/server/main.go
index 7b7b9db..976fe34 100644
--- a/middleware/server/main.go
+++ b/middleware/server/main.go
@@ -14,7 +14,7 @@ var respond = []byte(`
@@ -27,14 +27,21 @@ func main() {
w.Header().Set("Content-Type", "text/html")
w.WriteHeader(http.StatusOK)
_, _ = w.Write(respond[0:97])
+
if flusher, ok := w.(http.Flusher); ok {
flusher.Flush()
}
+
time.Sleep(time.Second)
+
_, _ = w.Write(respond[97:194])
+
time.Sleep(time.Second)
+
_, _ = w.Write(respond[194:291])
+
time.Sleep(time.Second)
+
_, _ = w.Write(respond[291:])
})
diff --git a/middleware/standalone/main.go b/middleware/standalone/main.go
index e9a6851..6f2929e 100644
--- a/middleware/standalone/main.go
+++ b/middleware/standalone/main.go
@@ -34,6 +34,7 @@ func main() {
}
defer res.Body.Close()
+
_, _ = io.Copy(buf, res.Body)
result := buf.String()
diff --git a/middleware/traefik/docker-compose.yml b/middleware/traefik/compose.yml
similarity index 100%
rename from middleware/traefik/docker-compose.yml
rename to middleware/traefik/compose.yml
diff --git a/middleware/traefik/esi.go b/middleware/traefik/esi.go
index d798bb6..d16f7ad 100644
--- a/middleware/traefik/esi.go
+++ b/middleware/traefik/esi.go
@@ -1,20 +1,12 @@
package traefik
import (
- "bytes"
"context"
"net/http"
- "sync"
"github.com/darkweak/go-esi/writer"
)
-var bufPool *sync.Pool = &sync.Pool{
- New: func() any {
- return &bytes.Buffer{}
- },
-}
-
// Config the ESI plugin configuration.
type Config struct{}
@@ -38,34 +30,7 @@ func New(ctx context.Context, next http.Handler, config *Config, name string) (h
}
func (e *ESI) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
- buf := bufPool.Get().(*bytes.Buffer)
- buf.Reset()
- defer bufPool.Put(buf)
- cw := writer.NewWriter(buf, rw, req)
- go func(w *writer.Writer) {
- w.Header().Del("Content-Length")
- if w.Rq.ProtoMajor == 1 {
- w.Header().Set("Content-Encoding", "chunked")
- }
- var i = 0
- for {
- if len(cw.AsyncBuf) <= i {
- continue
- }
- rs := <-cw.AsyncBuf[i]
- if rs == nil {
- cw.Done <- true
- break
- }
- _, _ = rw.Write(rs)
- i++
- }
- }(cw)
+ cw := writer.NewWriter(rw, req)
e.next.ServeHTTP(cw, req)
- cw.AsyncBuf = append(cw.AsyncBuf, make(chan []byte))
- go func(w *writer.Writer, iteration int) {
- w.AsyncBuf[iteration] <- nil
- }(cw, cw.Iteration)
-
- <-cw.Done
+ _ = cw.Close()
}
diff --git a/middleware/traefik/go.mod b/middleware/traefik/go.mod
index 3f02bb6..b6d8b70 100644
--- a/middleware/traefik/go.mod
+++ b/middleware/traefik/go.mod
@@ -1,7 +1,7 @@
module github.com/darkweak/go-esi/middleware/traefik
-go 1.19
+go 1.27.0
-require github.com/darkweak/go-esi v0.0.6
+require github.com/darkweak/go-esi v0.0.7
-replace github.com/darkweak/go-esi v0.0.6 => ../..
+replace github.com/darkweak/go-esi v0.0.7 => ../..
diff --git a/middleware/traefik/traefik.yml b/middleware/traefik/traefik.yml
index 5365086..534142e 100644
--- a/middleware/traefik/traefik.yml
+++ b/middleware/traefik/traefik.yml
@@ -8,9 +8,6 @@ api:
debug: true
insecure: true
-pilot:
- token: 12926953-a7d1-4223-a092-d7dd95a91fa3
-
experimental:
localPlugins:
esi:
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/LICENSE b/middleware/traefik/vendor/github.com/darkweak/go-esi/LICENSE
deleted file mode 100644
index 78e9611..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 darkweak
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/choose.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/choose.go
deleted file mode 100644
index 572fdb3..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/choose.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
-)
-
-const choose = "choose"
-
-var (
- closeChoose = regexp.MustCompile("")
- whenRg = regexp.MustCompile(`(?s)(.+?)`)
- otherwiseRg = regexp.MustCompile(`(?s)(.+?)`)
-)
-
-type chooseTag struct {
- *baseTag
-}
-
-// Input (e.g.
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-// ).
-func (c *chooseTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeChoose.FindIndex(b)
- if found == nil {
- return nil, len(b)
- }
-
- c.length = found[1]
- tagIdxs := whenRg.FindAllSubmatch(b, -1)
-
- var res []byte
-
- for _, v := range tagIdxs {
- if validateTest(v[1], req) {
- res = Parse(v[2], req)
-
- break
- }
- }
-
- tagIdx := otherwiseRg.FindSubmatch(b)
- if tagIdx != nil {
- res = Parse(tagIdx[1], req)
- }
-
- return res, c.length
-}
-
-func (*chooseTag) HasClose(b []byte) bool {
- return closeChoose.FindIndex(b) != nil
-}
-
-func (*chooseTag) GetClosePosition(b []byte) int {
- if idx := closeChoose.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/comment.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/comment.go
deleted file mode 100644
index e9c3137..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/comment.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
-)
-
-const comment = "comment"
-
-var closeComment = regexp.MustCompile("/>")
-
-type commentTag struct {
- *baseTag
-}
-
-// Input (e.g. comment text="This is a comment." />).
-func (c *commentTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeComment.FindIndex(b)
- if found == nil {
- return nil, len(b)
- }
-
- return []byte{}, found[1]
-}
-
-func (*commentTag) HasClose(b []byte) bool {
- return closeComment.FindIndex(b) != nil
-}
-
-func (*commentTag) GetClosePosition(b []byte) int {
- if idx := closeComment.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/errors.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/errors.go
deleted file mode 100644
index e2de145..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/errors.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package esi
-
-import "errors"
-
-var errNotFound = errors.New("not found")
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/escape.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/escape.go
deleted file mode 100644
index a3129c1..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/escape.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
-)
-
-const escape = "")
-)
-
-type escapeTag struct {
- *baseTag
-}
-
-func (e *escapeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeEscape.FindIndex(b)
-
- if closeIdx == nil {
- return nil, len(b)
- }
-
- e.length = closeIdx[1]
- b = b[:closeIdx[0]]
-
- return b, e.length
-}
-
-func (*escapeTag) HasClose(b []byte) bool {
- return closeEscape.FindIndex(b) != nil
-}
-
-func (*escapeTag) GetClosePosition(b []byte) int {
- if idx := closeEscape.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/esi.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/esi.go
deleted file mode 100644
index 9deea63..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/esi.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package esi
-
-import (
- "net/http"
-)
-
-func findTagName(b []byte) Tag {
- name := tagname.FindSubmatch(b)
- if name == nil {
- return nil
- }
-
- switch string(name[1]) {
- case comment:
- return &commentTag{
- baseTag: newBaseTag(),
- }
- case choose:
- return &chooseTag{
- baseTag: newBaseTag(),
- }
- case escape:
- return &escapeTag{
- baseTag: newBaseTag(),
- }
- case include:
- return &includeTag{
- baseTag: newBaseTag(),
- }
- case remove:
- return &removeTag{
- baseTag: newBaseTag(),
- }
- case try:
- case vars:
- return &varsTag{
- baseTag: newBaseTag(),
- }
- default:
- return nil
- }
-
- return nil
-}
-
-func HasOpenedTags(b []byte) bool {
- return esi.FindIndex(b) != nil || escapeRg.FindIndex(b) != nil
-}
-
-func CanProcess(b []byte) bool {
- if tag := findTagName(b); tag != nil {
- return tag.HasClose(b)
- }
-
- return false
-}
-
-func ReadToTag(next []byte, pointer int) (startTagPosition, esiPointer int, t Tag) {
- tagIdx := esi.FindIndex(next)
- var isEscapeTag bool
-
- if escIdx := escapeRg.FindIndex(next); escIdx != nil && (tagIdx == nil || escIdx[0] < tagIdx[0]) {
- tagIdx = escIdx
- tagIdx[1] = escIdx[0]
- isEscapeTag = true
- }
-
- if tagIdx == nil {
- return len(next), 0, nil
- }
-
- esiPointer = tagIdx[1]
- startTagPosition = tagIdx[0]
- t = findTagName(next[esiPointer:])
-
- if isEscapeTag {
- esiPointer += 7
- }
-
- return
-}
-
-func Parse(b []byte, req *http.Request) []byte {
- pointer := 0
-
- for pointer < len(b) {
- var escapeTag bool
-
- next := b[pointer:]
- tagIdx := esi.FindIndex(next)
-
- if escIdx := escapeRg.FindIndex(next); escIdx != nil && (tagIdx == nil || escIdx[0] < tagIdx[0]) {
- tagIdx = escIdx
- tagIdx[1] = escIdx[0]
- escapeTag = true
- }
-
- if tagIdx == nil {
- break
- }
-
- esiPointer := tagIdx[1]
- t := findTagName(next[esiPointer:])
-
- if escapeTag {
- esiPointer += 7
- }
-
- res, p := t.Process(next[esiPointer:], req)
- esiPointer += p
-
- b = append(b[:pointer], append(next[:tagIdx[0]], append(res, next[esiPointer:]...)...)...)
- pointer += len(res) + tagIdx[0]
- }
-
- return b
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/include.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/include.go
deleted file mode 100644
index 1ecebe5..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/include.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package esi
-
-import (
- "io"
- "net/http"
- "regexp"
-)
-
-const include = "include"
-
-var (
- closeInclude = regexp.MustCompile("/>")
- srcAttribute = regexp.MustCompile(`src="?(.+?)"?( |/>)`)
- altAttribute = regexp.MustCompile(`alt="?(.+?)"?( |/>)`)
-)
-
-type includeTag struct {
- *baseTag
- src string
- alt string
-}
-
-func (i *includeTag) loadAttributes(b []byte) error {
- src := srcAttribute.FindSubmatch(b)
- if src == nil {
- return errNotFound
- }
-
- i.src = string(src[1])
-
- alt := altAttribute.FindSubmatch(b)
- if alt != nil {
- i.alt = string(alt[1])
- }
-
- return nil
-}
-
-// Input (e.g. include src="https://domain.com/esi-include" alt="https://domain.com/alt-esi-include" />)
-// With or without the alt
-// With or without a space separator before the closing
-// With or without the quotes around the src/alt value.
-func (i *includeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeInclude.FindIndex(b)
-
- if closeIdx == nil {
- return nil, len(b)
- }
-
- i.length = closeIdx[1]
- if e := i.loadAttributes(b[8:i.length]); e != nil {
- return nil, len(b)
- }
-
- rq, _ := http.NewRequest(http.MethodGet, i.src, nil)
- client := &http.Client{}
- response, err := client.Do(rq)
-
- if err != nil || response.StatusCode >= 400 {
- rq, _ = http.NewRequest(http.MethodGet, i.src, nil)
- response, err = client.Do(rq)
-
- if err != nil || response.StatusCode >= 400 {
- return nil, len(b)
- }
- }
-
- defer response.Body.Close()
- x, _ := io.ReadAll(response.Body)
- b = Parse(x, req)
-
- return b, i.length
-}
-
-func (*includeTag) HasClose(b []byte) bool {
- return closeInclude.FindIndex(b) != nil
-}
-
-func (*includeTag) GetClosePosition(b []byte) int {
- if idx := closeInclude.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/remove.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/remove.go
deleted file mode 100644
index 3c16157..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/remove.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
-)
-
-const remove = "remove"
-
-var closeRemove = regexp.MustCompile("")
-
-type removeTag struct {
- *baseTag
-}
-
-func (r *removeTag) Process(b []byte, req *http.Request) ([]byte, int) {
- closeIdx := closeRemove.FindIndex(b)
- if closeIdx == nil {
- return []byte{}, len(b)
- }
-
- r.length = closeIdx[1]
-
- return []byte{}, r.length
-}
-
-func (*removeTag) HasClose(b []byte) bool {
- return closeRemove.FindIndex(b) != nil
-}
-
-func (*removeTag) GetClosePosition(b []byte) int {
- if idx := closeRemove.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/tags.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/tags.go
deleted file mode 100644
index 346108d..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/tags.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package esi
-
-import "regexp"
-
-const (
- try = "try"
-)
-
-var (
- esi = regexp.MustCompile("").
-)
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/try.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/try.go
deleted file mode 100644
index 6a8d63c..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/try.go
+++ /dev/null
@@ -1 +0,0 @@
-package esi
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/type.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/type.go
deleted file mode 100644
index 8388015..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/type.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package esi
-
-import (
- "net/http"
-)
-
-type (
- Tag interface {
- Process([]byte, *http.Request) ([]byte, int)
- HasClose([]byte) bool
- GetClosePosition([]byte) int
- }
-
- baseTag struct {
- length int
- }
-)
-
-func newBaseTag() *baseTag {
- return &baseTag{length: 0}
-}
-
-func (b *baseTag) Process(content []byte, _ *http.Request) ([]byte, int) {
- return []byte{}, len(content)
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/vars.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/vars.go
deleted file mode 100644
index 39bfb5c..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/vars.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
- "strings"
-)
-
-const (
- httpAcceptLanguage = "HTTP_ACCEPT_LANGUAGE"
- httpCookie = "HTTP_COOKIE"
- httpHost = "HTTP_HOST"
- httpReferrer = "HTTP_REFERER"
- httpUserAgent = "HTTP_USER_AGENT"
- httpQueryString = "QUERY_STRING"
-
- vars = "vars"
-)
-
-var (
- interpretedVar = regexp.MustCompile(`\$\((.+?)(\{(.+)\}(.+)?)?\)`)
- defaultExtractor = regexp.MustCompile(`\|('|")(.+?)('|")`)
- stringExtractor = regexp.MustCompile(`('|")(.+)('|")`)
-
- closeVars = regexp.MustCompile("")
-)
-
-func parseVariables(b []byte, req *http.Request) string {
- interprets := interpretedVar.FindSubmatch(b)
-
- if interprets != nil {
- switch string(interprets[1]) {
- case httpAcceptLanguage:
- if strings.Contains(req.Header.Get("Accept-Language"), string(interprets[3])) {
- return "true"
- }
- case httpCookie:
- if c, e := req.Cookie(string(interprets[3])); e == nil && c.Value != "" {
- return c.Value
- }
- case httpHost:
- return req.Host
- case httpReferrer:
- return req.Referer()
- case httpUserAgent:
- return req.UserAgent()
- case httpQueryString:
- if q := req.URL.Query().Get(string(interprets[3])); q != "" {
- return q
- }
- }
-
- if len(interprets) > 3 {
- defaultValues := defaultExtractor.FindSubmatch(interprets[4])
-
- if len(defaultValues) > 2 {
- return string(defaultValues[2])
- }
-
- return ""
- }
- } else {
- strs := stringExtractor.FindSubmatch(b)
-
- if len(strs) > 2 {
- return string(strs[2])
- }
- }
-
- return string(b)
-}
-
-type varsTag struct {
- *baseTag
-}
-
-// Input (e.g. comment text="This is a comment." />).
-func (c *varsTag) Process(b []byte, req *http.Request) ([]byte, int) {
- found := closeVars.FindIndex(b)
- if found == nil {
- return nil, len(b)
- }
-
- c.length = found[1]
-
- return interpretedVar.ReplaceAllFunc(b[5:found[0]], func(b []byte) []byte {
- return []byte(parseVariables(b, req))
- }), c.length
-}
-
-func (*varsTag) HasClose(b []byte) bool {
- return closeVars.FindIndex(b) != nil
-}
-
-func (*varsTag) GetClosePosition(b []byte) int {
- if idx := closeVars.FindIndex(b); idx != nil {
- return idx[1]
- }
- return 0
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/when.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/when.go
deleted file mode 100644
index b4573de..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/esi/when.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package esi
-
-import (
- "net/http"
- "regexp"
- "strings"
-)
-
-var (
- unaryNegation = regexp.MustCompile(`!\((\$\((.+)\)|(.+))\)`)
- comparison = regexp.MustCompile(`(.+)(==|!=|<=|>=|<|>)(.+)`)
- logicalAnd = regexp.MustCompile(`\((.+?)\)&\((.+?)\)`)
- logicalOr = regexp.MustCompile(`\((.+?)\)\|\((.+?)\)`)
-)
-
-func validateTest(b []byte, req *http.Request) bool {
- if r := unaryNegation.FindSubmatch(b); r != nil {
- return !validateTest(r[1], req)
- } else if r := logicalAnd.FindSubmatch(b); r != nil {
- return validateTest(r[1], req) && validateTest(r[2], req)
- } else if r := logicalOr.FindSubmatch(b); r != nil {
- return validateTest(r[1], req) || validateTest(r[2], req)
- } else if r := comparison.FindSubmatch(b); r != nil {
- r1 := strings.TrimSpace(parseVariables(r[1], req))
- r2 := strings.TrimSpace(parseVariables(r[3], req))
- switch string(r[2]) {
- case "==":
- return r1 == r2
- case "!=":
- return r1 != r2
- case "<":
- return r1 < r2
- case ">":
- return r1 > r2
- case "<=":
- return r1 <= r2
- case ">=":
- return r1 >= r2
- }
- } else {
- vars := interpretedVar.FindSubmatch(b)
- if vars == nil {
- return false
- }
-
- return parseVariables(vars[0], req) == "true"
- }
-
- return false
-}
diff --git a/middleware/traefik/vendor/github.com/darkweak/go-esi/writer/writer.go b/middleware/traefik/vendor/github.com/darkweak/go-esi/writer/writer.go
deleted file mode 100644
index 459a836..0000000
--- a/middleware/traefik/vendor/github.com/darkweak/go-esi/writer/writer.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package writer
-
-import (
- "bytes"
- "net/http"
-
- "github.com/darkweak/go-esi/esi"
-)
-
-type Writer struct {
- buf *bytes.Buffer
- rw http.ResponseWriter
- Rq *http.Request
- AsyncBuf []chan []byte
- Done chan bool
- flushed bool
- Iteration int
-}
-
-func NewWriter(buf *bytes.Buffer, rw http.ResponseWriter, rq *http.Request) *Writer {
- return &Writer{
- buf: buf,
- Rq: rq,
- rw: rw,
- AsyncBuf: make([]chan []byte, 0),
- Done: make(chan bool),
- }
-}
-
-// Header implements http.ResponseWriter
-func (w *Writer) Header() http.Header {
- return w.rw.Header()
-}
-
-// WriteHeader implements http.ResponseWriter
-func (w *Writer) WriteHeader(statusCode int) {
- if statusCode == 0 {
- w.rw.WriteHeader(http.StatusOK)
- }
-}
-
-// Flush implements http.Flusher
-func (w *Writer) Flush() {
- if !w.flushed {
- w.rw.(http.Flusher).Flush()
- w.flushed = true
- }
-}
-
-// Write will write the response body
-func (w *Writer) Write(b []byte) (int, error) {
- buf := append(w.buf.Bytes(), b...)
- w.buf.Reset()
-
- if esi.HasOpenedTags(buf) {
- position := 0
- for position < len(buf) {
- startPos, nextPos, t := esi.ReadToTag(buf[position:], position)
-
- if startPos != 0 {
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
- go func(tmpBuf []byte, i int, cw *Writer) {
- cw.AsyncBuf[i] <- tmpBuf
- }(buf[position:position+startPos], w.Iteration, w)
- w.Iteration++
- }
-
- if t == nil {
- break
- }
-
- closePosition := t.GetClosePosition(buf[position+startPos:])
- if closePosition == 0 {
- position += startPos
- break
- }
-
- position += nextPos
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
- go func(currentTag esi.Tag, tmpBuf []byte, cw *Writer, Iteration int) {
- p, _ := currentTag.Process(tmpBuf, cw.Rq)
- cw.AsyncBuf[Iteration] <- p
- }(t, buf[position:(position-nextPos)+startPos+closePosition], w, w.Iteration)
- position += startPos + closePosition - nextPos
- w.Iteration++
- }
- w.buf.Write(buf[position:])
- return len(b), nil
- }
-
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
- w.AsyncBuf[w.Iteration] <- buf
- w.Iteration++
- return len(b), nil
-}
-
-var _ http.ResponseWriter = (*Writer)(nil)
diff --git a/middleware/traefik/vendor/modules.txt b/middleware/traefik/vendor/modules.txt
deleted file mode 100644
index dfd38ea..0000000
--- a/middleware/traefik/vendor/modules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# github.com/darkweak/go-esi v0.0.5 => ../..
-## explicit; go 1.18
-github.com/darkweak/go-esi/esi
-github.com/darkweak/go-esi/writer
diff --git a/writer/writer.go b/writer/writer.go
index 21acef5..1568ec7 100644
--- a/writer/writer.go
+++ b/writer/writer.go
@@ -1,23 +1,23 @@
package writer
import (
- "bytes"
"net/http"
"github.com/darkweak/go-esi/esi"
)
+// Writer is an http.ResponseWriter processing the ESI tags of the response
+// body while it is streamed to the client. Close must be called once the
+// wrapped handler returns.
type Writer struct {
- buf *bytes.Buffer
- rw http.ResponseWriter
- Rq *http.Request
- AsyncBuf []chan []byte
- Done chan bool
- flushed bool
- Iteration int
+ rw http.ResponseWriter
+ Rq *http.Request
+ stream *esi.Stream
+ wroteHeader bool
}
-func NewWriter(buf *bytes.Buffer, rw http.ResponseWriter, rq *http.Request) *Writer {
+// NewWriter returns a Writer streaming the processed response to rw.
+func NewWriter(rw http.ResponseWriter, rq *http.Request) *Writer {
if rq.URL.Scheme == "" {
if rq.TLS != nil {
rq.URL.Scheme = "https"
@@ -31,11 +31,9 @@ func NewWriter(buf *bytes.Buffer, rw http.ResponseWriter, rq *http.Request) *Wri
}
return &Writer{
- buf: buf,
- Rq: rq,
- rw: rw,
- AsyncBuf: make([]chan []byte, 0),
- Done: make(chan bool),
+ rw: rw,
+ Rq: rq,
+ stream: esi.NewStream(rw, rq),
}
}
@@ -44,75 +42,51 @@ func (w *Writer) Header() http.Header {
return w.rw.Header()
}
-// WriteHeader implements http.ResponseWriter.
+// WriteHeader implements http.ResponseWriter. The Content-Length header is
+// dropped because processing the ESI tags changes the body length.
func (w *Writer) WriteHeader(statusCode int) {
- if statusCode == 0 {
- w.rw.WriteHeader(http.StatusOK)
+ if w.wroteHeader {
+ return
}
-}
-// Flush implements http.Flusher.
-func (w *Writer) Flush() {
- if !w.flushed {
- if flusher, ok := w.rw.(http.Flusher); ok {
- flusher.Flush()
- }
+ // Informational responses are forwarded, the final one is still to come.
+ if statusCode >= http.StatusContinue && statusCode < http.StatusOK && statusCode != http.StatusSwitchingProtocols {
+ w.rw.WriteHeader(statusCode)
- w.flushed = true
+ return
}
+
+ w.wroteHeader = true
+ w.rw.Header().Del("Content-Length")
+ w.rw.WriteHeader(statusCode)
}
-// Write will write the response body.
+// Write implements http.ResponseWriter.
func (w *Writer) Write(b []byte) (int, error) {
- buf := append(w.buf.Bytes(), b...)
- w.buf.Reset()
-
- if esi.HasOpenedTags(buf) {
- position := 0
- for position < len(buf) {
- startPos, nextPos, t := esi.ReadToTag(buf[position:], position)
-
- if startPos != 0 {
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
- go func(tmpBuf []byte, i int, cw *Writer) {
- cw.AsyncBuf[i] <- tmpBuf
- }(buf[position:position+startPos], w.Iteration, w)
- w.Iteration++
- }
-
- if t == nil {
- break
- }
-
- closePosition := t.GetClosePosition(buf[position+startPos:])
- if closePosition == 0 {
- position += startPos
-
- break
- }
-
- position += nextPos
-
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
-
- go func(currentTag esi.Tag, tmpBuf []byte, cw *Writer, Iteration int) {
- p, _ := currentTag.Process(tmpBuf, cw.Rq)
- cw.AsyncBuf[Iteration] <- p
- }(t, buf[position:(position-nextPos)+startPos+closePosition], w, w.Iteration)
+ if !w.wroteHeader {
+ w.WriteHeader(http.StatusOK)
+ }
- position += startPos + closePosition - nextPos
- w.Iteration++
- }
- w.buf.Write(buf[position:])
+ return w.stream.Write(b)
+}
- return len(b), nil
- }
+// Flush implements http.Flusher.
+func (w *Writer) Flush() {
+ w.stream.Flush()
+}
- w.AsyncBuf = append(w.AsyncBuf, make(chan []byte))
- w.AsyncBuf[w.Iteration] <- buf
- w.Iteration++
+// Close processes the remaining buffered content and waits for the pending
+// ESI tags to be written.
+func (w *Writer) Close() error {
+ return w.stream.Close()
+}
- return len(b), nil
+// Unwrap returns the underlying http.ResponseWriter (used by http.ResponseController).
+func (w *Writer) Unwrap() http.ResponseWriter {
+ return w.rw
}
-var _ http.ResponseWriter = (*Writer)(nil)
+var (
+ _ http.ResponseWriter = (*Writer)(nil)
+ _ http.Flusher = (*Writer)(nil)
+)
diff --git a/writer/writer_test.go b/writer/writer_test.go
new file mode 100644
index 0000000..28cf1a5
--- /dev/null
+++ b/writer/writer_test.go
@@ -0,0 +1,56 @@
+package writer_test
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "testing"
+ "time"
+
+ "github.com/darkweak/go-esi/writer"
+)
+
+func TestWriter(t *testing.T) {
+ t.Parallel()
+
+ upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ time.Sleep(50 * time.Millisecond)
+
+ _, _ = w.Write([]byte("included " + r.URL.Path))
+ }))
+ defer upstream.Close()
+
+ handler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+ w.Header().Set("Content-Length", "1000")
+ w.WriteHeader(http.StatusCreated)
+ _, _ = w.Write([]byte(`$(HTTP_HOST)
|gone`))
+ })
+
+ esiHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ cw := writer.NewWriter(rw, r)
+ handler.ServeHTTP(cw, r)
+
+ if err := cw.Close(); err != nil {
+ t.Error(err)
+ }
+ })
+
+ // Point the relative includes to the upstream server.
+ rq := httptest.NewRequest(http.MethodGet, upstream.URL, nil)
+ rec := httptest.NewRecorder()
+ esiHandler.ServeHTTP(rec, rq)
+
+ if rec.Code != http.StatusCreated {
+ t.Errorf("want status %d, got %d", http.StatusCreated, rec.Code)
+ }
+
+ if cl := rec.Header().Get("Content-Length"); cl != "" {
+ t.Errorf("the Content-Length header must be removed, got %q", cl)
+ }
+
+ want := "" + rq.Host + "
included /a|included /b"
+ if got := rec.Body.String(); got != want {
+ t.Errorf("want %q, got %q", want, got)
+ }
+}