Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add use_proto_names and use_enum_numbers as options for json and yaml file formats #2601

Merged
merged 9 commits into from
Nov 17, 2023
Merged
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
16 changes: 11 additions & 5 deletions private/buf/bufcli/bufcli.go
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ func NewWireImageReader(
) bufwire.ImageReader {
return bufwire.NewImageReader(
logger,
newFetchImageReader(logger, storageosProvider, runner),
newFetchMessageReader(logger, storageosProvider, runner),
)
}

Expand All @@ -506,9 +506,12 @@ func NewWireImageWriter(
// NewWireProtoEncodingReader returns a new ProtoEncodingReader.
func NewWireProtoEncodingReader(
logger *zap.Logger,
storageosProvider storageos.Provider,
runner command.Runner,
) bufwire.ProtoEncodingReader {
return bufwire.NewProtoEncodingReader(
logger,
newFetchMessageReader(logger, storageosProvider, runner),
)
}

Expand All @@ -518,6 +521,9 @@ func NewWireProtoEncodingWriter(
) bufwire.ProtoEncodingWriter {
return bufwire.NewProtoEncodingWriter(
logger,
buffetch.NewWriter(
logger,
),
)
}

Expand Down Expand Up @@ -1010,14 +1016,14 @@ func newFetchSourceReader(
)
}

// newFetchImageReader creates a new buffetch.ImageReader with the default HTTP client
// newFetchMessageReader creates a new buffetch.MessageReader with the default HTTP client
// and git cloner.
func newFetchImageReader(
func newFetchMessageReader(
logger *zap.Logger,
storageosProvider storageos.Provider,
runner command.Runner,
) buffetch.ImageReader {
return buffetch.NewImageReader(
) buffetch.MessageReader {
return buffetch.NewMessageReader(
logger,
storageosProvider,
defaultHTTPClient,
Expand Down
147 changes: 0 additions & 147 deletions private/buf/bufconvert/bufconvert.go

This file was deleted.

40 changes: 0 additions & 40 deletions private/buf/bufconvert/message_encoding_ref.go

This file was deleted.

19 changes: 0 additions & 19 deletions private/buf/bufconvert/usage.gen.go

This file was deleted.

Loading