@@ -155,6 +155,9 @@ func (f *Framework) GenericClient(userAgent string) client.Client {
|
||||
Host: ctx.Host,
|
||||
Username: ctx.Username,
|
||||
Password: ctx.Password,
|
||||
ContentConfig: rest.ContentConfig{
|
||||
ContentType: runtime.ContentTypeJSON,
|
||||
},
|
||||
}
|
||||
|
||||
rest.AddUserAgent(config, userAgent)
|
||||
|
||||
@@ -34,13 +34,10 @@ import (
|
||||
func NewClient(s *runtime.Scheme, user, passsword string) (client.Client, error) {
|
||||
|
||||
ctx := framework.TestContext
|
||||
token, err := getToken(ctx.Host, user, passsword)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
config := &rest.Config{
|
||||
Host: ctx.Host,
|
||||
BearerToken: token.AccessToken,
|
||||
Host: ctx.Host,
|
||||
Username: user,
|
||||
Password: passsword,
|
||||
}
|
||||
|
||||
return generic.New(config, client.Options{Scheme: s})
|
||||
@@ -48,13 +45,10 @@ func NewClient(s *runtime.Scheme, user, passsword string) (client.Client, error)
|
||||
|
||||
func NewRestClient(user, passsword string) (*restclient.RestClient, error) {
|
||||
ctx := framework.TestContext
|
||||
token, err := getToken(ctx.Host, user, passsword)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
config := &rest.Config{
|
||||
Host: ctx.Host,
|
||||
BearerToken: token.AccessToken,
|
||||
Host: ctx.Host,
|
||||
Username: user,
|
||||
Password: passsword,
|
||||
}
|
||||
|
||||
return restclient.NewForConfig(config)
|
||||
|
||||
@@ -27,6 +27,7 @@ import (
|
||||
|
||||
"kubesphere.io/api/iam/v1alpha2"
|
||||
|
||||
"kubesphere.io/kubesphere/pkg/utils/stringutils"
|
||||
"kubesphere.io/kubesphere/test/e2e/constant"
|
||||
"kubesphere.io/kubesphere/test/e2e/framework"
|
||||
"kubesphere.io/kubesphere/test/e2e/framework/iam"
|
||||
@@ -73,6 +74,11 @@ var _ = Describe("Groups", func() {
|
||||
_, err = restClient.IamV1alpha2().Groups().CreateBinding(context.TODO(), workspace, group, UserName)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
Eventually(func() bool {
|
||||
user, err := iam.GetUser(adminClient, UserName)
|
||||
return err == nil && stringutils.FindString(user.Spec.Groups, group) != -1
|
||||
}, timeout, interval).Should(BeTrue())
|
||||
|
||||
By("Creating a new client with user authentication")
|
||||
userClient, err = iam.NewClient(f.GetScheme(), u.Name, constant.DefaultPassword)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
Reference in New Issue
Block a user