Skip to content

use latest master #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soloio-bulldozer merged 5 commits into from
Mar 21, 2019
Merged

use latest master #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6498ee6
use latest master
yuval-k Mar 21, 2019
7f48555
allow compiling locally
yuval-k Mar 21, 2019
78e90f3
no more prebuilt for envoy
yuval-k Mar 21, 2019
39eabad
use go version in workspace
yuval-k Mar 21, 2019
ff15449
fix compile
yuval-k Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)

2 changes: 1 addition & 1 deletion bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
REPOSITORY_LOCATIONS = dict(
envoy = dict(
commit = "caf7ab123964cedd172a2d4cb29b2f2e05ca9156",
commit = "873d74a186e4d54dc41c22a2f4b20837bd6bdb49",
remote = "https://github.com/envoyproxy/envoy",
),
inja = dict(
Expand Down
7 changes: 0 additions & 7 deletions ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
90 changes: 0 additions & 90 deletions ci/prebuilt/BUILD
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion source/extensions/filters/network/consul_connect/consul_connect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down