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

Implements ResourceWithLabels on AccessListMember #39498

Merged
merged 5 commits into from
Mar 19, 2024
+8 −0
Merged

Implements ResourceWithLabels on AccessListMember #39498

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3746ad
Implements ResourceWithLabels on AccessListMember
tcsc Mar 18, 2024
59e9ad8
Merge branch 'master' into tcsc/acl-member-as-resource-with-labels
tcsc Mar 18, 2024
01bb161
Update member.go
tcsc Mar 18, 2024
1797a6f
Merge branch 'master' into tcsc/acl-member-as-resource-with-labels
tcsc Mar 18, 2024
1c6c1cf
Merge branch 'master' into tcsc/acl-member-as-resource-with-labels
tcsc Mar 19, 2024
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
11 changes: 11 additions & 0 deletions api/types/accesslist/member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/api/types/header"
"github.com/gravitational/teleport/api/types/header/convert/legacy"
"github.com/gravitational/teleport/api/utils"
)

// AccessListMember is an access list member resource.
Expand Down Expand Up @@ -116,3 +117,13 @@ func (a *AccessListMember) IsEqual(other *AccessListMember) bool {
return a.Spec.Name == other.Spec.Name &&
a.Spec.AccessList == other.Spec.AccessList
}

var _ types.ResourceWithOrigin = (*AccessListMember)(nil)
var _ types.ResourceWithLabels = (*AccessListMember)(nil)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
var _ types.ResourceWithOrigin = (*AccessListMember)(nil)
var _ types.ResourceWithLabels = (*AccessListMember)(nil)
var (
_ types.ResourceWithOrigin = (*AccessListMember)(nil)
_ types.ResourceWithLabels = (*AccessListMember)(nil)
)

Copy link
Contributor

Choose a reason for hiding this comment

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

The appearance of the blank identifier in this construct indicates that the declaration exists only for the type checking, not to create a variable. Don't do this for every type that satisfies an interface, though. By convention, such declarations are only used when there are no static conversions already present in the code, which is a rare event.

https://golang.google.cn/doc/effective_go#interfaces_and_types

Do any static conversion already exist? If there aren't and this is to remain, types. ResourceWithOrigin is embedded in types.ResourceWithLabels so I think we can likely reduce this to a single var _ types.ResourceWithLabels = (*AccessListMember)(nil)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Deleted.


// MatchSearch goes through select field values of a resource
// and tries to match against the list of search values.
func (a *AccessListMember) MatchSearch(values []string) bool {
fieldVals := append(utils.MapToStrings(a.GetAllLabels()), a.GetName())
return types.MatchSearch(fieldVals, values, nil)
}
Loading