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

add a helper class for runtime-derived uint32 #16398

Merged
merged 10 commits into from
May 20, 2021
Merged

add a helper class for runtime-derived uint32 #16398

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a34c9b
add a helper class for runtime-derived uint32 (#16397)
WeavingGao May 8, 2021
f553f65
change protected to private
WeavingGao May 10, 2021
eed421c
return default if the runtime value is larger then uint32 max
WeavingGao May 11, 2021
682f4c1
fix format
WeavingGao May 11, 2021
a1cffc4
add warnings when the value is overflow
WeavingGao May 12, 2021
0d86df8
modify the warning message
WeavingGao May 12, 2021
9f39b77
additional unit test
WeavingGao May 19, 2021
9fd4ead
Merge remote-tracking branch 'upstream/main' into runtime_proto
WeavingGao May 19, 2021
0610dcf
add a TODO
WeavingGao May 20, 2021
4e22777
Merge remote-tracking branch 'upstream/main' into runtime_proto
WeavingGao May 20, 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
19 changes: 19 additions & 0 deletions source/common/runtime/runtime_protos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,25 @@
namespace Envoy {
namespace Runtime {

// Helper class for runtime-derived uint32.
class UInt32 {
public:
UInt32(const envoy::config::core::v3::RuntimeUInt32& uint32_proto, Runtime::Loader& runtime)
: runtime_key_(uint32_proto.runtime_key()), default_value_(uint32_proto.default_value()),
runtime_(runtime) {}

const std::string& runtimeKey() const { return runtime_key_; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mind adding a unit test for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.


uint32_t value() const {
return static_cast<uint32_t>(runtime_.snapshot().getInteger(runtime_key_, default_value_));
}

private:
const std::string runtime_key_;
const uint32_t default_value_;
Runtime::Loader& runtime_;
};

// Helper class for runtime-derived boolean feature flags.
class FeatureFlag {
public:
Expand Down
19 changes: 19 additions & 0 deletions test/common/runtime/runtime_protos_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,25 @@ class RuntimeProtosTest : public testing::Test {
NiceMock<MockLoader> runtime_;
};

TEST_F(RuntimeProtosTest, UInt32Test) {
envoy::config::core::v3::RuntimeUInt32 uint32_proto;
std::string yaml(R"EOF(
runtime_key: "foo.bar"
default_value: 99
)EOF");
TestUtility::loadFromYamlAndValidate(yaml, uint32_proto);
UInt32 test_uint32(uint32_proto, runtime_);

EXPECT_CALL(runtime_.snapshot_, getInteger("foo.bar", 99));
EXPECT_EQ(99, test_uint32.value());

EXPECT_CALL(runtime_.snapshot_, getInteger("foo.bar", 99)).WillOnce(Return(1024));
EXPECT_EQ(1024, test_uint32.value());

EXPECT_CALL(runtime_.snapshot_, getInteger("foo.bar", 99)).WillOnce(Return(1ull << 33));
EXPECT_EQ(0, test_uint32.value());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In cases where getInteger returns a value larger than uint32 max, should this mask the returned value down to 32 bits or return the default value? Consistency between the behavior of getDouble and getInteger for values larger than uint64 max suggest that we should return the default in this case.

https://github.com/envoyproxy/envoy/blob/main/source/common/runtime/runtime_impl.h#L104

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default value is indeed more reasonable, I'll submit a commit to fix it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in the latest commit. @antoniovicente

}

TEST_F(RuntimeProtosTest, PercentBasicTest) {
envoy::config::core::v3::RuntimePercent percent_proto;
std::string yaml(R"EOF(
Expand Down