From a543901e2f95d7a717ef7599bf8ecb4de3ea6f96 Mon Sep 17 00:00:00 2001 From: TangBin Date: Sat, 1 Dec 2018 14:52:01 +0800 Subject: [PATCH] yunionconfig build error fix --- pkg/cloudcommon/db/rbac.go | 2 +- pkg/compute/models/loadbalanceragents.go | 1 - pkg/compute/models/storages.go | 1 - pkg/webconsole/handlers.go | 2 +- pkg/webconsole/service/service.go | 2 +- pkg/yunionconf/models/parameters.go | 12 ++++++------ 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkg/cloudcommon/db/rbac.go b/pkg/cloudcommon/db/rbac.go index 83da4b9753..894429f9a1 100644 --- a/pkg/cloudcommon/db/rbac.go +++ b/pkg/cloudcommon/db/rbac.go @@ -153,4 +153,4 @@ func IsAdminAllowUpdate(userCred mcclient.TokenCredential, obj IModel) bool { func IsAdminAllowDelete(userCred mcclient.TokenCredential, obj IModel) bool { return userCred.IsAdminAllow(consts.GetServiceType(), obj.KeywordPlural(), policy.PolicyActionDelete) -} \ No newline at end of file +} diff --git a/pkg/compute/models/loadbalanceragents.go b/pkg/compute/models/loadbalanceragents.go index 11cd9154f1..12be997064 100644 --- a/pkg/compute/models/loadbalanceragents.go +++ b/pkg/compute/models/loadbalanceragents.go @@ -235,7 +235,6 @@ func (p *SLoadbalancerAgentParams) IsZero() bool { return false } - func (self *SLoadbalancerAgentManager) AllowListItems(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) bool { return db.IsAdminAllowList(userCred, self) } diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index 1c14dc5162..a07af000dd 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -198,7 +198,6 @@ func (self *SStorage) IsLocal() bool { return self.StorageType == STORAGE_LOCAL || self.StorageType == STORAGE_BAREMETAL } - func (self *SStorage) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict { used := self.GetUsedCapacity(tristate.True) waste := self.GetUsedCapacity(tristate.False) diff --git a/pkg/webconsole/handlers.go b/pkg/webconsole/handlers.go index 67ed8f81f6..6d78769dd9 100644 --- a/pkg/webconsole/handlers.go +++ b/pkg/webconsole/handlers.go @@ -9,6 +9,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" @@ -17,7 +18,6 @@ import ( "yunion.io/x/onecloud/pkg/webconsole/command" o "yunion.io/x/onecloud/pkg/webconsole/options" "yunion.io/x/onecloud/pkg/webconsole/session" - "yunion.io/x/onecloud/pkg/cloudcommon/policy" ) const ( diff --git a/pkg/webconsole/service/service.go b/pkg/webconsole/service/service.go index cc89ee6122..c96fe85d2a 100644 --- a/pkg/webconsole/service/service.go +++ b/pkg/webconsole/service/service.go @@ -12,10 +12,10 @@ import ( "net/http" "yunion.io/x/onecloud/pkg/cloudcommon" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/webconsole" o "yunion.io/x/onecloud/pkg/webconsole/options" "yunion.io/x/onecloud/pkg/webconsole/server" - "yunion.io/x/onecloud/pkg/cloudcommon/consts" ) func ensureBinExists(binPath string) { diff --git a/pkg/yunionconf/models/parameters.go b/pkg/yunionconf/models/parameters.go index 90f40903fa..4921b1e12c 100644 --- a/pkg/yunionconf/models/parameters.go +++ b/pkg/yunionconf/models/parameters.go @@ -5,14 +5,14 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/timeutils" "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" - "yunion.io/x/onecloud/pkg/cloudcommon/consts" - "yunion.io/x/onecloud/pkg/cloudcommon/policy" ) const ( @@ -72,9 +72,9 @@ func getNamespaceInContext(userCred mcclient.TokenCredential, query jsonutils.JS } } -func getNamespace(userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (string, string, error) { +func getNamespace(userCred mcclient.TokenCredential, resource string, query jsonutils.JSONObject, data *jsonutils.JSONDict) (string, string, error) { var namespace, namespace_id string - if db.IsAdminAllowGet(userCred, ParameterManager) { + if userCred.IsAdminAllow(consts.GetServiceType(), resource, policy.PolicyActionList) { if name, nameId, e := getNamespaceInContext(userCred, query, data); e != nil { return "", "", e } else { @@ -113,7 +113,7 @@ func (manager *SParameterManager) ValidateCreateData(ctx context.Context, userCr return nil, httperrors.NewUserNotFoundError("user not found") } - namespace, namespace_id, e := getNamespace(userCred, query, data) + namespace, namespace_id, e := getNamespace(userCred, manager.KeywordPlural(), query, data) if e != nil { return nil, e } @@ -182,7 +182,7 @@ func (model *SParameter) ValidateUpdateData(ctx context.Context, userCred mcclie return nil, httperrors.NewUserNotFoundError("user not found") } - namespace, namespace_id, e := getNamespace(userCred, query, data) + namespace, namespace_id, e := getNamespace(userCred, model.KeywordPlural(), query, data) if e != nil { return nil, e }