From 75b1628dfdb5123c3b2f0f63ee36d0b3bd8ed120 Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Fri, 28 Sep 2018 09:40:48 +0000
Subject: [PATCH] pgv: bump dependency to 30da78c. (#4551)

This should unblock Windows, fix the long CLI issue and also fuzz weak link problems.

Signed-off-by: Harvey Tuch <htuch@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ 92971047ca0b8a97c1004e3b5196916203f9185b
---
 bazel/api_build_system.bzl | 22 ++++------------------
 bazel/repositories.bzl     | 11 ++++++++++-
 test/validate/pgv_test.cc  |  2 +-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/bazel/api_build_system.bzl b/bazel/api_build_system.bzl
index af275ec5..c68ccbdf 100644
--- a/bazel/api_build_system.bzl
+++ b/bazel/api_build_system.bzl
@@ -98,13 +98,6 @@ def api_proto_library(
         has_services = 0,
         linkstatic = None,
         require_py = 1):
-    # This is now vestigial, since there are no direct consumers in
-    # the data plane API. However, we want to maintain native proto_library support
-    # in the proto graph to (1) support future C++ use of native rules with
-    # cc_proto_library (or some Bazel aspect that works on proto_library) when
-    # it can play well with the PGV plugin and (2) other language support that
-    # can make use of native proto_library.
-
     native.proto_library(
         name = name,
         srcs = srcs,
@@ -123,22 +116,15 @@ def api_proto_library(
         ],
         visibility = visibility,
     )
-
-    # Under the hood, this is just an extension of the Protobuf library's
-    # bespoke cc_proto_library. It doesn't consume proto_library as a proto
-    # provider. Hopefully one day we can move to a model where this target and
-    # the proto_library above are aligned.
     pgv_cc_proto_library(
         name = _Suffix(name, _CC_SUFFIX),
-        srcs = srcs,
         linkstatic = linkstatic,
-        deps = [_LibrarySuffix(d, _CC_SUFFIX) for d in deps],
-        external_deps = external_cc_proto_deps + [
-            "@com_google_protobuf//:cc_wkt_protos",
+        cc_deps = [_LibrarySuffix(d, _CC_SUFFIX) for d in deps] + external_cc_proto_deps + [
+            "@com_github_gogo_protobuf//:gogo_proto_cc",
             "@googleapis//:http_api_protos",
             "@googleapis//:rpc_status_protos",
-            "@com_github_gogo_protobuf//:gogo_proto_cc",
         ],
+        deps = [":" + name],
         visibility = ["//visibility:public"],
     )
     py_export_suffixes = []
@@ -147,7 +133,7 @@ def api_proto_library(
         py_export_suffixes = ["_py", "_py_genproto"]
 
     # Allow unlimited visibility for consumers
-    export_suffixes = ["", "_cc", "_cc_validate", "_cc_proto", "_cc_proto_genproto"] + py_export_suffixes
+    export_suffixes = ["", "_cc", "_cc_validate"] + py_export_suffixes
     for s in export_suffixes:
         native.alias(
             name = name + "_export" + s,
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index 2e497d71..bf7866bb 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,13 +1,22 @@
+BAZEL_SKYLIB_RELEASE = "0.5.0"
+BAZEL_SKYLIB_SHA = "b5f6abe419da897b7901f90cbab08af958b97a8f3575b0d3dd062ac7ce78541f"
+
 GOOGLEAPIS_SHA = "d642131a6e6582fc226caf9893cb7fe7885b3411"  # May 23, 2018
 GOGOPROTO_SHA = "1adfc126b41513cc696b209667c8656ea7aac67c"  # v1.0.0
 PROMETHEUS_SHA = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"  # Nov 17, 2017
 OPENCENSUS_SHA = "ab82e5fdec8267dc2a726544b10af97675970847"  # May 23, 2018
 
-PGV_GIT_SHA = "f9d2b11e44149635b23a002693b76512b01ae515"
+PGV_GIT_SHA = "30da78c4bcdd477b3c24d13e43cf39361ae3859f"  # Sep 27, 2018
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 def api_dependencies():
+    native.http_archive(
+        name = "bazel_skylib",
+        url = "https://github.com/bazelbuild/bazel-skylib/archive/" + BAZEL_SKYLIB_RELEASE + ".tar.gz",
+        sha256 = BAZEL_SKYLIB_SHA,
+        strip_prefix = "bazel-skylib-" + BAZEL_SKYLIB_RELEASE,
+    )
     git_repository(
         name = "com_lyft_protoc_gen_validate",
         remote = "https://github.com/lyft/protoc-gen-validate.git",
diff --git a/test/validate/pgv_test.cc b/test/validate/pgv_test.cc
index f42718c2..a6e33eac 100644
--- a/test/validate/pgv_test.cc
+++ b/test/validate/pgv_test.cc
@@ -63,7 +63,7 @@ int main(int argc, char* argv[]) {
   cluster_manager {}
   admin {
     access_log_path: "/dev/null"
-    address {}
+    address { pipe { path: "/" } }
   }
   )EOF";
   envoy::config::bootstrap::v2::Bootstrap valid_bootstrap;