Skip to content

Commit aed7aa0

Browse files
Merge pull request #28807 from michael-redpanda/sl/alias-prefix
proto: Alias prefix and prefixed
2 parents 0cc1bc2 + a8f8583 commit aed7aa0

File tree

11 files changed

+41
-17
lines changed

11 files changed

+41
-17
lines changed

.github/workflows/buf.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
paths: proto
5151
lint: true
5252
format: false # We use clang-tidy
53-
breaking: false # flip to true when we have a release
53+
breaking: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'buf skip breaking') }} # Enable breaking change check unless the label 'buf skip breaking' is set
5454
push: false # Only validate, don't push to registry
5555
# ===========================================================================
5656
# Job: push-to-registry (push events only - registry operations only)

buf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ lint:
2929
# it to be easy to write.
3030
ENUM_VALUE_PREFIX:
3131
- proto/redpanda/core/pbgen
32+
ENUM_NO_ALLOW_ALIAS:
33+
- proto/redpanda/core/admin/v2/shadow_link.proto
34+
- proto/redpanda/core/common/v1/acl.proto
3235
breaking:
3336
use:
3437
- FILE

proto/redpanda/core/admin/v2/shadow_link.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,11 +570,14 @@ enum ScramMechanism {
570570
}
571571
// The matching pattern type
572572
enum PatternType {
573+
option allow_alias = true;
573574
PATTERN_TYPE_UNSPECIFIED = 0;
574575
// Must match the filter exactly
575576
PATTERN_TYPE_LITERAL = 1;
576577
// Will match anything that starts with filter
577578
PATTERN_TYPE_PREFIX = 2;
579+
// Will match anything that starts with filter
580+
PATTERN_TYPE_PREFIXED = 2;
578581
}
579582
// What type of filter this is, include or exclude
580583
enum FilterType {

proto/redpanda/core/common/v1/acl.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,16 @@ enum ACLResource {
4242
}
4343
// The ACL pattern type
4444
enum ACLPattern {
45+
option allow_alias = true;
4546
ACL_PATTERN_UNSPECIFIED = 0;
4647
// Wildcard to match any pattern
4748
ACL_PATTERN_ANY = 1;
4849
// Match a literal string
4950
ACL_PATTERN_LITERAL = 2;
5051
// Match a prefix
5152
ACL_PATTERN_PREFIXED = 3;
53+
// Match a prefix
54+
ACL_PATTERN_PREFIX = 3;
5255
// Match serves as a catch-all for all the names of a topic
5356
// the principal is authorized to access
5457
ACL_PATTERN_MATCH = 4;

src/go/rpk/gen/protocomments/admin/v2/comments.pb.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/go/rpk/gen/protocomments/common/v1/comments.pb.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/rptest/clients/admin/proto/redpanda/core/admin/v2/__init__.pyi

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/rptest/clients/admin/proto/redpanda/core/admin/v2/shadow_link_pb2.py

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/rptest/clients/admin/proto/redpanda/core/admin/v2/shadow_link_pb2.pyi

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/rptest/clients/admin/proto/redpanda/core/common/v1/acl_pb2.py

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)