Bump google.golang.org/protobuf to v1.33.0 (#2801)

stefanvanburen · web-flow · commit eb3622e06e8f · 2024-03-05T17:48:06.000-05:00
Actually pulls in the changes to go.mod - followup to #2800.
diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ require (
 	golang.org/x/sync v0.6.0
 	golang.org/x/term v0.17.0
 	golang.org/x/tools v0.18.0
-	google.golang.org/protobuf v1.32.1-0.20240201194910-82c6b3ad29a1
+	google.golang.org/protobuf v1.33.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
diff --git a/go.sum b/go.sum
@@ -212,8 +212,8 @@ google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.32.1-0.20240201194910-82c6b3ad29a1 h1:yBEuAb1JVsln3dc0nWGi1my/Aw66AhuznQ1rosGcJkc=
-google.golang.org/protobuf v1.32.1-0.20240201194910-82c6b3ad29a1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/private/bufpkg/bufcheck/bufbreaking/bufbreaking_test.go b/private/bufpkg/bufcheck/bufbreaking/bufbreaking_test.go
@@ -440,7 +440,6 @@ func TestRunBreakingFileSameValues(t *testing.T) {
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 19, 1, 19, 36, "FILE_SAME_CC_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 20, 1, 20, 38, "FILE_SAME_JAVA_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 21, 1, 21, 36, "FILE_SAME_PY_GENERIC_SERVICES"),
-		bufanalysistesting.NewFileAnnotation(t, "1.proto", 22, 1, 22, 37, "FILE_SAME_PHP_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "1.proto", 23, 1, 23, 33, "FILE_SAME_CC_ENABLE_ARENAS"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 3, 1, 3, 11, "FILE_SAME_PACKAGE"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 5, 1, 5, 29, "FILE_SAME_JAVA_PACKAGE"),
@@ -459,7 +458,6 @@ func TestRunBreakingFileSameValues(t *testing.T) {
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 19, 1, 19, 35, "FILE_SAME_CC_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 20, 1, 20, 37, "FILE_SAME_JAVA_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 21, 1, 21, 35, "FILE_SAME_PY_GENERIC_SERVICES"),
-		bufanalysistesting.NewFileAnnotation(t, "2.proto", 22, 1, 22, 36, "FILE_SAME_PHP_GENERIC_SERVICES"),
 		bufanalysistesting.NewFileAnnotation(t, "2.proto", 23, 1, 23, 33, "FILE_SAME_CC_ENABLE_ARENAS"),
 	)
 }
diff --git a/private/pkg/protosource/file.go b/private/pkg/protosource/file.go
@@ -143,7 +143,9 @@ func (f *file) PyGenericServices() bool {
 }
 
 func (f *file) PhpGenericServices() bool {
-	return f.fileDescriptor.GetOptions().GetPhpGenericServices()
+	// Support for PhpGenericServices was removed in
+	// https://github.com/protocolbuffers/protobuf/pull/15164
+	return false
 }
 
 func (f *file) CcEnableArenas() bool {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ require (`
`39`	`39`	`golang.org/x/sync v0.6.0`
`40`	`40`	`golang.org/x/term v0.17.0`
`41`	`41`	`golang.org/x/tools v0.18.0`
`42`		`- google.golang.org/protobuf v1.32.1-0.20240201194910-82c6b3ad29a1`
	`42`	`+ google.golang.org/protobuf v1.33.0`
`43`	`43`	`gopkg.in/yaml.v3 v3.0.1`
`44`	`44`	`)`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@ func (f *file) PyGenericServices() bool {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`func (f *file) PhpGenericServices() bool {`
`146`		`- return f.fileDescriptor.GetOptions().GetPhpGenericServices()`
	`146`	`+ // Support for PhpGenericServices was removed in`
	`147`	`+ // https://github.com/protocolbuffers/protobuf/pull/15164`
	`148`	`+ return false`
`147`	`149`	`}`
`148`	`150`
`149`	`151`	`func (f *file) CcEnableArenas() bool {`