Skip to content

Commit 6f7bbf1

Browse files
committed
Merge remote-tracking branch 'origin/main' into mcy/lsp-breaking
2 parents d9190e7 + dfeacfa commit 6f7bbf1

File tree

312 files changed

+5024
-3563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+5024
-3563
lines changed

.github/ISSUE_TEMPLATE/1-bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ body:
77
value: |
88
Thanks for helping us improve Buf by filing bugs, we really appreciate it! For us to investigate your issue efficiently, we need a minimal reproducible example. We get lots of support requests, so please help us help you. We find that the easiest way to do this is by linking to a GitHub repository with the setup of the example, as well as a set of commands for us to run on this GitHub repository to reproduce the issue. You can use an existing GitHub repository, or a temporary GitHub repository you create.
99
10-
**If you do not provide a minimal reproducible example in a GitHub repository, we may have to close your issue. We apologize, but we have to be efficient with our support requests, and we appreciate your help.**
10+
**If you do not provide a minimal reproducible example in a GitHub repository, we will likely close your issue until a reproducible example is provided. We apologize, but we have to be efficient with our support requests, and we appreciate your help.**
1111
1212
[This article](https://stackoverflow.com/help/minimal-reproducible-example) on minimal reproducible examples may be of use!
1313
- type: input
1414
id: github-repository
1515
attributes:
16-
label: GitHub repository with your minimal reproducible example (do not fill out this field with "github.com/bufbuild/buf" or we will automatically close your issue, see the instructions above!)
16+
label: GitHub repository with your minimal reproducible example (do not leave this field blank or fill out this field with "github.com/bufbuild/buf" or we will automatically close your issue, see the instructions above!)
1717
description: Provide us with a link to the GitHub repository that contains the setup needed to reproduce the issue. This is a repository you create, and is required for us to investigate your issue.
1818
placeholder: https://github.com/you/temp-repo-with-repro
1919
validations:

.github/ISSUE_TEMPLATE/3-other.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ body:
88
99
If this is a question about some behavior you are witnessing, we will need a minimal reproducible example. We get lots of support requests, so please help us help you. We find that the easiest way to do this is by linking to a GitHub repository with the setup of the example, as well as a set of commands for us to run on this GitHub repository to reproduce the issue. You can use an existing GitHub repository, or a temporary GitHub repository you create.
1010
11-
**If this is a question about some behavior you are witnessing, and you do not provide a minimal reproducible example in a GitHub repository, we may have to close your issue. We apologize, but we have to be efficient with our support requests, and we appreciate your help.**
11+
**If this is a question about some behavior you are witnessing, and you do not provide a minimal reproducible example in a GitHub repository, we will likely close your issue until a reproducible example is provided. We apologize, but we have to be efficient with our support requests, and we appreciate your help.**
1212
1313
[This article](https://stackoverflow.com/help/minimal-reproducible-example) on minimal reproducible examples may be of use!
1414
- type: input
1515
id: github-repository
1616
attributes:
17-
label: GitHub repository with your minimal reproducible example (do not fill out this field with "github.com/bufbuild/buf" or we will automatically close your issue, see the instructions above!)
17+
label: GitHub repository with your minimal reproducible example (do not leave this field blank or fill out this field with "github.com/bufbuild/buf" or we will automatically close your issue, see the instructions above!)
1818
description: If this is a question about some behavior you are witnessing, provide us with a link to the GitHub repository that contains the setup needed to reproduce the issue. This is a repository you create, and is required for us to investigate your issue.
1919
placeholder: https://github.com/you/temp-repo-with-repro
2020
- type: textarea

.golangci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ linters-settings:
55
forbid:
66
# Use private/pkg/thread.Parallelize
77
- '^errgroup\.'
8-
# Use private/pkg/command.Runner
8+
# Use private/pkg/execext
99
- '^exec\.Cmd$'
1010
- '^exec\.Command$'
1111
- '^exec\.CommandContext$'
@@ -218,6 +218,10 @@ issues:
218218
- containedctx
219219
# we actually want to embed a context here
220220
path: private/bufpkg/bufmodule/module_set_builder.go
221+
- linters:
222+
- containedctx
223+
# we actually want to embed a context here
224+
path: private/pkg/execext/process.go
221225
- linters:
222226
- gochecknoinits
223227
# we actually want to use init here
@@ -230,15 +234,15 @@ issues:
230234
- linters:
231235
- forbidigo
232236
# this is one of two files we want to allow exec.Cmd functions in
233-
path: private/pkg/command/process.go
237+
path: private/pkg/execext/execext.go
234238
- linters:
235239
- forbidigo
236240
# this is one of two files we want to allow exec.Cmd functions in
237-
path: private/pkg/command/runner.go
241+
path: private/pkg/execext/process.go
238242
- linters:
239243
- gosec
240244
# G204 checks that exec.Command is not called with non-constants.
241-
path: private/pkg/command/runner.go
245+
path: private/pkg/execext/execext.go
242246
text: "G204:"
243247
- linters:
244248
- gosec

CHANGELOG.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@
44

55
- No changes yet.
66

7+
## [v1.47.2] - 2024-11-14
8+
9+
- Update the patch version to resolve NPM packaging issues. No command updates or user changes.
10+
11+
## [v1.47.1] - 2024-11-14
12+
13+
- Update the patch version to resolve NPM packaging issues. No command updates or user changes.
14+
15+
## [v1.47.0] - 2024-11-13
16+
17+
- Move `buf registry commit` to `buf registry module commit`. Command
18+
`buf registry commit` is now deprecated.
19+
- Move `buf registry label` to `buf registry module label`. Command
20+
`buf registry label` is now deprecated.
21+
22+
## [v1.46.0] - 2024-10-29
23+
24+
- Add `buf registry whoami` command, which checks if you are logged in to the Buf Schema
25+
Registry at a given domain.
26+
727
## [v1.45.0] - 2024-10-08
828

929
- Update `buf registry module info --format=json` to add `default_label_name`, which provides the name
@@ -1282,7 +1302,11 @@ buf check breaking proto --against .git#branch=master,subdir=proto
12821302

12831303
Initial beta release.
12841304

1285-
[Unreleased]: https://github.com/bufbuild/buf/compare/v1.45.0...HEAD
1305+
[Unreleased]: https://github.com/bufbuild/buf/compare/v1.47.2...HEAD
1306+
[v1.47.2]: https://github.com/bufbuild/buf/compare/v1.47.1...v1.47.2
1307+
[v1.47.1]: https://github.com/bufbuild/buf/compare/v1.47.0...v1.47.1
1308+
[v1.47.0]: https://github.com/bufbuild/buf/compare/v1.46.0...v1.47.0
1309+
[v1.46.0]: https://github.com/bufbuild/buf/compare/v1.45.0...v1.46.0
12861310
[v1.45.0]: https://github.com/bufbuild/buf/compare/v1.44.0...v1.45.0
12871311
[v1.44.0]: https://github.com/bufbuild/buf/compare/v1.43.0...v1.44.0
12881312
[v1.43.0]: https://github.com/bufbuild/buf/compare/v1.42.0...v1.43.0

go.mod

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
module github.com/bufbuild/buf
22

3-
go 1.22.0
3+
go 1.22.7
44

5-
toolchain go1.23.2
5+
toolchain go1.23.3
66

77
require (
8-
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.34.2-20240928190436-5e8abcfd7a7e.2
9-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.1-20240920164238-5a7b106cbb87.1
10-
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.17.0-20241007185750-f2282fe532fe.1
11-
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.35.1-20241007185750-f2282fe532fe.1
12-
buf.build/go/bufplugin v0.5.0
8+
buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.35.2-20241031151143-70f632351282.1
9+
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.35.2-20240920164238-5a7b106cbb87.1
10+
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.17.0-20241025140216-aa40f2c93090.1
11+
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.35.2-20241025140216-aa40f2c93090.1
12+
buf.build/go/bufplugin v0.6.0
1313
buf.build/go/protoyaml v0.2.0
1414
buf.build/go/spdx v0.2.0
1515
connectrpc.com/connect v1.17.0
1616
connectrpc.com/otelconnect v0.7.1
1717
github.com/bufbuild/protocompile v0.14.1
1818
github.com/bufbuild/protoplugin v0.0.0-20240911180120-7bb73e41a54a
19-
github.com/bufbuild/protovalidate-go v0.7.2
19+
github.com/bufbuild/protovalidate-go v0.7.3-0.20241015162221-1446f1e1d576
2020
github.com/docker/docker v27.3.1+incompatible
2121
github.com/go-chi/chi/v5 v5.1.0
2222
github.com/gofrs/flock v0.12.1
23-
github.com/google/cel-go v0.21.0
23+
github.com/google/cel-go v0.22.0
2424
github.com/google/go-cmp v0.6.0
2525
github.com/google/go-containerregistry v0.20.2
2626
github.com/google/uuid v1.6.0
@@ -30,45 +30,45 @@ require (
3030
github.com/klauspost/pgzip v1.2.6
3131
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
3232
github.com/pkg/profile v1.7.0
33-
github.com/quic-go/quic-go v0.48.0
33+
github.com/quic-go/quic-go v0.48.1
3434
github.com/rs/cors v1.11.1
3535
github.com/spf13/cobra v1.8.1
3636
github.com/spf13/pflag v1.0.5
3737
github.com/stretchr/testify v1.9.0
3838
github.com/tetratelabs/wazero v1.8.1
3939
go.lsp.dev/jsonrpc2 v0.10.0
4040
go.lsp.dev/protocol v0.12.0
41-
go.uber.org/atomic v1.11.0
42-
go.uber.org/multierr v1.11.0
4341
go.uber.org/zap v1.27.0
4442
go.uber.org/zap/exp v0.3.0
45-
golang.org/x/crypto v0.28.0
46-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
47-
golang.org/x/mod v0.21.0
48-
golang.org/x/net v0.30.0
49-
golang.org/x/sync v0.8.0
50-
golang.org/x/term v0.25.0
51-
golang.org/x/tools v0.26.0
52-
google.golang.org/protobuf v1.35.1
43+
golang.org/x/crypto v0.29.0
44+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
45+
golang.org/x/mod v0.22.0
46+
golang.org/x/net v0.31.0
47+
golang.org/x/sync v0.9.0
48+
golang.org/x/term v0.26.0
49+
golang.org/x/tools v0.27.0
50+
google.golang.org/protobuf v1.35.2
5351
gopkg.in/yaml.v3 v3.0.1
5452
pluginrpc.com/pluginrpc v0.5.0
5553
)
5654

5755
require (
58-
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.34.2-20241007202033-cf42259fcbfc.2 // indirect
56+
buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.35.1-20241007202033-cf42259fcbfc.1 // indirect
57+
cel.dev/expr v0.18.0 // indirect
5958
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
6059
github.com/Microsoft/go-winio v0.6.2 // indirect
61-
github.com/Microsoft/hcsshim v0.12.7 // indirect
60+
github.com/Microsoft/hcsshim v0.12.9 // indirect
6261
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
6362
github.com/containerd/cgroups/v3 v3.0.3 // indirect
6463
github.com/containerd/containerd v1.7.23 // indirect
65-
github.com/containerd/continuity v0.4.3 // indirect
66-
github.com/containerd/errdefs v0.3.0 // indirect
64+
github.com/containerd/continuity v0.4.5 // indirect
65+
github.com/containerd/errdefs v1.0.0 // indirect
66+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6767
github.com/containerd/log v0.1.0 // indirect
6868
github.com/containerd/platforms v0.2.1 // indirect
69-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
70-
github.com/containerd/ttrpc v1.2.5 // indirect
71-
github.com/containerd/typeurl/v2 v2.2.0 // indirect
69+
github.com/containerd/stargz-snapshotter/estargz v0.16.1 // indirect
70+
github.com/containerd/ttrpc v1.2.6 // indirect
71+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
7272
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
7373
github.com/davecgh/go-spew v1.1.1 // indirect
7474
github.com/distribution/reference v0.6.0 // indirect
@@ -84,7 +84,7 @@ require (
8484
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
8585
github.com/gogo/protobuf v1.3.2 // indirect
8686
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
87-
github.com/google/pprof v0.0.0-20241017200806-017d972448fc // indirect
87+
github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
8888
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8989
github.com/mattn/go-isatty v0.0.20 // indirect
9090
github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -98,7 +98,7 @@ require (
9898
github.com/moby/sys/userns v0.1.0 // indirect
9999
github.com/moby/term v0.5.0 // indirect
100100
github.com/morikuni/aec v1.0.0 // indirect
101-
github.com/onsi/ginkgo/v2 v2.20.2 // indirect
101+
github.com/onsi/ginkgo/v2 v2.21.0 // indirect
102102
github.com/opencontainers/go-digest v1.0.0 // indirect
103103
github.com/opencontainers/image-spec v1.1.0 // indirect
104104
github.com/opencontainers/runtime-spec v1.2.0 // indirect
@@ -114,14 +114,15 @@ require (
114114
go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 // indirect
115115
go.lsp.dev/uri v0.3.0 // indirect
116116
go.opencensus.io v0.24.0 // indirect
117-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
118-
go.opentelemetry.io/otel v1.31.0 // indirect
119-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
120-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
118+
go.opentelemetry.io/otel v1.32.0 // indirect
119+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
120+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
121121
go.uber.org/mock v0.5.0 // indirect
122-
golang.org/x/sys v0.26.0 // indirect
123-
golang.org/x/text v0.19.0 // indirect
124-
google.golang.org/genproto/googleapis/api v0.0.0-20240924160255-9d4c2d233b61 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240924160255-9d4c2d233b61 // indirect
126-
google.golang.org/grpc v1.67.1 // indirect
122+
go.uber.org/multierr v1.11.0 // indirect
123+
golang.org/x/sys v0.27.0 // indirect
124+
golang.org/x/text v0.20.0 // indirect
125+
google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
127+
google.golang.org/grpc v1.68.0 // indirect
127128
)

0 commit comments

Comments
 (0)