This is an automated email from the ASF dual-hosted git repository.

shunping pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 011e1b33e24 Fix pubsubio import of removed genproto package (fixes 
#40018) (#40059)
011e1b33e24 is described below

commit 011e1b33e24b0eb68be225e4e4f845348d6c57bd
Author: DiezNobach <[email protected]>
AuthorDate: Fri Sep 25 21:56:38 2026 +0200

    Fix pubsubio import of removed genproto package (fixes #40018) (#40059)
    
    Co-authored-by: Shunping Huang <[email protected]>
---
 CHANGES.md                               | 1 +
 sdks/go.mod                              | 4 ++--
 sdks/go/pkg/beam/io/pubsubio/pubsubio.go | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 982af563be2..6327e07585a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -82,6 +82,7 @@
 
 * (Go) Fixed a data race on the Prism runner's artifact cache map in 
JobServices ([#32656](https://github.com/apache/beam/issues/32656)).
 * (Java) Fixed the declared schema of the error output of the Kafka write 
SchemaTransform, which wrapped the error schema a second time and did not match 
the rows it emits ([#39760](https://github.com/apache/beam/issues/39760)).
+* (Go) Fixed pubsubio importing a `google.golang.org/genproto` package removed 
in recent releases, which broke builds of Go modules depending on a current 
`genproto` version ([#40018](https://github.com/apache/beam/issues/40018)).
 * Fixed X (Java/Python) ([#X](https://github.com/apache/beam/issues/X)).
 
 ## Security Fixes
diff --git a/sdks/go.mod b/sdks/go.mod
index 52dee3f44d9..6dedb73a964 100644
--- a/sdks/go.mod
+++ b/sdks/go.mod
@@ -61,7 +61,7 @@ require (
        golang.org/x/sys v0.48.0
        golang.org/x/text v0.42.0
        google.golang.org/api v0.299.0
-       google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d
+       google.golang.org/genproto v0.0.0-20260715232425-e75dac1f907d // 
indirect
        google.golang.org/grpc v1.84.0
        google.golang.org/protobuf v1.36.12
        gopkg.in/yaml.v2 v2.4.0
@@ -83,7 +83,7 @@ require (
        cloud.google.com/go/auth v0.23.3 // indirect
        cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
        cloud.google.com/go/monitoring v1.30.0 // indirect
-       cloud.google.com/go/pubsub/v2 v2.6.2 // indirect
+       cloud.google.com/go/pubsub/v2 v2.6.2
        dario.cat/mergo v1.0.2 // indirect
        filippo.io/edwards25519 v1.2.0 // indirect
        github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.6.0 // indirect
diff --git a/sdks/go/pkg/beam/io/pubsubio/pubsubio.go 
b/sdks/go/pkg/beam/io/pubsubio/pubsubio.go
index c90782d46dc..bf2aded0e59 100644
--- a/sdks/go/pkg/beam/io/pubsubio/pubsubio.go
+++ b/sdks/go/pkg/beam/io/pubsubio/pubsubio.go
@@ -25,6 +25,7 @@ import (
        "fmt"
        "reflect"
 
+       pb "cloud.google.com/go/pubsub/v2/apiv1/pubsubpb"
        "github.com/apache/beam/sdks/v2/go/pkg/beam"
        "github.com/apache/beam/sdks/v2/go/pkg/beam/core/typex"
        "github.com/apache/beam/sdks/v2/go/pkg/beam/core/util/protox"
@@ -32,7 +33,6 @@ import (
        pipepb "github.com/apache/beam/sdks/v2/go/pkg/beam/model/pipeline_v1"
        "github.com/apache/beam/sdks/v2/go/pkg/beam/register"
        "github.com/apache/beam/sdks/v2/go/pkg/beam/util/pubsubx"
-       pb "google.golang.org/genproto/googleapis/pubsub/v1"
        "google.golang.org/protobuf/proto"
 )
 

Reply via email to