github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87687 from markusthoemmes/action-match-subresource

Browse Source 
Allow Action's Matches function to specify a subresource.
This commit is contained in:
Kubernetes Prow Robot 2020-01-30 18:46:45 -08:00 committed by GitHub
commit bca516f179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/client-go/testing/actions.go
View File

@ -439,8 +439,18 @@ func (a ActionImpl) GetSubresource() string {
return a.Subresource return a.Subresource
} }
func (a ActionImpl) Matches(verb, resource string) bool { func (a ActionImpl) Matches(verb, resource string) bool {
// Stay backwards compatible.
if !strings.Contains(resource, "/") {
return strings.EqualFold(verb, a.Verb) &&
strings.EqualFold(resource, a.Resource.Resource)
}
parts := strings.SplitN(resource, "/", 2)
topresource, subresource := parts[0], parts[1]
return strings.EqualFold(verb, a.Verb) && return strings.EqualFold(verb, a.Verb) &&
strings.EqualFold(resource, a.Resource.Resource) strings.EqualFold(topresource, a.Resource.Resource) &&
strings.EqualFold(subresource, a.Subresource)
} }
func (a ActionImpl) DeepCopy() Action { func (a ActionImpl) DeepCopy() Action {
ret := a ret := a