[WIP] API refactor (#1737)

* refactor openpitrix API

Signed-off-by: hongming <talonwan@yunify.com>

* add openpitrix mock client

Signed-off-by: hongming <talonwan@yunify.com>

* refactor tenant API

Signed-off-by: hongming <talonwan@yunify.com>

* refactor IAM API

Signed-off-by: hongming <talonwan@yunify.com>

* refactor IAM API

Signed-off-by: hongming <talonwan@yunify.com>
This commit is contained in:
hongming
2020-01-13 13:36:21 +08:00
committed by zryfish
parent c40d1542a2
commit 71849f028f
66 changed files with 5415 additions and 4366 deletions

View File

@@ -85,7 +85,7 @@ func (c *channelPool) Get() (*PoolConn, error) {
return nil, ErrClosed
}
// wrap our connections with our ldap.Client implementation (wrapConn
// wrap our connections with our ldap.PoolClient implementation (wrapConn
// method) that puts the connection back to the pool if it's closed.
select {
case conn := <-conns:

View File

@@ -8,7 +8,7 @@ import (
"github.com/go-ldap/ldap"
)
// PoolConn implements Client to override the Close() method
// PoolConn implements PoolClient to override the Close() method
type PoolConn struct {
Conn ldap.Client
c *channelPool

View File

@@ -23,13 +23,19 @@ import (
"k8s.io/klog"
)
type Client struct {
type Client interface {
NewConn() (ldap.Client, error)
GroupSearchBase() string
UserSearchBase() string
}
type poolClient struct {
pool Pool
options *Options
}
// panic if cannot connect to ldap service
func NewLdapClient(options *Options, stopCh <-chan struct{}) (*Client, error) {
func NewLdapClient(options *Options, stopCh <-chan struct{}) (Client, error) {
pool, err := NewChannelPool(8, 64, "kubesphere", func(s string) (ldap.Client, error) {
conn, err := ldap.Dial("tcp", options.Host)
if err != nil {
@@ -44,7 +50,7 @@ func NewLdapClient(options *Options, stopCh <-chan struct{}) (*Client, error) {
return nil, err
}
client := &Client{
client := &poolClient{
pool: pool,
options: options,
}
@@ -59,7 +65,7 @@ func NewLdapClient(options *Options, stopCh <-chan struct{}) (*Client, error) {
return client, nil
}
func (l *Client) NewConn() (ldap.Client, error) {
func (l *poolClient) NewConn() (ldap.Client, error) {
if l.pool == nil {
err := fmt.Errorf("ldap connection pool is not initialized")
klog.Errorln(err)
@@ -81,10 +87,10 @@ func (l *Client) NewConn() (ldap.Client, error) {
return conn, nil
}
func (l *Client) GroupSearchBase() string {
func (l *poolClient) GroupSearchBase() string {
return l.options.GroupSearchBase
}
func (l *Client) UserSearchBase() string {
func (l *poolClient) UserSearchBase() string {
return l.options.UserSearchBase
}