From cd9d299cee8dd1d24c6c01017f13012b980b680e Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 00:59:26 +0000 Subject: [PATCH] proto: correct go_package of contrib (#31019) Commit Message: proto: correct go_package of contrib Additional Description: This fixes up the go_package descriptor on contrib/ protos. I am not sure how the bazel protoc stuff works, but standard proto compiler seems trip up on this being incorrect, and generate invalid imports Risk Level: Low Testing: Manual Mirrored from https://github.com/envoyproxy/envoy @ f97242a970eb6637b2aa8bba916f589672a1d190 --- .../config/v3alpha/kv_store_xds_delegate_config.proto | 2 +- .../extensions/filters/http/checksum/v3alpha/checksum.proto | 2 +- contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.proto | 2 +- .../envoy/extensions/filters/http/golang/v3alpha/golang.proto | 2 +- .../extensions/filters/http/language/v3alpha/language.proto | 2 +- contrib/envoy/extensions/filters/http/squash/v3/squash.proto | 2 +- contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto | 2 +- .../filters/network/client_ssl_auth/v3/client_ssl_auth.proto | 2 +- .../filters/network/generic_proxy/action/v3/action.proto | 2 +- .../filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto | 2 +- .../filters/network/generic_proxy/matcher/v3/matcher.proto | 2 +- .../filters/network/generic_proxy/router/v3/router.proto | 2 +- .../filters/network/generic_proxy/v3/generic_proxy.proto | 2 +- .../extensions/filters/network/generic_proxy/v3/route.proto | 2 +- .../extensions/filters/network/golang/v3alpha/golang.proto | 2 +- .../filters/network/kafka_broker/v3/kafka_broker.proto | 2 +- .../filters/network/kafka_mesh/v3alpha/kafka_mesh.proto | 2 +- .../extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto | 2 +- .../filters/network/postgres_proxy/v3alpha/postgres_proxy.proto | 2 +- .../filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto | 2 +- .../extensions/filters/network/rocketmq_proxy/v3/route.proto | 2 +- .../filters/network/sip_proxy/router/v3alpha/router.proto | 2 +- .../extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto | 2 +- .../extensions/filters/network/sip_proxy/v3alpha/route.proto | 2 +- .../filters/network/sip_proxy/v3alpha/sip_proxy.proto | 2 +- .../matching/input_matchers/hyperscan/v3alpha/hyperscan.proto | 2 +- .../extensions/network/connection_balance/dlb/v3alpha/dlb.proto | 2 +- .../private_key_providers/cryptomb/v3alpha/cryptomb.proto | 2 +- .../extensions/private_key_providers/qat/v3alpha/qat.proto | 2 +- .../extensions/regex_engines/hyperscan/v3alpha/hyperscan.proto | 2 +- .../router/cluster_specifier/golang/v3alpha/golang.proto | 2 +- contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.proto | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.proto b/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.proto index 639264240..bc982743e 100644 --- a/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.proto +++ b/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/contrib/envoy/extensions/config/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#extension: envoy.xds_delegates.kv_store] diff --git a/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.proto b/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.proto index ba4c2fe75..4255437ec 100644 --- a/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.proto +++ b/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.proto @@ -12,7 +12,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.extensions.filters.http.checksum.v3alpha"; option java_outer_classname = "ChecksumProto"; option java_multiple_files = true; -option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/checksum/v3alpha"; +option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/http/checksum/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; option (xds.annotations.v3.file_status).work_in_progress = true; diff --git a/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.proto b/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.proto index 9d6feb4ec..d0d4c8c13 100644 --- a/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.proto +++ b/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/contrib/envoy/extensions/filters/http/dynamo/v3;dynamov3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Dynamo] diff --git a/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.proto b/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.proto index ee1268a25..2d05509b5 100644 --- a/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/http/language/v3alpha/language.proto b/contrib/envoy/extensions/filters/http/language/v3alpha/language.proto index 47f296707..74d32828f 100644 --- a/contrib/envoy/extensions/filters/http/language/v3alpha/language.proto +++ b/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/contrib/envoy/extensions/filters/http/language/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Language] diff --git a/contrib/envoy/extensions/filters/http/squash/v3/squash.proto b/contrib/envoy/extensions/filters/http/squash/v3/squash.proto index 6f178e1a9..d78263cf8 100644 --- a/contrib/envoy/extensions/filters/http/squash/v3/squash.proto +++ b/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/contrib/envoy/extensions/filters/http/squash/v3;squashv3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Squash] diff --git a/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto b/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto index 5d1deb4eb..7f8dd1434 100644 --- a/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.proto +++ b/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/contrib/envoy/extensions/filters/http/sxg/v3alpha"; option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.proto b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.proto index 6b45a59e5..80fd09375 100644 --- a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.proto +++ b/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/contrib/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] diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto b/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto index 119b8e7f8..d60a6f760 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/action/v3/action.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto index d5b6782e6..47a2af159 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto b/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto index 13990866e..2490a0b9b 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto b/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto index 67f14fecf..a70641523 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/router/v3/router.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto b/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto index 84a34265f..7e35eabdb 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto +++ b/contrib/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.proto @@ -16,7 +16,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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto b/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto index c29826618..2ac8b0f93 100644 --- a/contrib/envoy/extensions/filters/network/generic_proxy/v3/route.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.proto b/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.proto index f1051bc1a..e4ef538b3 100644 --- a/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.proto +++ b/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.proto @@ -12,7 +12,7 @@ import "validate/validate.proto"; option java_package = "io.envoyproxy.envoy.extensions.filters.network.golang.v3alpha"; option java_outer_classname = "GolangProto"; option java_multiple_files = true; -option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/golang/v3alpha"; +option go_package = "github.com/envoyproxy/go-control-plane/contrib/envoy/extensions/filters/network/golang/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; option (xds.annotations.v3.file_status).work_in_progress = true; diff --git a/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto b/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto index 26b3fbcea..b8ab1d7e8 100644 --- a/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.proto +++ b/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/contrib/envoy/extensions/filters/network/kafka_broker/v3;kafka_brokerv3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Kafka Broker] diff --git a/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.proto b/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.proto index 68c71f296..26336dc57 100644 --- a/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto b/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto index b1bce3bc9..f3f2cefdc 100644 --- a/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.proto +++ b/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/contrib/envoy/extensions/filters/network/mysql_proxy/v3;mysql_proxyv3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: MySQL proxy] diff --git a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto index afded237e..21a3049a1 100644 --- a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto index dc8de3aae..cca6abbd7 100644 --- a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.proto +++ b/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/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: RocketMQ Proxy] diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto index ff76d9d34..2810aaba7 100644 --- a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.proto +++ b/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/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3;rocketmq_proxyv3"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Rocketmq Proxy Route Configuration] diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.proto b/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.proto index 15a313749..b4bb27938 100644 --- a/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.proto +++ b/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/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Router] diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto index 8599a3817..daeff268d 100644 --- a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.proto +++ b/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/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: TRA] diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.proto b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.proto index 5f906b531..614f1c510 100644 --- a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.proto +++ b/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/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Sip Proxy Route Configuration] diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.proto b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.proto index 6843f7d3b..99396f366 100644 --- a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.proto +++ b/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/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Sip Proxy] diff --git a/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.proto b/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.proto index 1b64326b0..8336fdf71 100644 --- a/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.proto +++ b/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/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Hyperscan matcher] diff --git a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.proto b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.proto index 57eac9b6a..234a9f9a3 100644 --- a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.proto +++ b/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/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Dlb connection balancer configuration] diff --git a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.proto b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.proto index d3407beab..20290d888 100644 --- a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.proto +++ b/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/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: CryptoMb private key provider] diff --git a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.proto b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.proto index e5c58e11f..d90bb7e33 100644 --- a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.proto +++ b/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/contrib/envoy/extensions/private_key_providers/qat/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: `QAT` private key provider] diff --git a/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.proto b/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.proto index 881d9d9bf..7353e2f27 100644 --- a/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.proto +++ b/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/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha"; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Hyperscan] diff --git a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.proto b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.proto index f22685aff..884f88e29 100644 --- a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.proto +++ b/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/contrib/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; diff --git a/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.proto b/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.proto index fc9d2b885..48155ecf9 100644 --- a/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.proto +++ b/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/contrib/envoy/extensions/vcl/v3alpha"; option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE;