From 9340274d2a91ed851f44f070cc274af42f04fca7 Mon Sep 17 00:00:00 2001 From: Yuval Kohavi Date: Thu, 21 Mar 2019 18:43:04 -0400 Subject: [PATCH] use latest master (#8) * use latest master * allow compiling locally * no more prebuilt for envoy * use go version in workspace * fix compile --- WORKSPACE | 9 +- bazel/repository_locations.bzl | 2 +- ci/do_ci.sh | 7 -- ci/prebuilt/BUILD | 90 ------------------- .../network/consul_connect/consul_connect.cc | 7 +- 5 files changed, 12 insertions(+), 103 deletions(-) delete mode 100644 ci/prebuilt/BUILD diff --git a/WORKSPACE b/WORKSPACE index f4d7d1a30..86e6390f4 100644 --- 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 index 9090869da..b99b8dc71 100644 --- 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 index 131d91ac6..60bc11cda 100755 --- 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 deleted file mode 100644 index 8997736ea..000000000 --- a/ci/prebuilt/BUILD +++ /dev/null @@ -1,90 +0,0 @@ -licenses(["notice"]) # Apache 2 - -package(default_visibility = ["//visibility:public"]) - -config_setting( - name = "windows_x86_64", - values = {"cpu": "x64_windows"}, -) - -cc_library( - name = "ares", - srcs = select({ - ":windows_x86_64": ["thirdparty_build/lib/cares.lib"], - "//conditions:default": ["thirdparty_build/lib/libcares.a"], - }), - hdrs = glob(["thirdparty_build/include/ares*.h"]), - includes = ["thirdparty_build/include"], -) - -cc_library( - name = "benchmark", - srcs = select({ - ":windows_x86_64": ["thirdparty_build/lib/benchmark.lib"], - "//conditions:default": ["thirdparty_build/lib/libbenchmark.a"], - }), - hdrs = ["thirdparty_build/include/testing/base/public/benchmark.h"], - includes = ["thirdparty_build/include"], -) - -cc_library( - name = "event", - srcs = select({ - ":windows_x86_64": ["thirdparty_build/lib/event.lib"], - "//conditions:default": ["thirdparty_build/lib/libevent.a"], - }), - hdrs = glob(["thirdparty_build/include/event2/**/*.h"]), - includes = ["thirdparty_build/include"], -) - -cc_library( - name = "luajit", - srcs = select({ - ":windows_x86_64": ["thirdparty_build/lib/luajit.lib"], - "//conditions:default": ["thirdparty_build/lib/libluajit-5.1.a"], - }), - hdrs = glob(["thirdparty_build/include/luajit-2.0/*"]), - includes = ["thirdparty_build/include"], - # TODO(mattklein123): We should strip luajit-2.0 here for consumers. However, if we do that - # the headers get included using -I vs. -isystem which then causes old-style-cast warnings. -) - -cc_library( - name = "nghttp2", - srcs = select({ - ":windows_x86_64": ["thirdparty_build/lib/nghttp2.lib"], - "//conditions:default": ["thirdparty_build/lib/libnghttp2.a"], - }), - hdrs = glob(["thirdparty_build/include/nghttp2/**/*.h"]), - includes = ["thirdparty_build/include"], -) - -cc_library( - name = "tcmalloc_and_profiler", - srcs = ["thirdparty_build/lib/libtcmalloc_and_profiler.a"], - hdrs = glob(["thirdparty_build/include/gperftools/**/*.h"]), - strip_include_prefix = "thirdparty_build/include", -) - -cc_library( - name = "yaml_cpp", - srcs = select({ - ":windows_x86_64": glob(["thirdparty_build/lib/libyaml-cpp*.lib"]), - "//conditions:default": ["thirdparty_build/lib/libyaml-cpp.a"], - }), - hdrs = glob(["thirdparty_build/include/yaml-cpp/**/*.h"]), - includes = ["thirdparty_build/include"], -) - -cc_library( - name = "zlib", - srcs = select({ - ":windows_x86_64": glob(["thirdparty_build/lib/zlibstaticd.lib"]), - "//conditions:default": ["thirdparty_build/lib/libz.a"], - }), - hdrs = [ - "thirdparty_build/include/zconf.h", - "thirdparty_build/include/zlib.h", - ], - includes = ["thirdparty_build/include"], -) diff --git a/source/extensions/filters/network/consul_connect/consul_connect.cc b/source/extensions/filters/network/consul_connect/consul_connect.cc index 3ee1dbc82..1a8b116f8 100644 --- 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",