api/build: migrate UDPA proto tree to external cncf/udpa repository. (#…

…8017) This is a one-time movement of all UDPA content from envoyproxy/envoy to cncf/udpa. The permanent home of UDPA will be https://github.com/cncf/udpa. Risk level: Low Testing: Added UDPA service entry to build_test. Signed-off-by: Harvey Tuch <htuch@google.com>
envoyproxy · Aug 23, 2019 · e67923f · e67923f
1 parent faad477
commit e67923f
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 111 deletions.
diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl
@@ -5,6 +5,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 _PY_SUFFIX = "_py"
 _CC_SUFFIX = "_cc"
+_CC_EXPORT_SUFFIX = "_export_cc"
 _GO_PROTO_SUFFIX = "_go_proto"
 _GO_GRPC_SUFFIX = "_go_grpc"
 _GO_IMPORTPATH_PREFIX = "github.com/envoyproxy/data-plane-api/api/"
@@ -169,7 +170,7 @@ def api_cc_test(name, srcs, proto_deps):
     native.cc_test(
         name = name,
         srcs = srcs,
-        deps = [_LibrarySuffix(d, _CC_SUFFIX) for d in proto_deps],
+        deps = [_LibrarySuffix(d, _CC_EXPORT_SUFFIX) for d in proto_deps],
     )
 
 def api_go_test(name, size, importpath, srcs = [], deps = []):

diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl
@@ -15,6 +15,10 @@ def api_dependencies():
         name = "com_google_googleapis",
         locations = REPOSITORY_LOCATIONS,
     )
+    envoy_http_archive(
+        name = "com_github_cncf_udpa",
+        locations = REPOSITORY_LOCATIONS,
+    )
     envoy_http_archive(
         name = "com_github_gogo_protobuf",
         locations = REPOSITORY_LOCATIONS,

diff --git a/api/bazel/repository_locations.bzl b/api/bazel/repository_locations.bzl
@@ -18,6 +18,9 @@ PROMETHEUS_SHA = "783bdaf8ee0464b35ec0c8704871e1e72afa0005c3f3587f65d9d6694bf391
 
 KAFKA_SOURCE_SHA = "ae7a1696c0a0302b43c5b21e515c37e6ecd365941f68a510a7e442eebddf39a1"  # 2.2.0-rc2
 
+UDPA_GIT_SHA = "4cbdcb9931ca743a915a7c5fda51b2ee793ed157"  # Aug 22, 2019
+UDPA_SHA256 = "6291d0c0e3a4d5f08057ea7a00ed0b0ec3dd4e5a3b1cf20f803774680b5a806f"
+
 REPOSITORY_LOCATIONS = dict(
     bazel_skylib = dict(
         sha256 = BAZEL_SKYLIB_SHA256,
@@ -34,6 +37,11 @@ REPOSITORY_LOCATIONS = dict(
         strip_prefix = "googleapis-" + GOOGLEAPIS_GIT_SHA,
         urls = ["https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_GIT_SHA + ".tar.gz"],
     ),
+    com_github_cncf_udpa = dict(
+        sha256 = UDPA_SHA256,
+        strip_prefix = "udpa-" + UDPA_GIT_SHA,
+        urls = ["https://github.com/cncf/udpa/archive/" + UDPA_GIT_SHA + ".tar.gz"],
+    ),
     com_github_gogo_protobuf = dict(
         sha256 = GOGOPROTO_SHA256,
         strip_prefix = "protobuf-" + GOGOPROTO_RELEASE,

diff --git a/api/test/build/BUILD b/api/test/build/BUILD
@@ -16,6 +16,7 @@ api_cc_test(
         "//envoy/service/discovery/v2:rtds",
         "//envoy/service/metrics/v2:metrics_service",
         "//envoy/service/ratelimit/v2:rls",
+        "@com_github_cncf_udpa//udpa/service/orca/v1:orca",
     ],
 )
 

diff --git a/api/test/build/build_test.cc b/api/test/build/build_test.cc
@@ -23,6 +23,7 @@ int main(int argc, char* argv[]) {
       "envoy.service.accesslog.v2.AccessLogService.StreamAccessLogs",
       "envoy.service.metrics.v2.MetricsService.StreamMetrics",
       "envoy.service.ratelimit.v2.RateLimitService.ShouldRateLimit",
+      "udpa.service.orca.v1.OpenRcaService.StreamCoreMetrics",
   };
 
   for (const auto& method : methods) {

diff --git a/api/udpa/data/orca/v1/BUILD b/api/udpa/data/orca/v1/BUILD
diff --git a/api/udpa/data/orca/v1/orca_load_report.proto b/api/udpa/data/orca/v1/orca_load_report.proto
diff --git a/api/udpa/service/orca/v1/BUILD b/api/udpa/service/orca/v1/BUILD
diff --git a/api/udpa/service/orca/v1/orca.proto b/api/udpa/service/orca/v1/orca.proto