use latest master (#8)

* use latest master * allow compiling locally * no more prebuilt for envoy * use go version in workspace * fix compile
solo-io · Mar 21, 2019 · 9340274 · 9340274
1 parent ba8d02d
commit 9340274
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 103 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -4,10 +4,10 @@ load("//bazel:repositories.bzl", "envoy_gloo_dependencies")
 
 envoy_gloo_dependencies()
 
-load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
+load("@envoy//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")
 load("@envoy//bazel:cc_configure.bzl", "cc_configure")
 
-envoy_dependencies(path = "//ci/prebuilt")
+envoy_dependencies()
 
 load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
 rules_foreign_cc_dependencies()
@@ -18,6 +18,7 @@ cc_configure()
 load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
 api_dependencies()
 
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
+load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 go_rules_dependencies()
-go_register_toolchains()
+go_register_toolchains(go_version = GO_VERSION)
+
diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -1,6 +1,6 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        commit = "caf7ab123964cedd172a2d4cb29b2f2e05ca9156",
+        commit = "873d74a186e4d54dc41c22a2f4b20837bd6bdb49",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -79,13 +79,6 @@ if [[ -d /bazel-prebuilt-output && ! -d "${TEST_TMPDIR}/_bazel_${USER}" ]]; then
   rsync -a /bazel-prebuilt-output "${BAZEL_OUTPUT_BASE}"
 fi
 
-# use prebuilt stuff
-sed -i -e 's|envoy_dependencies()|envoy_dependencies(path = "//ci/prebuilt")|' WORKSPACE
-
-# Build in the build dir so we can have concurrent steps using different build volumes
-# sed 's|envoy_dependencies()|envoy_dependencies(path = "//ci/prebuilt")|' WORKSPACE > ${BUILD_DIR}/WORKSPACE
-# cd ${BUILD_DIR}
-
 set -e
 
 # try compiling with clang as google cloud doesn't seem to like gcc.

diff --git a/ci/prebuilt/BUILD b/ci/prebuilt/BUILD
diff --git a/source/extensions/filters/network/consul_connect/consul_connect.cc b/source/extensions/filters/network/consul_connect/consul_connect.cc
@@ -73,7 +73,12 @@ void Filter::onEvent(Network::ConnectionEvent event) {
 
   // TODO(talnordan): First call `connection.ssl()->peerCertificatePresented()`.
   auto &&ssl = connection.ssl();
-  std::string uri_san{ssl->uriSanPeerCertificate()};
+
+  const auto uriSans = ssl->uriSanPeerCertificate();
+  std::string uri_san;
+  if (!uriSans.empty()) { 
+   uri_san = uriSans[0];
+  }
   std::string serial_number{ssl->serialNumberPeerCertificate()};
   if (uri_san.empty() || serial_number.empty()) {
     ENVOY_CONN_LOG(trace, "consul_connect: Authorize REST not called",