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

Split the API error in two

Browse Source 
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
This commit is contained in:
m.nabokikh 2022-09-29 11:50:33 +02:00
parent 967fdbd3d5
commit e6e670624b
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami.go
View File

@ -139,20 +139,29 @@ func NewCmdWhoAmI(restClientGetter genericclioptions.RESTClientGetter, streams g
return cmd return cmd
} }
var notEnabledErr = fmt.Errorf( var (
"the selfsubjectreviews API is not enabled in the cluster or you do not have permission to call\n" + notEnabledErr = fmt.Errorf(
"the selfsubjectreviews API is not enabled in the cluster\n" +
"enable APISelfSubjectReview feature gate and authentication.k8s.io/v1alpha1 API") "enable APISelfSubjectReview feature gate and authentication.k8s.io/v1alpha1 API")
forbiddenErr = fmt.Errorf(
"the selfsubjectreviews API is not enabled in the cluster or you do not have permission to call it")
)
// Run prints all user attributes. // Run prints all user attributes.
func (o WhoAmIOptions) Run() error { func (o WhoAmIOptions) Run() error {
sar := &authenticationv1alpha1.SelfSubjectReview{} sar := &authenticationv1alpha1.SelfSubjectReview{}
response, err := o.authClient.SelfSubjectReviews().Create(context.TODO(), sar, metav1.CreateOptions{}) response, err := o.authClient.SelfSubjectReviews().Create(context.TODO(), sar, metav1.CreateOptions{})
if err != nil { if err != nil {
if errors.IsForbidden(err) || errors.IsNotFound(err) { switch {
case errors.IsForbidden(err):
return forbiddenErr
case errors.IsNotFound(err):
return notEnabledErr return notEnabledErr
} default:
return err return err
} }
}
return o.resourcePrinterFunc(response, o.Out) return o.resourcePrinterFunc(response, o.Out)
} }

2
staging/src/k8s.io/kubectl/pkg/cmd/auth/whoami_test.go
View File

@ -107,7 +107,7 @@ func TestWhoAmIRun(t *testing.T) {
serverErr: errors.NewForbidden( serverErr: errors.NewForbidden(
corev1.Resource("selfsubjectreviews"), "foo", fmt.Errorf("error"), corev1.Resource("selfsubjectreviews"), "foo", fmt.Errorf("error"),
), ),
expectedError: notEnabledErr, expectedError: forbiddenErr,
expectedBodyStrings: []string{}, expectedBodyStrings: []string{},
}, },
{ {