From 1e67b0a911261a0a4220f76bcc6598fdbfe6c318 Mon Sep 17 00:00:00 2001 From: Yuchen Dai Date: Sat, 5 Jun 2021 18:12:59 +0000 Subject: [PATCH 1/4] ENVOY 20210520 Signed-off-by: Yuchen Dai --- .bazelversion | 2 +- WORKSPACE | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bazelversion b/.bazelversion index 0b2eb36f508..ee74734aa22 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.7.2 +4.1.0 diff --git a/WORKSPACE b/WORKSPACE index 9b90465440b..e99a8b2f88d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -39,9 +39,9 @@ bind( # # Note: this is needed by release builder to resolve envoy dep sha to tag. # Commit date: 2021-05-13 -ENVOY_SHA = "2443032526cf6e50d63d35770df9473dd0460fc0" +ENVOY_SHA = "b6039234e526eeccdf332a7eb041729aaa1bc286" -ENVOY_SHA256 = "4c3d6dcf09683742c5ae876154cbe3cf4fbfefa8b1cf1010e6bdca89ad5fd19c" +ENVOY_SHA256 = "01b66c5adbed46ad813498e09051f48e1b9b6c18c2a5800cdbec897b132614c6" ENVOY_ORG = "envoyproxy" From 24afe0d5f64a153aac7e691febe751c1f8c236ab Mon Sep 17 00:00:00 2001 From: Yuchen Dai Date: Sun, 6 Jun 2021 18:06:47 +0000 Subject: [PATCH 2/4] common: proto Status update Signed-off-by: Yuchen Dai --- extensions/access_log_policy/plugin.cc | 4 ++-- extensions/attributegen/plugin.cc | 4 ++-- extensions/stackdriver/stackdriver.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/access_log_policy/plugin.cc b/extensions/access_log_policy/plugin.cc index a32a8e99f07..70c0ac23f6f 100644 --- a/extensions/access_log_policy/plugin.cc +++ b/extensions/access_log_policy/plugin.cc @@ -82,8 +82,8 @@ 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; diff --git a/extensions/attributegen/plugin.cc b/extensions/attributegen/plugin.cc index 50a8d39b33b..cf56833f054 100644 --- a/extensions/attributegen/plugin.cc +++ b/extensions/attributegen/plugin.cc @@ -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 " diff --git a/extensions/stackdriver/stackdriver.cc b/extensions/stackdriver/stackdriver.cc index 8a2fb836acf..a8bd95565f2 100644 --- a/extensions/stackdriver/stackdriver.cc +++ b/extensions/stackdriver/stackdriver.cc @@ -351,8 +351,8 @@ 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; From 233e8be28bfbe62a16253a9f1403ef403be3a438 Mon Sep 17 00:00:00 2001 From: Yuchen Dai Date: Sun, 6 Jun 2021 21:47:52 +0000 Subject: [PATCH 3/4] format and envoy date Signed-off-by: Yuchen Dai --- WORKSPACE | 2 +- extensions/access_log_policy/plugin.cc | 3 ++- extensions/stackdriver/stackdriver.cc | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e99a8b2f88d..31f37868e19 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,7 +38,7 @@ 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 +# Commit date: 2021-05-20 ENVOY_SHA = "b6039234e526eeccdf332a7eb041729aaa1bc286" ENVOY_SHA256 = "01b66c5adbed46ad813498e09051f48e1b9b6c18c2a5800cdbec897b132614c6" diff --git a/extensions/access_log_policy/plugin.cc b/extensions/access_log_policy/plugin.cc index 70c0ac23f6f..6b84d2c3146 100644 --- a/extensions/access_log_policy/plugin.cc +++ b/extensions/access_log_policy/plugin.cc @@ -82,7 +82,8 @@ bool PluginRootContext::configure(size_t configuration_size) { auto configuration = configuration_data->toString(); JsonParseOptions json_options; json_options.ignore_unknown_fields = true; - const auto status = JsonStringToMessage(configuration, &config_, json_options); + const auto status = + JsonStringToMessage(configuration, &config_, json_options); if (!status.ok()) { logWarn("Cannot parse AccessLog plugin configuration JSON string " + configuration + ", " + status.message().ToString()); diff --git a/extensions/stackdriver/stackdriver.cc b/extensions/stackdriver/stackdriver.cc index a8bd95565f2..ec2c0a52c88 100644 --- a/extensions/stackdriver/stackdriver.cc +++ b/extensions/stackdriver/stackdriver.cc @@ -351,7 +351,8 @@ bool StackdriverRootContext::configure(size_t configuration_size) { // metadata. Parse configuration JSON string. JsonParseOptions json_options; json_options.ignore_unknown_fields = true; - const auto status = JsonStringToMessage(configuration, &config_, json_options); + const auto status = + JsonStringToMessage(configuration, &config_, json_options); if (!status.ok()) { logWarn("Cannot parse Stackdriver plugin configuration JSON string " + configuration + ", " + status.message().ToString()); From 1cd907c42c794ea604cd1aee890acbb848a10a5b Mon Sep 17 00:00:00 2001 From: Yuchen Dai Date: Tue, 8 Jun 2021 19:47:46 +0000 Subject: [PATCH 4/4] remove obsolete using Signed-off-by: Yuchen Dai --- test/integration/exchanged_token_integration_test.cc | 1 - .../istio_http_integration_test_with_envoy_jwt_filter.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/test/integration/exchanged_token_integration_test.cc b/test/integration/exchanged_token_integration_test.cc index 4517f02f5fa..3c93959c67e 100644 --- a/test/integration/exchanged_token_integration_test.cc +++ b/test/integration/exchanged_token_integration_test.cc @@ -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; diff --git a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc index ae1b1333ae1..f3a69dc0741 100644 --- a/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc +++ b/test/integration/istio_http_integration_test_with_envoy_jwt_filter.cc @@ -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;