Merge branch 'main' into ed/splitMapper

.github/workflows/buf-binary-size.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
       - name: cache
         uses: actions/cache@v4
         with:

.github/workflows/build-and-draft-release.yaml

@@ -32,7 +32,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
       - name: Set up Git name and email
         run: |
           git config user.name "${{ github.actor }}"

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
       - name: cache
         uses: actions/cache@v4
         with:
@@ -50,7 +50,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
       - name: cache
         uses: actions/cache@v4
         with:

.github/workflows/codeql.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
       - name: initialize
         uses: github/codeql-action/init@v3
         with:

.github/workflows/previous.yaml

@@ -9,7 +9,7 @@ jobs:
   test-previous:
     strategy:
       matrix:
-        go-version: ['1.20.x', '1.21.x']
+        go-version: ['1.21.x', '1.22.x']
     runs-on: ubuntu-latest
     steps:
       - name: checkout

.github/workflows/windows.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.23.x'
           cache: true
       - name: windows-cache
         uses: actions/cache@v4

.pre-commit-hooks.yaml

@@ -1,58 +1,58 @@
 - id: buf-generate
   name: buf generate
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf generate
   types: [proto]
   pass_filenames: false
 - id: buf-breaking
   name: buf breaking
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf breaking
   types: [proto]
   pass_filenames: false
 - id: buf-lint
   name: buf lint
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf lint
   types: [proto]
   pass_filenames: false
 - id: buf-format
   name: buf format
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf format -w --exit-code
   types: [proto]
   pass_filenames: false
 - id: buf-dep-update
   name: buf dep update
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf dep update
   files: '(buf\.lock|buf\.yaml)'
   pass_filenames: false
 - id: buf-dep-prune
   name: buf dep prune
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf dep prune
   files: '(buf\.lock|buf\.yaml)'
   pass_filenames: false
   # Deprecated: use buf-dep-update instead.
 - id: buf-mod-update
   name: buf mod update
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf mod update
   files: '(buf\.lock|buf\.yaml)'
   pass_filenames: false
   # Deprecated: use buf-dep-prune instead.
 - id: buf-mod-prune
   name: buf mod prune
   language: golang
-  language_version: 1.22.1
+  language_version: 1.23.0
   entry: buf mod prune
   files: '(buf\.lock|buf\.yaml)'
   pass_filenames: false

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - No changes yet.
 
+## [v1.37.0] - 2024-08-16
+
+- Add `STABLE_PACKAGE_NO_IMPORT_UNSTABLE` lint rule which disallows files from stable packages
+  to import files from unstable packages.
+- Fix plugin push failures when pushing an image built with containerd image store.
+
 ## [v1.36.0] - 2024-08-06
 
 - Add `--list-services` and `--list-methods` flags to `buf curl`, which trigger the command to list
@@ -1202,7 +1208,8 @@ buf check breaking proto --against .git#branch=master,subdir=proto
 
 Initial beta release.
 
-[Unreleased]: https://github.com/bufbuild/buf/compare/v1.36.0...HEAD
+[Unreleased]: https://github.com/bufbuild/buf/compare/v1.37.0...HEAD
+[v1.37.0]: https://github.com/bufbuild/buf/compare/v1.36.0...v1.37.0
 [v1.36.0]: https://github.com/bufbuild/buf/compare/v1.35.1...v1.36.0
 [v1.35.1]: https://github.com/bufbuild/buf/compare/v1.35.0...v1.35.1
 [v1.35.0]: https://github.com/bufbuild/buf/compare/v1.34.0...v1.35.0

go.mod

@@ -1,24 +1,26 @@
 module github.com/bufbuild/buf
 
-go 1.20
+go 1.21.0
+
+toolchain go1.23.0
 
 require (
-	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-20240508200655-46a4cf4ba109.2
-	buf.build/gen/go/bufbuild/registry/connectrpc/go v1.16.2-20240610164129-660609bc46d3.1
-	buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.34.2-20240610164129-660609bc46d3.2
+	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-20240717164558-a6c49f84cc0f.2
+	buf.build/gen/go/bufbuild/registry/connectrpc/go v1.16.2-20240801134127-09fbc17f7c9e.1
+	buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.34.2-20240801134127-09fbc17f7c9e.2
 	connectrpc.com/connect v1.16.2
-	connectrpc.com/otelconnect v0.7.0
+	connectrpc.com/otelconnect v0.7.1
 	github.com/bufbuild/protocompile v0.14.0
 	github.com/bufbuild/protoplugin v0.0.0-20240323223605-e2735f6c31ee
-	github.com/bufbuild/protovalidate-go v0.6.2
-	github.com/bufbuild/protoyaml-go v0.1.9
-	github.com/docker/docker v27.0.0+incompatible
-	github.com/go-chi/chi/v5 v5.0.14
-	github.com/gofrs/flock v0.8.1
-	github.com/gofrs/uuid/v5 v5.2.0
-	github.com/google/cel-go v0.20.1
+	github.com/bufbuild/protovalidate-go v0.6.4
+	github.com/bufbuild/protoyaml-go v0.1.11
+	github.com/docker/docker v27.1.2+incompatible
+	github.com/go-chi/chi/v5 v5.1.0
+	github.com/gofrs/flock v0.12.1
+	github.com/gofrs/uuid/v5 v5.3.0
+	github.com/google/cel-go v0.21.0
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-containerregistry v0.19.2
+	github.com/google/go-containerregistry v0.20.2
 	github.com/jdx/go-netrc v1.0.0
 	github.com/jhump/protoreflect v1.16.0
 	github.com/klauspost/compress v1.17.9
@@ -29,34 +31,41 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/otel v1.24.0
-	go.opentelemetry.io/otel/sdk v1.24.0
-	go.opentelemetry.io/otel/trace v1.24.0
+	go.opentelemetry.io/otel v1.28.0
+	go.opentelemetry.io/otel/sdk v1.28.0
+	go.opentelemetry.io/otel/trace v1.28.0
 	go.uber.org/atomic v1.11.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.24.0
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
-	golang.org/x/mod v0.18.0
-	golang.org/x/net v0.26.0
-	golang.org/x/sync v0.7.0
-	golang.org/x/term v0.21.0
-	golang.org/x/tools v0.22.0
+	golang.org/x/crypto v0.26.0
+	golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
+	golang.org/x/mod v0.20.0
+	golang.org/x/net v0.28.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/term v0.23.0
+	golang.org/x/tools v0.24.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/Microsoft/hcsshim v0.12.5 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/containerd/cgroups/v3 v3.0.3 // indirect
+	github.com/containerd/containerd v1.7.20 // indirect
+	github.com/containerd/continuity v0.4.3 // indirect
+	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
+	github.com/containerd/ttrpc v1.2.5 // indirect
+	github.com/containerd/typeurl/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/cli v26.1.4+incompatible // indirect
+	github.com/docker/cli v27.1.2+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
@@ -66,29 +75,38 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/pprof v0.0.0-20240622144329-c177fd99eaa9 // indirect
+	github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/mount v0.3.4 // indirect
+	github.com/moby/sys/mountinfo v0.7.2 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.3.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/runtime-spec v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect
 	github.com/vbatts/tar-split v0.11.5 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
 )