Upgrade to protoc 3.17.3 compatibility (#337)

bufbuild · Jun 8, 2021 · 7f21551 · 7f21551
1 parent 323819e
commit 7f21551
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 32 deletions.
diff --git a/go.mod b/go.mod
@@ -21,8 +21,8 @@ require (
 	go.uber.org/zap v1.17.0
 	golang.org/x/mod v0.4.2
 	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
-	golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect
-	google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect
+	golang.org/x/sys v0.0.0-20210608053332-aa57babbf139 // indirect
+	google.golang.org/genproto v0.0.0-20210607140030-00d4fb20b1ae // indirect
 	google.golang.org/grpc v1.39.0-dev.0.20210519181852-3dd75a6888ce
 	google.golang.org/protobuf v1.26.1-0.20210520194023-50a85913fbce
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b

diff --git a/go.sum b/go.sum
@@ -330,8 +330,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210603125802-9665404d3644 h1:CA1DEQ4NdKphKeL70tvsWNdT5oFh1lOjihRcEDROi0I=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210608053332-aa57babbf139 h1:C+AwYEtBp/VQwoLntUmQ/yx3MS9vmZaKNdw5eOpoQe8=
+golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -391,8 +391,8 @@ google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBr
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 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-20210604141403-392c879c8b08 h1:pc16UedxnxXXtGxHCSUhafAoVHQZ0yXl8ZelMH4EETc=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210607140030-00d4fb20b1ae h1:2dB4bZ/B7RJdKuvHk3mKTzL2xwrikb+Y/QQy7WdyBPk=
+google.golang.org/genproto v0.0.0-20210607140030-00d4fb20b1ae/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

diff --git a/internal/gen/proto/go/buf/alpha/api/v1alpha1/api.pb.go b/internal/gen/proto/go/buf/alpha/api/v1alpha1/api.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/image/v1/image.pb.go b/internal/gen/proto/go/buf/alpha/image/v1/image.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go b/internal/gen/proto/go/buf/alpha/module/v1alpha1/module.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/download.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/download_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/download_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/module.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/organization.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/organization_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/organization_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/push.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/push_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/push_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_branch_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_commit_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/repository_tag_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/resolve.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/resolve_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/resolve_grpc.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/scope.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/scope.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/user.pb.go
diff --git a/internal/gen/proto/go/buf/alpha/registry/v1alpha1/user_grpc.pb.go b/internal/gen/proto/go/buf/alpha/registry/v1alpha1/user_grpc.pb.go
diff --git a/internal/pkg/app/appproto/appprotoexec/appprotoexec.go b/internal/pkg/app/appproto/appprotoexec/appprotoexec.go
@@ -33,7 +33,7 @@ const (
 	// DefaultMinorVersion is the default minor version.
 	DefaultMinorVersion = 17
 	// DefaultPatchVersion is the default patch version.
-	DefaultPatchVersion = 1
+	DefaultPatchVersion = 3
 	// DefaultSuffixVersion is the default suffix version.
 	DefaultSuffixVersion = ""
 )

diff --git a/make/go/dep_protoc.mk b/make/go/dep_protoc.mk
@@ -10,8 +10,8 @@ $(call _assert_var,CACHE_INCLUDE)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/protocolbuffers/protobuf/releases 20210524 checked 20210527
-PROTOC_VERSION ?= 3.17.1
+# https://github.com/protocolbuffers/protobuf/releases 20210608 checked 20210608
+PROTOC_VERSION ?= 3.17.3
 
 # There are no protobuf releases for Darwin ARM so for
 # now we always use the x86_64 release through Rosetta.