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

resset: allow type aliases as IDs #30

Merged
merged 1 commit into from
Aug 7, 2024
Merged

resset: allow type aliases as IDs #30

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
26 changes: 13 additions & 13 deletions resset/resource_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"golang.org/x/exp/slices"
)

type Integer interface {
uint | uint8 | uint16 | uint32 | uint64 | int | int8 | int16 | int32 | int64
type ID interface {
~uint | ~uint8 | ~uint16 | ~uint32 | ~uint64 | ~int | ~int8 | ~int16 | ~int32 | ~int64 | ~string
}

// ZeroID gets the zero value (0, or "") for a resource. This is used to refer
// to an unspecified resource. For example, when creating a new app, you would
// check for app:0:c permission.
func ZeroID[ID Integer | string]() (ret ID) {
func ZeroID[I ID]() (ret I) {
return
}

Expand All @@ -33,10 +33,10 @@ func ZeroID[ID Integer | string]() (ret ID) {
// type myCaveat struct {
// Resources resset.ResourceSet[uint64]
// }
type ResourceSet[ID Integer | string | Prefix] map[ID]Action
type ResourceSet[I ID] map[I]Action

func New[ID Integer | string | Prefix](p Action, ids ...ID) ResourceSet[ID] {
ret := make(ResourceSet[ID], len(ids))
func New[I ID](p Action, ids ...I) ResourceSet[I] {
ret := make(ResourceSet[I], len(ids))

for _, id := range ids {
ret[id] = p
Expand All @@ -45,7 +45,7 @@ func New[ID Integer | string | Prefix](p Action, ids ...ID) ResourceSet[ID] {
return ret
}

func (rs ResourceSet[ID]) Prohibits(id *ID, action Action) error {
func (rs ResourceSet[I]) Prohibits(id *I, action Action) error {
if err := rs.validate(); err != nil {
return err
}
Expand All @@ -56,7 +56,7 @@ func (rs ResourceSet[ID]) Prohibits(id *ID, action Action) error {
var (
foundPerm = false
perm = ActionAll
zeroID ID
zeroID I
)

if zeroPerm, hasZero := rs[zeroID]; hasZero {
Expand Down Expand Up @@ -86,7 +86,7 @@ var _ msgpack.CustomEncoder = ResourceSet[uint64]{}
var _ msgpack.CustomEncoder = ResourceSet[int32]{}
var _ msgpack.CustomEncoder = ResourceSet[string]{}

func (rs ResourceSet[ID]) EncodeMsgpack(enc *msgpack.Encoder) error {
func (rs ResourceSet[I]) EncodeMsgpack(enc *msgpack.Encoder) error {
if err := enc.EncodeMapLen(len(rs)); err != nil {
return err
}
Expand Down Expand Up @@ -116,13 +116,13 @@ func (rs ResourceSet[ID]) validate() error {
return nil
}

func match[ID Integer | string | Prefix](a, b ID) bool {
m, isM := any(a).(matcher[ID])
func match[I ID](a, b I) bool {
m, isM := any(a).(matcher[I])
return a == b || (isM && m.Match(b))
}

type matcher[T any] interface {
Match(T) bool
type matcher[I any] interface {
Match(I) bool
}

type Prefix string
Expand Down
Loading