migrate from v2alpha to v2 (#7044)

Signed-off-by: Yangmin Zhu <ymzhu@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ e5b2e526562174f84b9c2e575ad8d6b4f9576d0a

docs/BUILD

@@ -71,7 +71,7 @@ proto_library(
         "//envoy/config/metrics/v2:metrics_service",
         "//envoy/config/metrics/v2:stats",
         "//envoy/config/ratelimit/v2:rls",
-        "//envoy/config/rbac/v2alpha:rbac",
+        "//envoy/config/rbac/v2:rbac",
         "//envoy/config/resource_monitor/fixed_heap/v2alpha:fixed_heap",
         "//envoy/config/resource_monitor/injected_resource/v2alpha:injected_resource",
         "//envoy/config/trace/v2:trace",

envoy/config/filter/http/rbac/v2/BUILD

@@ -5,5 +5,5 @@ licenses(["notice"])  # Apache 2
 api_proto_library_internal(
     name = "rbac",
     srcs = ["rbac.proto"],
-    deps = ["//envoy/config/rbac/v2alpha:rbac"],
+    deps = ["//envoy/config/rbac/v2:rbac"],
 )

envoy/config/filter/http/rbac/v2/rbac.proto

@@ -7,7 +7,7 @@ option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.http.rbac.v2";
 option go_package = "v2";
 
-import "envoy/config/rbac/v2alpha/rbac.proto";
+import "envoy/config/rbac/v2/rbac.proto";
 
 import "validate/validate.proto";
 import "gogoproto/gogo.proto";
@@ -19,12 +19,12 @@ import "gogoproto/gogo.proto";
 message RBAC {
   // Specify the RBAC rules to be applied globally.
   // If absent, no enforcing RBAC policy will be applied.
-  config.rbac.v2alpha.RBAC rules = 1;
+  config.rbac.v2.RBAC rules = 1;
 
   // Shadow rules are not enforced by the filter (i.e., returning a 403)
   // but will emit stats and logs and can be used for rule testing.
   // If absent, no shadow RBAC policy will be applied.
-  config.rbac.v2alpha.RBAC shadow_rules = 2;
+  config.rbac.v2.RBAC shadow_rules = 2;
 }
 
 message RBACPerRoute {

envoy/config/filter/network/rbac/v2/BUILD

@@ -5,5 +5,5 @@ licenses(["notice"])  # Apache 2
 api_proto_library_internal(
     name = "rbac",
     srcs = ["rbac.proto"],
-    deps = ["//envoy/config/rbac/v2alpha:rbac"],
+    deps = ["//envoy/config/rbac/v2:rbac"],
 )

envoy/config/filter/network/rbac/v2/rbac.proto

@@ -7,7 +7,7 @@ option java_multiple_files = true;
 option java_package = "io.envoyproxy.envoy.config.filter.network.rbac.v2";
 option go_package = "v2";
 
-import "envoy/config/rbac/v2alpha/rbac.proto";
+import "envoy/config/rbac/v2/rbac.proto";
 
 import "validate/validate.proto";
 import "gogoproto/gogo.proto";
@@ -22,12 +22,12 @@ import "gogoproto/gogo.proto";
 message RBAC {
   // Specify the RBAC rules to be applied globally.
   // If absent, no enforcing RBAC policy will be applied.
-  config.rbac.v2alpha.RBAC rules = 1;
+  config.rbac.v2.RBAC rules = 1;
 
   // Shadow rules are not enforced by the filter but will emit stats and logs
   // and can be used for rule testing.
   // If absent, no shadow RBAC policy will be applied.
-  config.rbac.v2alpha.RBAC shadow_rules = 2;
+  config.rbac.v2.RBAC shadow_rules = 2;
 
   // The prefix to use when emitting statistics.
   string stat_prefix = 3 [(validate.rules).string.min_bytes = 1];

envoy/config/rbac/v2/rbac.proto

@@ -7,12 +7,12 @@ import "envoy/api/v2/route/route.proto";
 import "envoy/type/matcher/metadata.proto";
 import "envoy/type/matcher/string.proto";
 
-package envoy.config.rbac.v2alpha;
+package envoy.config.rbac.v2;
 
 option java_outer_classname = "RbacProto";
 option java_multiple_files = true;
-option java_package = "io.envoyproxy.envoy.config.rbac.v2alpha";
+option java_package = "io.envoyproxy.envoy.config.rbac.v2";
-option go_package = "v2alpha";
+option go_package = "v2";
 
 option (gogoproto.stable_marshaler_all) = true;
 

envoy/type/matcher/metadata.proto

@@ -69,8 +69,8 @@ import "validate/validate.proto";
 //
 // An example use of MetadataMatcher is specifying additional metadata in envoy.filters.http.rbac to
 // enforce access control based on dynamic metadata in a request. See :ref:`Permission
-// <envoy_api_msg_config.rbac.v2alpha.Permission>` and :ref:`Principal
+// <envoy_api_msg_config.rbac.v2.Permission>` and :ref:`Principal
-// <envoy_api_msg_config.rbac.v2alpha.Principal>`.
+// <envoy_api_msg_config.rbac.v2.Principal>`.
 message MetadataMatcher {
   // Specifies the segment in a path to retrieve value from Metadata.
   // Note: Currently it's not supported to retrieve a value from a list in Metadata. This means that