From 2af1c432ce11b01e46cf70d7933f71a3310282d6 Mon Sep 17 00:00:00 2001 From: John Millikin Date: Thu, 14 Apr 2022 06:26:50 +0900 Subject: [PATCH] Use fully-qualified import paths in `go_package` options. (#219) The Protobuf documentation for [`go_package`][1] requires that it contain a fully-qualified import path, with an optional package name override. As of [CL 301953][2] (released in [protobuf-go v1.26][3]), this requirement is being enforced by the `protoc-gen-go` plugin. I set the `go_package` options such that there is no change to generated code compared to the previous version. This required overriding the package names for the `remoteasset`, `remoteexecution`, and `remotelogstream` packages, since those have import paths ending in `/v1` or `/v2`. Fixes #181 [1]: https://developers.google.com/protocol-buffers/docs/reference/go-generated#package [2]: https://go-review.googlesource.com/c/protobuf/+/301953/ [3]: https://github.com/protocolbuffers/protobuf-go/releases/tag/v1.26.0 --- build/bazel/remote/asset/v1/remote_asset.proto | 2 +- build/bazel/remote/execution/v2/remote_execution.proto | 2 +- build/bazel/remote/logstream/v1/remote_logstream.proto | 2 +- build/bazel/semver/semver.proto | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/bazel/remote/asset/v1/remote_asset.proto b/build/bazel/remote/asset/v1/remote_asset.proto index e11fc7b1..4d9be817 100644 --- a/build/bazel/remote/asset/v1/remote_asset.proto +++ b/build/bazel/remote/asset/v1/remote_asset.proto @@ -23,7 +23,7 @@ import "google/protobuf/timestamp.proto"; import "google/rpc/status.proto"; option csharp_namespace = "Build.Bazel.Remote.Asset.v1"; -option go_package = "remoteasset"; +option go_package = "github.com/bazelbuild/remote-apis/build/bazel/remote/asset/v1;remoteasset"; option java_multiple_files = true; option java_outer_classname = "RemoteAssetProto"; option java_package = "build.bazel.remote.asset.v1"; diff --git a/build/bazel/remote/execution/v2/remote_execution.proto b/build/bazel/remote/execution/v2/remote_execution.proto index 86dbdd4f..c0503984 100644 --- a/build/bazel/remote/execution/v2/remote_execution.proto +++ b/build/bazel/remote/execution/v2/remote_execution.proto @@ -26,7 +26,7 @@ import "google/protobuf/wrappers.proto"; import "google/rpc/status.proto"; option csharp_namespace = "Build.Bazel.Remote.Execution.V2"; -option go_package = "remoteexecution"; +option go_package = "github.com/bazelbuild/remote-apis/build/bazel/remote/execution/v2;remoteexecution"; option java_multiple_files = true; option java_outer_classname = "RemoteExecutionProto"; option java_package = "build.bazel.remote.execution.v2"; diff --git a/build/bazel/remote/logstream/v1/remote_logstream.proto b/build/bazel/remote/logstream/v1/remote_logstream.proto index d87e4570..a6994aee 100644 --- a/build/bazel/remote/logstream/v1/remote_logstream.proto +++ b/build/bazel/remote/logstream/v1/remote_logstream.proto @@ -19,7 +19,7 @@ syntax = "proto3"; package build.bazel.remote.logstream.v1; option csharp_namespace = "Build.Bazel.Remote.LogStream.v1"; -option go_package = "remotelogstream"; +option go_package = "github.com/bazelbuild/remote-apis/build/bazel/remote/logstream/v1;remotelogstream"; option java_multiple_files = true; option java_outer_classname = "RemoteLogStreamProto"; option java_package = "build.bazel.remote.logstream.v1"; diff --git a/build/bazel/semver/semver.proto b/build/bazel/semver/semver.proto index 3b626b7e..44f83f85 100644 --- a/build/bazel/semver/semver.proto +++ b/build/bazel/semver/semver.proto @@ -17,7 +17,7 @@ syntax = "proto3"; package build.bazel.semver; option csharp_namespace = "Build.Bazel.Semver"; -option go_package = "semver"; +option go_package = "github.com/bazelbuild/remote-apis/build/bazel/semver"; option java_multiple_files = true; option java_outer_classname = "SemverProto"; option java_package = "build.bazel.semver";