Skip to content

common: proto dep update #3372

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

Closed
lambdai wants to merge 4 commits into from
Closed

common: proto dep update #3372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e67b0a
ENVOY 20210520
lambdai Jun 5, 2021
24afe0d
common: proto Status update
lambdai Jun 6, 2021
233e8be
format and envoy date
lambdai Jun 6, 2021
1cd907c
remove obsolete using
lambdai Jun 8, 2021
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
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.2
4.1.0
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ bind(
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
#
# Note: this is needed by release builder to resolve envoy dep sha to tag.
# Commit date: 2021-05-13
ENVOY_SHA = "2443032526cf6e50d63d35770df9473dd0460fc0"
# Commit date: 2021-05-20
ENVOY_SHA = "b6039234e526eeccdf332a7eb041729aaa1bc286"

ENVOY_SHA256 = "4c3d6dcf09683742c5ae876154cbe3cf4fbfefa8b1cf1010e6bdca89ad5fd19c"
ENVOY_SHA256 = "01b66c5adbed46ad813498e09051f48e1b9b6c18c2a5800cdbec897b132614c6"

ENVOY_ORG = "envoyproxy"

Expand Down
5 changes: 3 additions & 2 deletions extensions/access_log_policy/plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ bool PluginRootContext::configure(size_t configuration_size) {
auto configuration = configuration_data->toString();
JsonParseOptions json_options;
json_options.ignore_unknown_fields = true;
Status status = JsonStringToMessage(configuration, &config_, json_options);
if (status != Status::OK) {
const auto status =
JsonStringToMessage(configuration, &config_, json_options);
if (!status.ok()) {
logWarn("Cannot parse AccessLog plugin configuration JSON string " +
configuration + ", " + status.message().ToString());
return false;
Expand Down
4 changes: 2 additions & 2 deletions extensions/attributegen/plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ bool PluginRootContext::onConfigure(size_t configuration_size) {
JsonParseOptions json_options;
json_options.ignore_unknown_fields = true;
istio::attributegen::PluginConfig config;
Status status = JsonStringToMessage(configuration, &config, json_options);
if (status != Status::OK) {
const auto status = JsonStringToMessage(configuration, &config, json_options);
if (!status.ok()) {
LOG_WARN(
absl::StrCat("Config Error: cannot parse 'attributegen' plugin "
"configuration JSON string [YAML is "
Expand Down
5 changes: 3 additions & 2 deletions extensions/stackdriver/stackdriver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,9 @@ bool StackdriverRootContext::configure(size_t configuration_size) {
// metadata. Parse configuration JSON string.
JsonParseOptions json_options;
json_options.ignore_unknown_fields = true;
Status status = JsonStringToMessage(configuration, &config_, json_options);
if (status != Status::OK) {
const auto status =
JsonStringToMessage(configuration, &config_, json_options);
if (!status.ok()) {
logWarn("Cannot parse Stackdriver plugin configuration JSON string " +
configuration + ", " + status.message().ToString());
return false;
Expand Down
1 change: 0 additions & 1 deletion test/integration/exchanged_token_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "src/istio/utils/attribute_names.h"
#include "test/integration/http_protocol_integration.h"

using ::google::protobuf::util::error::Code;
using ::testing::Contains;
using ::testing::Not;

Expand Down
1 change: 0 additions & 1 deletion test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "src/istio/utils/attribute_names.h"
#include "test/integration/http_protocol_integration.h"

using ::google::protobuf::util::error::Code;
using ::testing::Contains;
using ::testing::Not;

Expand Down