Skip to content

[v14] Fix Access List Members cache and eventing. #32649

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

Merged
mdwn merged 2 commits into from
Sep 27, 2023
Merged

[v14] Fix Access List Members cache and eventing. #32649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2392b48
Fix Access List Members cache and eventing.
Sep 27, 2023
a3b2771
Use ExactKey, fix accessListMemberParser as well.
Sep 27, 2023
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
2 changes: 1 addition & 1 deletion lib/cache/collections.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ func setupCollections(c *Cache, watches []types.WatchKind) (*cacheCollections, e
return nil, trace.BadParameter("missing parameter AccessLists")
}
collections.accessListMembers = &genericCollection[*accesslist.AccessListMember, services.AccessListMembersGetter, accessListMembersExecutor]{cache: c, watch: watch}
collections.byKind[resourceKind] = collections.accessLists
collections.byKind[resourceKind] = collections.accessListMembers
default:
return nil, trace.BadParameter("resource %q is not supported", watch.Kind)
}
Expand Down
8 changes: 4 additions & 4 deletions lib/services/access_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func UnmarshalAccessList(data []byte, opts ...MarshalOption) (*accesslist.Access
if err != nil {
return nil, trace.Wrap(err)
}
var accessList *accesslist.AccessList
var accessList accesslist.AccessList
if err := utils.FastUnmarshal(data, &accessList); err != nil {
return nil, trace.BadParameter(err.Error())
}
Expand All @@ -99,7 +99,7 @@ func UnmarshalAccessList(data []byte, opts ...MarshalOption) (*accesslist.Access
if !cfg.Expires.IsZero() {
accessList.SetExpiry(cfg.Expires)
}
return accessList, nil
return &accessList, nil
}

// AccessListMembersGetter defines an interface for reading access list members.
Expand Down Expand Up @@ -152,7 +152,7 @@ func UnmarshalAccessListMember(data []byte, opts ...MarshalOption) (*accesslist.
if err != nil {
return nil, trace.Wrap(err)
}
var member *accesslist.AccessListMember
var member accesslist.AccessListMember
if err := utils.FastUnmarshal(data, &member); err != nil {
return nil, trace.BadParameter(err.Error())
}
Expand All @@ -165,7 +165,7 @@ func UnmarshalAccessListMember(data []byte, opts ...MarshalOption) (*accesslist.
if !cfg.Expires.IsZero() {
member.SetExpiry(cfg.Expires)
}
return member, nil
return &member, nil
}

// IsAccessListOwner will return true if the user is an owner for the current list.
Expand Down
4 changes: 2 additions & 2 deletions lib/services/local/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,7 @@ func (p *headlessAuthenticationParser) parse(event backend.Event) (types.Resourc

func newAccessListParser() *accessListParser {
return &accessListParser{
baseParser: newBaseParser(backend.Key(accessListPrefix)),
baseParser: newBaseParser(backend.ExactKey(accessListPrefix)),
}
}

Expand Down Expand Up @@ -1651,7 +1651,7 @@ func (p *userLoginStateParser) parse(event backend.Event) (types.Resource, error

func newAccessListMemberParser() *accessListMemberParser {
return &accessListMemberParser{
baseParser: newBaseParser(backend.Key(accessListMemberPrefix)),
baseParser: newBaseParser(backend.ExactKey(accessListMemberPrefix)),
}
}

Expand Down