feedback

Signed-off-by: Snow Pettersen <[email protected]>
cncf · Jul 14, 2021 · 3e17b7a · 3e17b7a
1 parent 2e5c007
commit 3e17b7a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 23 deletions.
diff --git a/udpa/extension/v1/BUILD b/udpa/extension/v1/BUILD
diff --git a/udpa/extension/v1/extension.proto → xds/core/v3/extension.proto b/udpa/extension/v1/extension.proto → xds/core/v3/extension.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-package udpa.extension.v1;
+package xds.core.v3;
 
 option java_outer_classname = "ExtensionProto";
 option java_multiple_files = true;
-option java_package = "com.github.udpa.udpa.extension.v1";
+option java_package = "com.github.udpa.xds.core.v1";
 
 import "validate/validate.proto";
 import "google/protobuf/any.proto";

diff --git a/udpa/type/matcher/v1/BUILD → xds/type/matcher/v3/BUILD b/udpa/type/matcher/v1/BUILD → xds/type/matcher/v3/BUILD
@@ -3,5 +3,5 @@ load("//bazel:api_build_system.bzl", "udpa_proto_package")
 licenses(["notice"]) #Apache 2
 
 udpa_proto_package(deps = [
-"//udpa/extension/v1:pkg",
+"//xds/core/v3:pkg",
 ])
diff --git a/udpa/type/matcher/v1/matcher.proto → xds/type/matcher/v3/matcher.proto b/udpa/type/matcher/v1/matcher.proto → xds/type/matcher/v3/matcher.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package udpa.type.matcher.v1;
+package xds.type.matcher.v3;
 
-import "udpa/extension/v1/extension.proto";
-import "udpa/type/matcher/v1/string.proto";
+import "xds/core/v3/extension.proto";
+import "xds/type/matcher/v3/string.proto";
 
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.config.common.matcher.v3";
+option java_package = "com.github.udpa.xds.type.matcher.v3";
 option java_outer_classname = "MatcherProto";
 option java_multiple_files = true;
 
@@ -34,7 +34,7 @@ message Matcher {
       Matcher matcher = 1;
 
       // Protocol-specific action to take.
-      extension.v1.TypedExtensionConfig action = 2;
+      core.v3.TypedExtensionConfig action = 2;
     }
   }
 
@@ -48,17 +48,17 @@ message Matcher {
       message SinglePredicate {
         // Protocol-specific specification of input field to match on.
         // [#extension-category: envoy.matching.common_inputs]
-        extension.v1.TypedExtensionConfig input = 1 [(validate.rules).message = {required: true}];
+        core.v3.TypedExtensionConfig input = 1 [(validate.rules).message = {required: true}];
 
         oneof matcher {
           option (validate.required) = true;
 
           // Built-in string matcher.
-          type.matcher.v1.StringMatcher value_match = 2;
+          type.matcher.v3.StringMatcher value_match = 2;
 
           // Extension for custom matching logic.
           // [#extension-category: envoy.matching.input_matchers]
-          extension.v1.TypedExtensionConfig custom_match = 3;
+          core.v3.TypedExtensionConfig custom_match = 3;
         }
       }
 
@@ -104,7 +104,7 @@ message Matcher {
     }
 
     // Protocol-specific specification of input field to match on.
-    extension.v1.TypedExtensionConfig input = 1 [(validate.rules).message = {required: true}];
+    core.v3.TypedExtensionConfig input = 1 [(validate.rules).message = {required: true}];
 
     // Exact or prefix match maps in which to look up the input value.
     // If the lookup succeeds, the match is considered successful, and
@@ -118,7 +118,7 @@ message Matcher {
       MatchMap prefix_match_map = 3;
 
       // Extension for custom matching logic.
-      extension.v1.TypedExtensionConfig custom_match = 4;
+      core.v3.TypedExtensionConfig custom_match = 4;
     }
   }
 

diff --git a/udpa/type/matcher/v1/regex.proto → xds/type/matcher/v3/regex.proto b/udpa/type/matcher/v1/regex.proto → xds/type/matcher/v3/regex.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package udpa.type.matcher.v1;
+package xds.type.matcher.v3;
 
 import "google/protobuf/wrappers.proto";
 
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.type.matcher.v3";
+option java_package = "com.github.udpa.xds.type.matcher.v3";
 option java_outer_classname = "RegexProto";
 option java_multiple_files = true;
 

diff --git a/udpa/type/matcher/v1/string.proto → xds/type/matcher/v3/string.proto b/udpa/type/matcher/v1/string.proto → xds/type/matcher/v3/string.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package udpa.type.matcher.v1;
+package xds.type.matcher.v3;
 
-import "udpa/type/matcher/v1/regex.proto";
+import "xds/type/matcher/v3/regex.proto";
 
 import "validate/validate.proto";
 
-option java_package = "io.envoyproxy.envoy.type.matcher.v3";
+option java_package = "com.github.udpa.xds.type.matcher.v3";
 option java_outer_classname = "StringProto";
 option java_multiple_files = true;