mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
As users are a valid resources type for the can-i command, the warning shouldn't appear
This commit is contained in:
parent
7b7b54ed7a
commit
5d9a0c3c00
@ -98,6 +98,8 @@ var (
|
|||||||
|
|
||||||
resourceVerbs = sets.NewString("get", "list", "watch", "create", "update", "patch", "delete", "deletecollection", "use", "bind", "impersonate", "*")
|
resourceVerbs = sets.NewString("get", "list", "watch", "create", "update", "patch", "delete", "deletecollection", "use", "bind", "impersonate", "*")
|
||||||
nonResourceURLVerbs = sets.NewString("get", "put", "post", "head", "options", "delete", "patch", "*")
|
nonResourceURLVerbs = sets.NewString("get", "put", "post", "head", "options", "delete", "patch", "*")
|
||||||
|
// holds all the server-supported resources that cannot be discovered by clients. i.e. users and groups for the impersonate verb
|
||||||
|
nonStandardResourceNames = sets.NewString("users", "groups")
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewCmdCanI returns an initialized Command for 'auth can-i' sub command
|
// NewCmdCanI returns an initialized Command for 'auth can-i' sub command
|
||||||
@ -304,10 +306,12 @@ func (o *CanIOptions) resourceFor(mapper meta.RESTMapper, resourceArg string) sc
|
|||||||
var err error
|
var err error
|
||||||
gvr, err = mapper.ResourceFor(groupResource.WithVersion(""))
|
gvr, err = mapper.ResourceFor(groupResource.WithVersion(""))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if len(groupResource.Group) == 0 {
|
if !nonStandardResourceNames.Has(groupResource.String()) {
|
||||||
fmt.Fprintf(o.ErrOut, "Warning: the server doesn't have a resource type '%s'\n", groupResource.Resource)
|
if len(groupResource.Group) == 0 {
|
||||||
} else {
|
fmt.Fprintf(o.ErrOut, "Warning: the server doesn't have a resource type '%s'\n", groupResource.Resource)
|
||||||
fmt.Fprintf(o.ErrOut, "Warning: the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group)
|
} else {
|
||||||
|
fmt.Fprintf(o.ErrOut, "Warning: the server doesn't have a resource type '%s' in group '%s'\n", groupResource.Resource, groupResource.Group)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return schema.GroupVersionResource{Resource: resourceArg}
|
return schema.GroupVersionResource{Resource: resourceArg}
|
||||||
}
|
}
|
||||||
|
@ -230,6 +230,85 @@ func TestRunAccessList(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRunResourceFor(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
o *CanIOptions
|
||||||
|
resourceArg string
|
||||||
|
|
||||||
|
expectGVR schema.GroupVersionResource
|
||||||
|
expectedErrOut string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "any resources",
|
||||||
|
o: &CanIOptions{},
|
||||||
|
resourceArg: "*",
|
||||||
|
expectGVR: schema.GroupVersionResource{
|
||||||
|
Resource: "*",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "server-supported standard resources without group",
|
||||||
|
o: &CanIOptions{},
|
||||||
|
resourceArg: "pods",
|
||||||
|
expectGVR: schema.GroupVersionResource{
|
||||||
|
Version: "v1",
|
||||||
|
Resource: "pods",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "server-supported standard resources with group",
|
||||||
|
o: &CanIOptions{},
|
||||||
|
resourceArg: "jobs",
|
||||||
|
expectGVR: schema.GroupVersionResource{
|
||||||
|
Group: "batch",
|
||||||
|
Version: "v1",
|
||||||
|
Resource: "jobs",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "server-supported nonstandard resources",
|
||||||
|
o: &CanIOptions{},
|
||||||
|
resourceArg: "users",
|
||||||
|
expectGVR: schema.GroupVersionResource{
|
||||||
|
Resource: "users",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "invalid resources",
|
||||||
|
o: &CanIOptions{},
|
||||||
|
resourceArg: "invalid",
|
||||||
|
expectGVR: schema.GroupVersionResource{
|
||||||
|
Resource: "invalid",
|
||||||
|
},
|
||||||
|
expectedErrOut: "Warning: the server doesn't have a resource type 'invalid'\n",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
tf := cmdtesting.NewTestFactory().WithNamespace("test")
|
||||||
|
defer tf.Cleanup()
|
||||||
|
|
||||||
|
ioStreams, _, _, buf := genericclioptions.NewTestIOStreams()
|
||||||
|
test.o.IOStreams = ioStreams
|
||||||
|
|
||||||
|
restMapper, err := tf.ToRESTMapper()
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("got unexpected error when do tf.ToRESTMapper(): %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
gvr := test.o.resourceFor(restMapper, test.resourceArg)
|
||||||
|
if gvr != test.expectGVR {
|
||||||
|
t.Errorf("expected %v\n but got %v\n", test.expectGVR, gvr)
|
||||||
|
}
|
||||||
|
if buf.String() != test.expectedErrOut {
|
||||||
|
t.Errorf("expected %v\n but got %v\n", test.expectedErrOut, buf.String())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func getSelfSubjectRulesReview() *authorizationv1.SelfSubjectRulesReview {
|
func getSelfSubjectRulesReview() *authorizationv1.SelfSubjectRulesReview {
|
||||||
return &authorizationv1.SelfSubjectRulesReview{
|
return &authorizationv1.SelfSubjectRulesReview{
|
||||||
Status: authorizationv1.SubjectRulesReviewStatus{
|
Status: authorizationv1.SubjectRulesReviewStatus{
|
||||||
|
Loading…
Reference in New Issue
Block a user