api: force migrate v3alpha -> v3 (envoyproxy#18392)

Also adjust wip status for some things that are known to be used in
production.

Fixes envoyproxy#17920

Signed-off-by: Matt Klein <mklein@lyft.com>

EXTENSION_POLICY.md

@@ -92,8 +92,8 @@ The `status` is one of:
 The extension status may be adjusted by the extension [CODEOWNERS](./CODEOWNERS) and/or Envoy
 maintainers based on an assessment of the above criteria. Note that the status of the extension
 reflects the implementation status. It is orthogonal to the API stability, for example, an extension
-with configuration `envoy.foo.v3alpha.Bar` might have a `stable` implementation and
-`envoy.foo.v3.Baz` can have a `wip` implementation.
+API marked with `(xds.annotations.v3.file_status).work_in_progress` might have a `stable` implementation and
+and an extension with a stable config proto can have a `wip` implementation.
 
 The `security_posture` is one of:
 * `robust_to_untrusted_downstream`: The extension is hardened against untrusted downstream traffic. It

api/BUILD

@@ -97,10 +97,10 @@ proto_library(
         "//envoy/data/tap/v3:pkg",
         "//envoy/extensions/access_loggers/file/v3:pkg",
         "//envoy/extensions/access_loggers/grpc/v3:pkg",
-        "//envoy/extensions/access_loggers/open_telemetry/v3alpha:pkg",
+        "//envoy/extensions/access_loggers/open_telemetry/v3:pkg",
         "//envoy/extensions/access_loggers/stream/v3:pkg",
         "//envoy/extensions/access_loggers/wasm/v3:pkg",
-        "//envoy/extensions/cache/simple_http_cache/v3alpha:pkg",
+        "//envoy/extensions/cache/simple_http_cache/v3:pkg",
         "//envoy/extensions/clusters/aggregate/v3:pkg",
         "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg",
         "//envoy/extensions/clusters/redis/v3:pkg",
@@ -116,14 +116,14 @@ proto_library(
         "//envoy/extensions/filters/common/fault/v3:pkg",
         "//envoy/extensions/filters/common/matcher/action/v3:pkg",
         "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg",
-        "//envoy/extensions/filters/http/admission_control/v3alpha:pkg",
+        "//envoy/extensions/filters/http/admission_control/v3:pkg",
         "//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg",
         "//envoy/extensions/filters/http/aws_lambda/v3:pkg",
         "//envoy/extensions/filters/http/aws_request_signing/v3:pkg",
-        "//envoy/extensions/filters/http/bandwidth_limit/v3alpha:pkg",
+        "//envoy/extensions/filters/http/bandwidth_limit/v3:pkg",
         "//envoy/extensions/filters/http/buffer/v3:pkg",
-        "//envoy/extensions/filters/http/cache/v3alpha:pkg",
-        "//envoy/extensions/filters/http/cdn_loop/v3alpha:pkg",
+        "//envoy/extensions/filters/http/cache/v3:pkg",
+        "//envoy/extensions/filters/http/cdn_loop/v3:pkg",
         "//envoy/extensions/filters/http/composite/v3:pkg",
         "//envoy/extensions/filters/http/compressor/v3:pkg",
         "//envoy/extensions/filters/http/cors/v3:pkg",
@@ -132,7 +132,7 @@ proto_library(
         "//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg",
         "//envoy/extensions/filters/http/dynamo/v3:pkg",
         "//envoy/extensions/filters/http/ext_authz/v3:pkg",
-        "//envoy/extensions/filters/http/ext_proc/v3alpha:pkg",
+        "//envoy/extensions/filters/http/ext_proc/v3:pkg",
         "//envoy/extensions/filters/http/fault/v3:pkg",
         "//envoy/extensions/filters/http/grpc_http1_bridge/v3:pkg",
         "//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3:pkg",
@@ -147,7 +147,7 @@ proto_library(
         "//envoy/extensions/filters/http/kill_request/v3:pkg",
         "//envoy/extensions/filters/http/local_ratelimit/v3:pkg",
         "//envoy/extensions/filters/http/lua/v3:pkg",
-        "//envoy/extensions/filters/http/oauth2/v3alpha:pkg",
+        "//envoy/extensions/filters/http/oauth2/v3:pkg",
         "//envoy/extensions/filters/http/on_demand/v3:pkg",
         "//envoy/extensions/filters/http/original_src/v3:pkg",
         "//envoy/extensions/filters/http/ratelimit/v3:pkg",
@@ -175,14 +175,14 @@ proto_library(
         "//envoy/extensions/filters/network/rbac/v3:pkg",
         "//envoy/extensions/filters/network/redis_proxy/v3:pkg",
         "//envoy/extensions/filters/network/sni_cluster/v3:pkg",
-        "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg",
+        "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3:pkg",
         "//envoy/extensions/filters/network/tcp_proxy/v3:pkg",
         "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg",
         "//envoy/extensions/filters/network/thrift_proxy/router/v3:pkg",
         "//envoy/extensions/filters/network/thrift_proxy/v3:pkg",
         "//envoy/extensions/filters/network/wasm/v3:pkg",
         "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg",
-        "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg",
+        "//envoy/extensions/filters/udp/dns_filter/v3:pkg",
         "//envoy/extensions/filters/udp/udp_proxy/v3:pkg",
         "//envoy/extensions/formatter/metadata/v3:pkg",
         "//envoy/extensions/formatter/req_without_query/v3:pkg",
@@ -215,7 +215,7 @@ proto_library(
         "//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg",
         "//envoy/extensions/transport_sockets/quic/v3:pkg",
         "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg",
-        "//envoy/extensions/transport_sockets/s2a/v3alpha:pkg",
+        "//envoy/extensions/transport_sockets/s2a/v3:pkg",
         "//envoy/extensions/transport_sockets/starttls/v3:pkg",
         "//envoy/extensions/transport_sockets/tap/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
@@ -225,14 +225,14 @@ proto_library(
         "//envoy/extensions/upstreams/http/v3:pkg",
         "//envoy/extensions/upstreams/tcp/generic/v3:pkg",
         "//envoy/extensions/wasm/v3:pkg",
-        "//envoy/extensions/watchdog/profile_action/v3alpha:pkg",
+        "//envoy/extensions/watchdog/profile_action/v3:pkg",
         "//envoy/service/accesslog/v3:pkg",
         "//envoy/service/auth/v3:pkg",
         "//envoy/service/cluster/v3:pkg",
         "//envoy/service/discovery/v3:pkg",
         "//envoy/service/endpoint/v3:pkg",
         "//envoy/service/event_reporting/v3:pkg",
-        "//envoy/service/ext_proc/v3alpha:pkg",
+        "//envoy/service/ext_proc/v3:pkg",
         "//envoy/service/extension/v3:pkg",
         "//envoy/service/health/v3:pkg",
         "//envoy/service/listener/v3:pkg",
@@ -250,7 +250,7 @@ proto_library(
         "//envoy/type/metadata/v3:pkg",
         "//envoy/type/tracing/v3:pkg",
         "//envoy/type/v3:pkg",
-        "//envoy/watchdog/v3alpha:pkg",
+        "//envoy/watchdog/v3:pkg",
     ],
 )
 

api/envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.proto → api/envoy/extensions/access_loggers/open_telemetry/v3/logs_service.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.access_loggers.open_telemetry.v3alpha;
+package envoy.extensions.access_loggers.open_telemetry.v3;
 
 import "envoy/extensions/access_loggers/grpc/v3/als.proto";
 
@@ -9,10 +9,9 @@ import "opentelemetry/proto/common/v1/common.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.access_loggers.open_telemetry.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.access_loggers.open_telemetry.v3";
 option java_outer_classname = "LogsServiceProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: OpenTelemetry (gRPC) Access Log]

api/envoy/extensions/cache/simple_http_cache/v3alpha/config.proto → api/envoy/extensions/cache/simple_http_cache/v3/config.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-package envoy.extensions.cache.simple_http_cache.v3alpha;
+package envoy.extensions.cache.simple_http_cache.v3;
 
 import "udpa/annotations/status.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.cache.simple_http_cache.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.cache.simple_http_cache.v3";
 option java_outer_classname = "ConfigProto";
 option java_multiple_files = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;

api/envoy/extensions/filters/http/admission_control/v3alpha/admission_control.proto → api/envoy/extensions/filters/http/admission_control/v3/admission_control.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.admission_control.v3alpha;
+package envoy.extensions.filters.http.admission_control.v3;
 
 import "envoy/config/core/v3/base.proto";
 import "envoy/type/v3/range.proto";
@@ -10,10 +10,9 @@ import "google/protobuf/duration.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.admission_control.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.admission_control.v3";
 option java_outer_classname = "AdmissionControlProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Admission Control]

api/envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.proto → api/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.bandwidth_limit.v3alpha;
+package envoy.extensions.filters.http.bandwidth_limit.v3;
 
 import "envoy/config/core/v3/base.proto";
 
@@ -10,10 +10,9 @@ import "google/protobuf/wrappers.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.bandwidth_limit.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.bandwidth_limit.v3";
 option java_outer_classname = "BandwidthLimitProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Bandwidth limit]

api/envoy/extensions/filters/http/cache/v3alpha/cache.proto → api/envoy/extensions/filters/http/cache/v3/cache.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.cache.v3alpha;
+package envoy.extensions.filters.http.cache.v3;
 
 import "envoy/config/route/v3/route_components.proto";
 import "envoy/type/matcher/v3/string.proto";
@@ -11,10 +11,9 @@ import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.cache.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.cache.v3";
 option java_outer_classname = "CacheProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: HTTP Cache Filter]

api/envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.proto → api/envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.proto

@@ -1,14 +1,13 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.cdn_loop.v3alpha;
+package envoy.extensions.filters.http.cdn_loop.v3;
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.cdn_loop.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.cdn_loop.v3";
 option java_outer_classname = "CdnLoopProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: HTTP CDN-Loop Filter]

api/envoy/extensions/filters/http/ext_proc/v3alpha/BUILD → api/envoy/extensions/filters/http/ext_proc/v3/BUILD

@@ -8,5 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
     ],
 )

api/envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.proto → api/envoy/extensions/filters/http/ext_proc/v3/ext_proc.proto

@@ -1,20 +1,22 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.ext_proc.v3alpha;
+package envoy.extensions.filters.http.ext_proc.v3;
 
 import "envoy/config/core/v3/grpc_service.proto";
-import "envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto";
+import "envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto";
 
 import "google/protobuf/duration.proto";
 
+import "xds/annotations/v3/status.proto";
+
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3";
 option java_outer_classname = "ExtProcProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
+option (xds.annotations.v3.file_status).work_in_progress = true;
 
 // [#protodoc-title: External Processing Filter]
 // External Processing Filter
@@ -88,9 +90,9 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 //
 // The protocol itself is based on a bidirectional gRPC stream. Envoy will send the
 // server
-// :ref:`ProcessingRequest <envoy_v3_api_msg_service.ext_proc.v3alpha.ProcessingRequest>`
+// :ref:`ProcessingRequest <envoy_v3_api_msg_service.ext_proc.v3.ProcessingRequest>`
 // messages, and the server must reply with
-// :ref:`ProcessingResponse <envoy_v3_api_msg_service.ext_proc.v3alpha.ProcessingResponse>`.
+// :ref:`ProcessingResponse <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>`.
 
 // [#next-free-field: 9]
 message ExternalProcessor {

api/envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto → api/envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto

@@ -1,15 +1,17 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.ext_proc.v3alpha;
+package envoy.extensions.filters.http.ext_proc.v3;
+
+import "xds/annotations/v3/status.proto";
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3";
 option java_outer_classname = "ProcessingModeProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
+option (xds.annotations.v3.file_status).work_in_progress = true;
 
 // [#protodoc-title: External Processing Filter]
 // External Processing Filter Processing Mode

api/envoy/extensions/filters/http/oauth2/v3alpha/oauth.proto → api/envoy/extensions/filters/http/oauth2/v3/oauth.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.http.oauth2.v3alpha;
+package envoy.extensions.filters.http.oauth2.v3;
 
 import "envoy/config/core/v3/http_uri.proto";
 import "envoy/config/route/v3/route_components.proto";
@@ -10,10 +10,9 @@ import "envoy/type/matcher/v3/path.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.http.oauth2.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.http.oauth2.v3";
 option java_outer_classname = "OauthProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: OAuth]

api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.proto → api/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.proto

@@ -1,16 +1,15 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha;
+package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3;
 
 import "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto";
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3";
 option java_outer_classname = "SniDynamicForwardProxyProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: SNI dynamic forward proxy]

api/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto → api/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package envoy.extensions.filters.udp.dns_filter.v3alpha;
+package envoy.extensions.filters.udp.dns_filter.v3;
 
 import "envoy/config/core/v3/address.proto";
 import "envoy/config/core/v3/base.proto";
@@ -13,10 +13,9 @@ import "envoy/annotations/deprecation.proto";
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.filters.udp.dns_filter.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.filters.udp.dns_filter.v3";
 option java_outer_classname = "DnsFilterProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: DNS Filter]

api/envoy/extensions/transport_sockets/s2a/v3alpha/s2a.proto → api/envoy/extensions/transport_sockets/s2a/v3/s2a.proto

@@ -1,14 +1,13 @@
 syntax = "proto3";
 
-package envoy.extensions.transport_sockets.s2a.v3alpha;
+package envoy.extensions.transport_sockets.s2a.v3;
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.s2a.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.s2a.v3";
 option java_outer_classname = "S2aProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#not-implemented-hide:]

api/envoy/extensions/watchdog/profile_action/v3alpha/profile_action.proto → api/envoy/extensions/watchdog/profile_action/v3/profile_action.proto

@@ -1,16 +1,15 @@
 syntax = "proto3";
 
-package envoy.extensions.watchdog.profile_action.v3alpha;
+package envoy.extensions.watchdog.profile_action.v3;
 
 import "google/protobuf/duration.proto";
 
 import "udpa/annotations/status.proto";
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.extensions.watchdog.profile_action.v3alpha";
+option java_package = "io.envoyproxy.envoy.extensions.watchdog.profile_action.v3";
 option java_outer_classname = "ProfileActionProto";
 option java_multiple_files = true;
-option (udpa.annotations.file_status).work_in_progress = true;
 option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 // [#protodoc-title: Watchdog Action that does CPU profiling.]

api/envoy/service/ext_proc/v3alpha/BUILD → api/envoy/service/ext_proc/v3/BUILD

@@ -8,8 +8,9 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "//envoy/extensions/filters/http/ext_proc/v3alpha:pkg",
+        "//envoy/extensions/filters/http/ext_proc/v3:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
     ],
 )