From e112c4f567a7003526d55f7952a57bef19da6c29 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 30 May 2019 15:13:57 +0800 Subject: [PATCH] minor fixes --- pkg/cloudcommon/policy/resources.go | 1 + pkg/compute/models/elasticips.go | 4 ++-- pkg/keystone/models/users.go | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/policy/resources.go b/pkg/cloudcommon/policy/resources.go index cba35834a3..3076a45354 100644 --- a/pkg/cloudcommon/policy/resources.go +++ b/pkg/cloudcommon/policy/resources.go @@ -73,6 +73,7 @@ var ( logDomainResources = []string{} identitySystemResources = []string{ + "identity_providers", "domains", "services", "endpoints", diff --git a/pkg/compute/models/elasticips.go b/pkg/compute/models/elasticips.go index 0d45e944e1..76de6c570d 100644 --- a/pkg/compute/models/elasticips.go +++ b/pkg/compute/models/elasticips.go @@ -19,9 +19,9 @@ import ( "database/sql" "fmt" - "github.com/golang-plus/errors" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/tristate" "yunion.io/x/pkg/util/compare" "yunion.io/x/pkg/utils" @@ -391,7 +391,7 @@ func (manager *SElasticipManager) newFromCloudEip(ctx context.Context, userCred if err != nil { msg := fmt.Sprintf("failed to found network by externalId %s error: %v", networkId, err) log.Errorf(msg) - return nil, errors.New(msg) + return nil, errors.Error(msg) } eip.NetworkId = network.GetId() } diff --git a/pkg/keystone/models/users.go b/pkg/keystone/models/users.go index 774ec45734..6185efb31c 100644 --- a/pkg/keystone/models/users.go +++ b/pkg/keystone/models/users.go @@ -210,6 +210,7 @@ func (manager *SUserManager) FetchUserExtended(userId, userName, domainId, domai q := users.Query( users.Field("id"), + users.Field("name"), users.Field("enabled"), users.Field("default_project_id"), users.Field("created_at"),