Skip to content

Commit 9340274

Browse files
yuval-ksoloio-bulldozer[bot]
authored andcommitted
use latest master (#8)
* use latest master * allow compiling locally * no more prebuilt for envoy * use go version in workspace * fix compile
1 parent ba8d02d commit 9340274

File tree

5 files changed

+12
-103
lines changed

5 files changed

+12
-103
lines changed

WORKSPACE

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ load("//bazel:repositories.bzl", "envoy_gloo_dependencies")
44

55
envoy_gloo_dependencies()
66

7-
load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
7+
load("@envoy//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")
88
load("@envoy//bazel:cc_configure.bzl", "cc_configure")
99

10-
envoy_dependencies(path = "//ci/prebuilt")
10+
envoy_dependencies()
1111

1212
load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
1313
rules_foreign_cc_dependencies()
@@ -18,6 +18,7 @@ cc_configure()
1818
load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
1919
api_dependencies()
2020

21-
load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
21+
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
2222
go_rules_dependencies()
23-
go_register_toolchains()
23+
go_register_toolchains(go_version = GO_VERSION)
24+

bazel/repository_locations.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
REPOSITORY_LOCATIONS = dict(
22
envoy = dict(
3-
commit = "caf7ab123964cedd172a2d4cb29b2f2e05ca9156",
3+
commit = "873d74a186e4d54dc41c22a2f4b20837bd6bdb49",
44
remote = "https://github.com/envoyproxy/envoy",
55
),
66
inja = dict(

ci/do_ci.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ if [[ -d /bazel-prebuilt-output && ! -d "${TEST_TMPDIR}/_bazel_${USER}" ]]; then
7979
rsync -a /bazel-prebuilt-output "${BAZEL_OUTPUT_BASE}"
8080
fi
8181

82-
# use prebuilt stuff
83-
sed -i -e 's|envoy_dependencies()|envoy_dependencies(path = "//ci/prebuilt")|' WORKSPACE
84-
85-
# Build in the build dir so we can have concurrent steps using different build volumes
86-
# sed 's|envoy_dependencies()|envoy_dependencies(path = "//ci/prebuilt")|' WORKSPACE > ${BUILD_DIR}/WORKSPACE
87-
# cd ${BUILD_DIR}
88-
8982
set -e
9083

9184
# try compiling with clang as google cloud doesn't seem to like gcc.

ci/prebuilt/BUILD

Lines changed: 0 additions & 90 deletions
This file was deleted.

source/extensions/filters/network/consul_connect/consul_connect.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ void Filter::onEvent(Network::ConnectionEvent event) {
7373

7474
// TODO(talnordan): First call `connection.ssl()->peerCertificatePresented()`.
7575
auto &&ssl = connection.ssl();
76-
std::string uri_san{ssl->uriSanPeerCertificate()};
76+
77+
const auto uriSans = ssl->uriSanPeerCertificate();
78+
std::string uri_san;
79+
if (!uriSans.empty()) {
80+
uri_san = uriSans[0];
81+
}
7782
std::string serial_number{ssl->serialNumberPeerCertificate()};
7883
if (uri_san.empty() || serial_number.empty()) {
7984
ENVOY_CONN_LOG(trace, "consul_connect: Authorize REST not called",

0 commit comments

Comments
 (0)