minor fixes

This commit is contained in:
Qiu Jian
2019-05-30 15:13:57 +08:00
parent 2d9a2cfbf4
commit e112c4f567
3 changed files with 4 additions and 2 deletions
+1
View File
@@ -73,6 +73,7 @@ var (
logDomainResources = []string{}
identitySystemResources = []string{
"identity_providers",
"domains",
"services",
"endpoints",
+2 -2
View File
@@ -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()
}
+1
View File
@@ -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"),