Skip to content
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

Jump to bottom

Add replace function to CEL strings extension in C++ #870

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

Add replace function to CEL strings extension in C++ #870

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
18 changes: 18 additions & 0 deletions extensions/strings.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "absl/status/statusor.h"
#include "absl/strings/ascii.h"
#include "absl/strings/cord.h"
#include "absl/strings/str_replace.h"
#include "absl/strings/string_view.h"
#include "common/casting.h"
#include "common/type.h"
Expand Down Expand Up @@ -89,6 +90,17 @@ absl::StatusOr<Value> Join1(ValueManager& value_manager,
return Join2(value_manager, value, StringValue{});
}

absl::StatusOr<Value> Replace(ValueManager& value_manager,
const StringValue& string,
const StringValue& original,
const StringValue& replacement) {
std::string content = string.NativeString();
absl::StrReplaceAll({{original.NativeString(), replacement.NativeString()}},
&content);
// We assume the original strings were well-formed.
return value_manager.CreateUncheckedStringValue(std::move(content));
}

struct SplitWithEmptyDelimiter {
ValueManager& value_manager;
int64_t& limit;
Expand Down Expand Up @@ -230,6 +242,12 @@ absl::Status RegisterStringsFunctions(FunctionRegistry& registry,
CreateDescriptor("join", /*receiver_style=*/true),
BinaryFunctionAdapter<absl::StatusOr<Value>, ListValue,
StringValue>::WrapFunction(Join2)));
CEL_RETURN_IF_ERROR(registry.Register(
VariadicFunctionAdapter<
absl::StatusOr<Value>, StringValue, StringValue,
StringValue>::CreateDescriptor("replace", /*receiver_style=*/true),
VariadicFunctionAdapter<absl::StatusOr<Value>, StringValue, StringValue,
StringValue>::WrapFunction(Replace)));
CEL_RETURN_IF_ERROR(registry.Register(
BinaryFunctionAdapter<absl::StatusOr<Value>, StringValue, StringValue>::
CreateDescriptor("split", /*receiver_style=*/true),
Expand Down
28 changes: 28 additions & 0 deletions extensions/strings_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,34 @@ using ::google::api::expr::v1alpha1::ParsedExpr;
using ::google::api::expr::parser::Parse;
using ::google::api::expr::parser::ParserOptions;

TEST(Strings, Replace) {
MemoryManagerRef memory_manager = MemoryManagerRef::ReferenceCounting();
const auto options = RuntimeOptions{};
ASSERT_OK_AND_ASSIGN(auto builder, CreateStandardRuntimeBuilder(options));
EXPECT_OK(RegisterStringsFunctions(builder.function_registry(), options));

ASSERT_OK_AND_ASSIGN(auto runtime, std::move(builder).Build());

ASSERT_OK_AND_ASSIGN(ParsedExpr expr,
Parse("foo.replace('_', ' ') == 'hello world!'",
"<input>", ParserOptions{}));

ASSERT_OK_AND_ASSIGN(std::unique_ptr<Program> program,
ProtobufRuntimeAdapter::CreateProgram(*runtime, expr));

common_internal::LegacyValueManager value_factory(memory_manager,
runtime->GetTypeProvider());

Activation activation;
activation.InsertOrAssignValue("foo",
StringValue{absl::Cord("hello_world!")});

ASSERT_OK_AND_ASSIGN(Value result,
program->Evaluate(activation, value_factory));
ASSERT_TRUE(result.Is<BoolValue>());
EXPECT_TRUE(result.As<BoolValue>().NativeValue());
}

TEST(Strings, SplitWithEmptyDelimiterCord) {
MemoryManagerRef memory_manager = MemoryManagerRef::ReferenceCounting();
const auto options = RuntimeOptions{};
Expand Down