Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
buf.build/go/protovalidate v1.1.3
buf.build/go/protoyaml v0.6.0
buf.build/go/spdx v0.2.0
buf.build/go/standard v0.1.0
buf.build/go/standard v0.1.1-0.20260320140628-2996a887cf13
connectrpc.com/connect v1.19.1
connectrpc.com/otelconnect v0.9.0
github.com/bufbuild/protocompile v0.14.2-0.20260313233150-4b57e9e2a3ff
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ buf.build/go/protoyaml v0.6.0 h1:Nzz1lvcXF8YgNZXk+voPPwdU8FjDPTUV4ndNTXN0n2w=
buf.build/go/protoyaml v0.6.0/go.mod h1:RgUOsBu/GYKLDSIRgQXniXbNgFlGEZnQpRAUdLAFV2Q=
buf.build/go/spdx v0.2.0 h1:IItqM0/cMxvFJJumcBuP8NrsIzMs/UYjp/6WSpq8LTw=
buf.build/go/spdx v0.2.0/go.mod h1:bXdwQFem9Si3nsbNy8aJKGPoaPi5DKwdeEp5/ArZ6w8=
buf.build/go/standard v0.1.0 h1:g98T9IyvAl0vS3Pq8iVk6Cvj2ZiFvoUJRtfyGa0120U=
buf.build/go/standard v0.1.0/go.mod h1:PiqpHz/7ZFq+kqvYhc/SK3lxFIB9N/aiH2CFC2JHIQg=
buf.build/go/standard v0.1.1-0.20260320140628-2996a887cf13 h1:DKqZWklTpM7sDtEc4in34sI8mGxTA5C8QS3TOTvxjtc=
buf.build/go/standard v0.1.1-0.20260320140628-2996a887cf13/go.mod h1:PiqpHz/7ZFq+kqvYhc/SK3lxFIB9N/aiH2CFC2JHIQg=
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
connectrpc.com/connect v1.19.1 h1:R5M57z05+90EfEvCY1b7hBxDVOUl45PrtXtAV2fOC14=
Expand Down
4 changes: 2 additions & 2 deletions private/buf/bufstudioagent/bufstudioagent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"encoding/base64"
"errors"
"io"
"log/slog"
"net"
"net/http"
"net/http/httptest"
"strconv"
"testing"
"time"

"buf.build/go/standard/xlog/xslog"
"connectrpc.com/connect"
studiov1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/studio/v1alpha1"
"github.com/bufbuild/buf/private/pkg/protoencoding"
Expand Down Expand Up @@ -138,7 +138,7 @@ func testPlainPostHandler(t *testing.T, upstreamServer *httptest.Server) {
func testPlainPostHandlerErrors(t *testing.T, upstreamServer *httptest.Server) {
agentServer := httptest.NewTLSServer(
NewHandler(
xslog.NopLogger,
slog.New(slog.DiscardHandler),
"https://example.buf.build",
upstreamServer.TLS,
map[string]struct{}{"forbidden-header": {}},
Expand Down
6 changes: 3 additions & 3 deletions private/buf/buftesting/buftesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ package buftesting
import (
"context"
"io"
"log/slog"
"net/http"
"path/filepath"
"testing"
"time"

"buf.build/go/standard/xlog/xslog"
"github.com/bufbuild/buf/private/buf/bufprotoc"
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
"github.com/bufbuild/buf/private/pkg/github/githubtesting"
Expand All @@ -48,7 +48,7 @@ var (
}
testStorageosProvider = storageos.NewProvider(storageos.ProviderWithSymlinks())
testArchiveReader = githubtesting.NewArchiveReader(
xslog.NopLogger,
slog.New(slog.DiscardHandler),
testStorageosProvider,
testHTTPClient,
)
Expand Down Expand Up @@ -130,7 +130,7 @@ func GetProtocFilePathsErr(ctx context.Context, dirPath string, limit int) ([]st
// impact on our dependency tree.
moduleSet, err := bufprotoc.NewModuleSetForProtoc(
ctx,
xslog.NopLogger,
slog.New(slog.DiscardHandler),
testStorageosProvider,
[]string{dirPath},
nil,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"errors"
"fmt"
"io/fs"
"log/slog"
"os"
"path/filepath"
"strings"
"testing"

"buf.build/go/standard/xlog/xslog"
"github.com/bufbuild/buf/private/buf/buftesting"
"github.com/bufbuild/buf/private/bufpkg/bufimage"
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
Expand Down Expand Up @@ -141,7 +141,7 @@ func fuzzBuild(ctx context.Context, dirPath string) (bufimage.Image, error) {
}
return bufimage.BuildImage(
ctx,
xslog.NopLogger,
slog.New(slog.DiscardHandler),
bufmodule.ModuleSetToModuleReadBucketWithOnlyProtoFiles(moduleSet),
bufimage.WithExcludeSourceCodeInfo(),
)
Expand Down
4 changes: 2 additions & 2 deletions private/bufpkg/bufmodule/bufmoduletesting/bufmoduletesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"errors"
"fmt"
"io/fs"
"log/slog"
"time"

"buf.build/go/standard/xlog/xslog"
"buf.build/go/standard/xslices"
"github.com/bufbuild/buf/private/bufpkg/bufconfig"
"github.com/bufbuild/buf/private/bufpkg/bufmodule"
Expand Down Expand Up @@ -344,7 +344,7 @@ func newModuleSet(
// may be nil
commitIDToCreateTime map[uuid.UUID]time.Time,
) (bufmodule.ModuleSet, error) {
moduleSetBuilder := bufmodule.NewModuleSetBuilder(context.Background(), xslog.NopLogger, bufmodule.NopModuleDataProvider, bufmodule.NopCommitProvider)
moduleSetBuilder := bufmodule.NewModuleSetBuilder(context.Background(), slog.New(slog.DiscardHandler), bufmodule.NopModuleDataProvider, bufmodule.NopCommitProvider)
for i, moduleData := range moduleDatas {
if err := addModuleDataToModuleSetBuilder(
moduleSetBuilder,
Expand Down
Loading