ateapi: rename IPBlockRule to CIDRRule - #1597
Merged
Lior Lieberman (LiorLieberman) merged 2 commits intoSep 11, 2026
Merged
Conversation
haiyanmeng
commented
Sep 10, 2026
| name: "canonical IPv4 CIDR", | ||
| mutate: func(p *ateapipb.EgressPolicy) { | ||
| p.Rules[0] = &ateapipb.EgressRule{IpBlocks: &ateapipb.IPBlockRule{Cidrs: []string{"192.0.2.0/24"}}} | ||
| p.Rules[0] = &ateapipb.EgressRule{Cidrs: &ateapipb.CIDRRule{Cidrs: []string{"192.0.2.0/24"}}} |
Collaborator
Author
There was a problem hiding this comment.
Now both EgressRule and CIDRRule has a field named cidrs, which seems a little duplicate.
Collaborator
There was a problem hiding this comment.
could do CIDRRange if we wanted a little less duplication, but it's purely subjective at this point. Up to you 🙂
haiyanmeng
marked this pull request as draft
September 10, 2026 21:52
haiyanmeng
marked this pull request as ready for review
September 10, 2026 23:34
haiyanmeng
requested review from
Bowei Du (bowei) and
Keith Mattix II (keithmattix)
September 10, 2026 23:34
Collaborator
|
Looks ok to me. If someone has an even better name... |
Keith Mattix II (keithmattix)
approved these changes
Sep 11, 2026
| name: "canonical IPv4 CIDR", | ||
| mutate: func(p *ateapipb.EgressPolicy) { | ||
| p.Rules[0] = &ateapipb.EgressRule{IpBlocks: &ateapipb.IPBlockRule{Cidrs: []string{"192.0.2.0/24"}}} | ||
| p.Rules[0] = &ateapipb.EgressRule{Cidrs: &ateapipb.CIDRRule{Cidrs: []string{"192.0.2.0/24"}}} |
Collaborator
There was a problem hiding this comment.
could do CIDRRange if we wanted a little less duplication, but it's purely subjective at this point. Up to you 🙂
"Block" is a verb which could read as a deny rule.
haiyanmeng
force-pushed
the
rename-ipblockrule
branch
from
September 11, 2026 19:18
4d68b50 to
7d161c2
Compare
The locust load tests embed the serialized file descriptor, so renaming the message and its union field leaves the checked-in gencode describing a field that no longer exists. Regenerated with the pinned grpcio-tools, so only the descriptor and the offsets that follow it move.
Collaborator
|
LGTM there is a failure. Ping me when this passes. |
Bowei Du (bowei)
approved these changes
Sep 11, 2026
haiyanmeng
force-pushed
the
rename-ipblockrule
branch
from
September 11, 2026 19:54
7d161c2 to
43bed2f
Compare
Collaborator
Author
|
Bowei Du (@bowei) , the tests are green now. It is ready to be merged. Thanks! |
Lior Lieberman (LiorLieberman)
approved these changes
Sep 11, 2026
Lior Lieberman (LiorLieberman)
merged commit Sep 11, 2026
5fb2c0a
into
agent-substrate:main
9 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
"Block" is a verb which could read as a deny rule.
Field renaming is safe because the postgreSQL stores the EgressPolicy in the binary protobuf format, which keys every field on its field number. The message name field name never appear on the wire.
Fixes #1586