Skip to content

CEL formatter: Replace C++ exceptions with status errors #45952

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

Open
yanavlasov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CEL formatter: Replace C++ exceptions with status errors #45952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions source/extensions/formatter/cel/cel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ CELFormatterCommandParser::parse(absl::string_view command, absl::string_view su
if (command == "CEL" || command == "TYPED_CEL") {
auto parse_status = google::api::expr::parser::Parse(subcommand);
if (!parse_status.ok()) {
throw EnvoyException("Not able to parse expression: " + parse_status.status().ToString());
return absl::InvalidArgumentError(
absl::StrCat("Not able to parse expression: ", parse_status.status().ToString()));
}
Server::Configuration::ServerFactoryContext& context =
Server::Configuration::ServerFactoryContextInstance::get();
Expand All @@ -94,7 +95,7 @@ CELFormatterCommandParser::parse(absl::string_view command, absl::string_view su

return nullptr;
#else
throw EnvoyException("CEL is not available for use in this environment.");
return absl::UnimplementedError("CEL is not available for use in this environment.");
#endif
}

Expand Down
3 changes: 2 additions & 1 deletion test/extensions/formatter/cel/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ envoy_extension_cc_test(
"//source/extensions/formatter/cel:config",
"//test/mocks/server:factory_context_mocks",
"//test/mocks/stream_info:stream_info_mocks",
"//test/test_common:test_runtime_lib",
"//test/test_common:status_utility_lib",
"//test/test_common:utility_lib",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
] + select(
{
Expand Down
16 changes: 10 additions & 6 deletions test/extensions/formatter/cel/cel_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "test/mocks/server/factory_context.h"
#include "test/mocks/stream_info/mocks.h"
#include "test/test_common/status_utility.h"
#include "test/test_common/utility.h"

#include "fmt/format.h"
Expand All @@ -17,6 +18,9 @@ namespace Envoy {
namespace Extensions {
namespace Formatter {

using ::Envoy::StatusHelpers::HasStatus;
using ::testing::HasSubstr;

class CELFormatterTest : public ::testing::Test {
public:
CELFormatterTest() {
Expand Down Expand Up @@ -601,9 +605,9 @@ TEST_F(CELFormatterTest, TestUntypedInvalidExpression) {
)EOF";
TestUtility::loadFromYaml(yaml, config_);

EXPECT_THROW_WITH_REGEX(
*Envoy::Formatter::SubstitutionFormatStringUtils::fromProtoConfig(config_, context_),
EnvoyException, "Not able to parse expression: .*");
EXPECT_THAT(
Envoy::Formatter::SubstitutionFormatStringUtils::fromProtoConfig(config_, context_),
HasStatus(absl::StatusCode::kInvalidArgument, HasSubstr("Not able to parse expression:")));
}

TEST_F(CELFormatterTest, TestTypedInvalidExpression) {
Expand All @@ -613,9 +617,9 @@ TEST_F(CELFormatterTest, TestTypedInvalidExpression) {
)EOF";
TestUtility::loadFromYaml(yaml, config_);

EXPECT_THROW_WITH_REGEX(
*Envoy::Formatter::SubstitutionFormatStringUtils::fromProtoConfig(config_, context_),
EnvoyException, "Not able to parse expression: .*");
EXPECT_THAT(
Envoy::Formatter::SubstitutionFormatStringUtils::fromProtoConfig(config_, context_),
HasStatus(absl::StatusCode::kInvalidArgument, HasSubstr("Not able to parse expression:")));
}

TEST_F(CELFormatterTest, TestInvalidSemanticExpression) {
Expand Down
Loading