@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user