From 6fa0ba1cadf6a3a21a2b5371e8a754b97a735497 Mon Sep 17 00:00:00 2001 From: caryxychen Date: Fri, 2 Sep 2022 17:30:14 +0800 Subject: [PATCH 1/2] feat(cloudindustry): support searchKey and limit --- go.mod | 2 +- go.sum | 4 ++-- .../identityprovider/cloudindustry/cloudindustry.go | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 398d1a5fe..e1f19b8cc 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/aws/aws-sdk-go v1.40.37 github.com/bitly/go-simplejson v0.5.0 github.com/caddyserver/caddy v1.0.5 - github.com/caryxychen/cloudindustry-sdk-go v1.0.0 + github.com/caryxychen/cloudindustry-sdk-go v1.0.1 github.com/casbin/casbin/v2 v2.2.1 github.com/chartmuseum/helm-push v0.9.0 github.com/chartmuseum/storage v0.11.0 diff --git a/go.sum b/go.sum index 323e028a6..41b9a9e91 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3k github.com/caddyserver/caddy v1.0.5 h1:5B1Hs0UF2x2tggr2X9jL2qOZtDXbIWQb9YLbmlxHSuM= github.com/caddyserver/caddy v1.0.5/go.mod h1:AnFHB+/MrgRC+mJAvuAgQ38ePzw+wKeW0wzENpdQQKY= github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8= -github.com/caryxychen/cloudindustry-sdk-go v1.0.0 h1:bsdS6BP49K+VCzHbsa+hUEmOfryXuDpxdFrA24Z67vo= -github.com/caryxychen/cloudindustry-sdk-go v1.0.0/go.mod h1:ZqQXwtco2MGa2s6MAP6snl5bg/M+0rufb7E8zDuCn1M= +github.com/caryxychen/cloudindustry-sdk-go v1.0.1 h1:hHJ8G9nZLl4bLiTfpdvGycc9u2nXGlKx4iWKedAmj0U= +github.com/caryxychen/cloudindustry-sdk-go v1.0.1/go.mod h1:ZqQXwtco2MGa2s6MAP6snl5bg/M+0rufb7E8zDuCn1M= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/casbin/casbin/v2 v2.2.1 h1:ijrSMfBfbQlDc4LnMTGtGYWmhKuuR6RLSQRj8vHrMzc= github.com/casbin/casbin/v2 v2.2.1/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= diff --git a/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go b/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go index be72d7e3b..9f414f5fc 100644 --- a/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go +++ b/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go @@ -213,12 +213,12 @@ func (i *identityProvider) ListUsers(ctx context.Context, options *metainternal. accountsRequest.AccountIds = ids.Response.SubIds if options != nil { keyword, limit := util.ParseQueryKeywordAndLimit(options) - params := accountsRequest.GetParams() - params["SearchKey"] = keyword - params["Limit"] = strconv.Itoa(limit) + accountsRequest.SearchKey = keyword + accountsRequest.SearchKey = keyword + accountsRequest.Limit = strconv.Itoa(limit) } - bytes, _ := json.Marshal(accountsRequest.GetParams()) - log.Infof("request params '%s'", string(bytes)) + bytes, _ := json.Marshal(accountsRequest) + log.Debugf("request '%s'", string(bytes)) accounts, err := i.client.DescribeAccounts(accountsRequest) if err != nil { @@ -226,7 +226,7 @@ func (i *identityProvider) ListUsers(ctx context.Context, options *metainternal. return nil, apierrors.NewInternalError(err) } bytes, _ = json.Marshal(accounts) - log.Infof("accounts '%s'", string(bytes)) + log.Debugf("accounts '%s'", string(bytes)) if accounts.Response == nil || len(accounts.Response.Accounts) == 0 { return &auth.UserList{}, nil } From 7af46fdaf93466427b36d20934a6923c1c7ae592 Mon Sep 17 00:00:00 2001 From: caryxychen Date: Fri, 2 Sep 2022 17:32:49 +0800 Subject: [PATCH 2/2] feat(cloudindustry): support searchKey and limit --- .../oidc/identityprovider/cloudindustry/cloudindustry.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go b/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go index 9f414f5fc..1a16e97ba 100644 --- a/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go +++ b/pkg/auth/authentication/oidc/identityprovider/cloudindustry/cloudindustry.go @@ -214,7 +214,6 @@ func (i *identityProvider) ListUsers(ctx context.Context, options *metainternal. if options != nil { keyword, limit := util.ParseQueryKeywordAndLimit(options) accountsRequest.SearchKey = keyword - accountsRequest.SearchKey = keyword accountsRequest.Limit = strconv.Itoa(limit) } bytes, _ := json.Marshal(accountsRequest)