api: generate Go protobufs to a module subdirectory

Per discussion with the go-control-plane maintainers, there is a desire
to move all the Envoy API protobufs into a new module that is distinct
from the go-control-plane xDS APIs. This is intended to eventually allow
users to update prodobuf definitions without requiring new releases
of go-control-plane.

This change updates the Go module path for API protobufs to
github.com/envoyproxy/go-control-plane/proto, which will be
an independently versioned Go module.

Note that this needs a corresponding CI machinery change in the
go-control-plane respository.

Signed-off-by: James Peach <jpeach@apache.org>

api/bazel/api_build_system.bzl

@@ -17,7 +17,7 @@ _PY_PROTO_SUFFIX = "_py_proto"
 _CC_PROTO_SUFFIX = "_cc_proto"
 _CC_GRPC_SUFFIX = "_cc_grpc"
 _GO_PROTO_SUFFIX = "_go_proto"
-_GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/go-control-plane/"
+_GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/go-control-plane/proto/"
 
 _COMMON_PROTO_DEPS = [
     "@com_google_protobuf//:any_proto",

api/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.proto

@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.config.v3alpha";
 option java_outer_classname = "KvStoreXdsDelegateConfigProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/config/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/config/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#extension: envoy.xds_delegates.kv_store]

api/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.proto

@@ -8,7 +8,7 @@ import "udpa/annotations/versioning.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.http.dynamo.v3";
 option java_outer_classname = "DynamoProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamo/v3;dynamov3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/http/dynamo/v3;dynamov3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Dynamo]

api/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.http.golang.v3alpha";
 option java_outer_classname = "GolangProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/golang/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/http/golang/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/http/language/v3alpha/language.proto

@@ -8,7 +8,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.http.language.v3alpha";
 option java_outer_classname = "LanguageProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/language/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/http/language/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Language]

api/contrib/envoy/extensions/filters/http/squash/v3/squash.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.http.squash.v3";
 option java_outer_classname = "SquashProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/squash/v3;squashv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/http/squash/v3;squashv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Squash]

api/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.http.sxg.v3alpha";
 option java_outer_classname = "SxgProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/sxg/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/http/sxg/v3alpha";
 option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 

api/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.proto

@@ -14,7 +14,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.client_ssl_auth.v3";
 option java_outer_classname = "ClientSslAuthProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/client_ssl_auth/v3;client_ssl_authv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/client_ssl_auth/v3;client_ssl_authv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Client TLS authentication]

api/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto

@@ -15,7 +15,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.action.v3";
 option java_outer_classname = "ActionProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/action/v3;actionv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto

@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.codecs.dubbo.v3";
 option java_outer_classname = "DubboProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3;dubbov3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.matcher.v3";
 option java_outer_classname = "MatcherProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/matcher/v3;matcherv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto

@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.router.v3";
 option java_outer_classname = "RouterProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/router/v3;routerv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto

@@ -15,7 +15,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "GenericProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto

@@ -11,7 +11,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.generic_proxy.v3";
 option java_outer_classname = "RouteProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/generic_proxy/v3;generic_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto

@@ -9,7 +9,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.kafka_broker.v3";
 option java_outer_classname = "KafkaBrokerProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/kafka_broker/v3;kafka_brokerv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/kafka_broker/v3;kafka_brokerv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Kafka Broker]

api/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.proto

@@ -10,7 +10,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.kafka_mesh.v3alpha";
 option java_outer_classname = "KafkaMeshProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/kafka_mesh/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/kafka_mesh/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto

@@ -9,7 +9,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.mysql_proxy.v3";
 option java_outer_classname = "MysqlProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/mysql_proxy/v3;mysql_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/mysql_proxy/v3;mysql_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: MySQL proxy]

api/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto

@@ -10,7 +10,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.postgres_proxy.v3alpha";
 option java_outer_classname = "PostgresProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/postgres_proxy/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/postgres_proxy/v3alpha";
 option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 

api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.rocketmq_proxy.v3";
 option java_outer_classname = "RocketmqProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: RocketMQ Proxy]

api/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.rocketmq_proxy.v3";
 option java_outer_classname = "RouteProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Rocketmq Proxy Route Configuration]

api/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.proto

@@ -7,7 +7,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.sip_proxy.router.v3alpha";
 option java_outer_classname = "RouterProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sip_proxy/router/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/sip_proxy/router/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Router]

api/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto

@@ -13,7 +13,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.sip_proxy.tra.v3alpha";
 option java_outer_classname = "TraProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sip_proxy/tra/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/sip_proxy/tra/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: TRA]

api/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.proto

@@ -8,7 +8,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.sip_proxy.v3alpha";
 option java_outer_classname = "RouteProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sip_proxy/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/sip_proxy/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Sip Proxy Route Configuration]

api/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.proto

@@ -14,7 +14,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.filters.network.sip_proxy.v3alpha";
 option java_outer_classname = "SipProxyProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sip_proxy/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/filters/network/sip_proxy/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Sip Proxy]

api/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.proto

@@ -8,7 +8,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.matching.input_matchers.hyperscan.v3alpha";
 option java_outer_classname = "HyperscanProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/hyperscan/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/matching/input_matchers/hyperscan/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Hyperscan matcher]

api/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.proto

@@ -7,7 +7,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.network.connection_balance.dlb.v3alpha";
 option java_outer_classname = "DlbProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/network/connection_balance/dlb/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/network/connection_balance/dlb/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Dlb connection balancer configuration]

api/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.proto

@@ -13,7 +13,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.private_key_providers.cryptomb.v3alpha";
 option java_outer_classname = "CryptombProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/private_key_providers/cryptomb/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/private_key_providers/cryptomb/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: CryptoMb private key provider]

api/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.proto

@@ -13,7 +13,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.private_key_providers.qat.v3alpha";
 option java_outer_classname = "QatProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/private_key_providers/qat/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/private_key_providers/qat/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: `QAT` private key provider]

api/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.proto

@@ -7,7 +7,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.regex_engines.hyperscan.v3alpha";
 option java_outer_classname = "HyperscanProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/regex_engines/hyperscan/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/regex_engines/hyperscan/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Hyperscan]

api/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.proto

@@ -12,7 +12,7 @@ import "validate/validate.proto";
 option java_package = "io.envoyproxy.envoy.extensions.router.cluster_specifier.golang.v3alpha";
 option java_outer_classname = "GolangProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/router/cluster_specifier/golang/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/router/cluster_specifier/golang/v3alpha";
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 option (xds.annotations.v3.file_status).work_in_progress = true;
 

api/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.proto

@@ -7,7 +7,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.extensions.vcl.v3alpha";
 option java_outer_classname = "VclSocketInterfaceProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/vcl/v3alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/extensions/vcl/v3alpha";
 option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 

api/envoy/admin/v2alpha/certs.proto

@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "CertsProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Certificates]

api/envoy/admin/v2alpha/clusters.proto

@@ -13,7 +13,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ClustersProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Clusters]

api/envoy/admin/v2alpha/config_dump.proto

@@ -12,7 +12,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ConfigDumpProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: ConfigDump]

api/envoy/admin/v2alpha/listeners.proto

@@ -9,7 +9,7 @@ import "udpa/annotations/status.proto";
 option java_package = "io.envoyproxy.envoy.admin.v2alpha";
 option java_outer_classname = "ListenersProto";
 option java_multiple_files = true;
-option go_package = "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha";
+option go_package = "github.com/envoyproxy/go-control-plane/proto/envoy/admin/v2alpha";
 option (udpa.annotations.file_status).package_version_status = FROZEN;
 
 // [#protodoc-title: Listeners]