From 3e17b7ae16a428ad6a02c24353b757b23ae8e4b8 Mon Sep 17 00:00:00 2001 From: Snow Pettersen Date: Tue, 13 Jul 2021 17:30:15 +0000 Subject: [PATCH] feedback Signed-off-by: Snow Pettersen --- udpa/extension/v1/BUILD | 5 ----- .../v1 => xds/core/v3}/extension.proto | 4 ++-- .../matcher/v1 => xds/type/matcher/v3}/BUILD | 2 +- .../v1 => xds/type/matcher/v3}/matcher.proto | 20 +++++++++---------- .../v1 => xds/type/matcher/v3}/regex.proto | 4 ++-- .../v1 => xds/type/matcher/v3}/string.proto | 6 +++--- 6 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 udpa/extension/v1/BUILD rename {udpa/extension/v1 => xds/core/v3}/extension.proto (90%) rename {udpa/type/matcher/v1 => xds/type/matcher/v3}/BUILD (82%) rename {udpa/type/matcher/v1 => xds/type/matcher/v3}/matcher.proto (86%) rename {udpa/type/matcher/v1 => xds/type/matcher/v3}/regex.proto (95%) rename {udpa/type/matcher/v1 => xds/type/matcher/v3}/string.proto (93%) diff --git a/udpa/extension/v1/BUILD b/udpa/extension/v1/BUILD deleted file mode 100644 index 0484b5a..0000000 --- a/udpa/extension/v1/BUILD +++ /dev/null @@ -1,5 +0,0 @@ -load("//bazel:api_build_system.bzl", "udpa_proto_package") - -licenses(["notice"]) #Apache 2 - -udpa_proto_package() diff --git a/udpa/extension/v1/extension.proto b/xds/core/v3/extension.proto similarity index 90% rename from udpa/extension/v1/extension.proto rename to xds/core/v3/extension.proto index 9ce0515..81d27ed 100644 --- a/udpa/extension/v1/extension.proto +++ b/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 b/xds/type/matcher/v3/BUILD similarity index 82% rename from udpa/type/matcher/v1/BUILD rename to xds/type/matcher/v3/BUILD index 010119a..7805c8f 100644 --- a/udpa/type/matcher/v1/BUILD +++ b/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 b/xds/type/matcher/v3/matcher.proto similarity index 86% rename from udpa/type/matcher/v1/matcher.proto rename to xds/type/matcher/v3/matcher.proto index 972c9c5..0a9aa93 100644 --- a/udpa/type/matcher/v1/matcher.proto +++ b/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 b/xds/type/matcher/v3/regex.proto similarity index 95% rename from udpa/type/matcher/v1/regex.proto rename to xds/type/matcher/v3/regex.proto index c932ac9..255b755 100644 --- a/udpa/type/matcher/v1/regex.proto +++ b/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 b/xds/type/matcher/v3/string.proto similarity index 93% rename from udpa/type/matcher/v1/string.proto rename to xds/type/matcher/v3/string.proto index dabcc8d..5df5baf 100644 --- a/udpa/type/matcher/v1/string.proto +++ b/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;