diff --git a/pkg/cloudcommon/policy/defaults.go b/pkg/cloudcommon/policy/defaults.go index fb17c1cfde..f1022de08a 100644 --- a/pkg/cloudcommon/policy/defaults.go +++ b/pkg/cloudcommon/policy/defaults.go @@ -29,24 +29,6 @@ var ( Action: PolicyActionPerform, Result: rbacutils.Allow, }, - { - Service: "yunionagent", - Resource: "notices", - Action: PolicyActionList, - Result: rbacutils.Allow, - }, - { - Service: "yunionagent", - Resource: "readmarks", - Action: PolicyActionList, - Result: rbacutils.Allow, - }, - { - Service: "yunionagent", - Resource: "readmarks", - Action: PolicyActionCreate, - Result: rbacutils.Allow, - }, }, }, { @@ -60,32 +42,12 @@ var ( }, { // usages for any services - // Service: "compute", Resource: "usages", Action: PolicyActionGet, Result: rbacutils.Allow, }, }, }, - { - // meta服务 dbinstance_skus列表不需要认证 - Auth: false, - Scope: rbacutils.ScopeSystem, - Rules: []rbacutils.SRbacRule{ - { - Service: "yunionmeta", - Resource: "dbinstance_skus", - Action: PolicyActionGet, - Result: rbacutils.Allow, - }, - { - Service: "yunionmeta", - Resource: "dbinstance_skus", - Action: PolicyActionList, - Result: rbacutils.Allow, - }, - }, - }, { // for domain Auth: true, @@ -93,7 +55,6 @@ var ( Rules: []rbacutils.SRbacRule{ { // usages for any services - // Service: "compute", Resource: "usages", Action: PolicyActionGet, Result: rbacutils.Allow, diff --git a/pkg/cloudcommon/policy/resources.go b/pkg/cloudcommon/policy/resources.go index 3a72597e36..024b7b7f8d 100644 --- a/pkg/cloudcommon/policy/resources.go +++ b/pkg/cloudcommon/policy/resources.go @@ -19,25 +19,6 @@ import ( ) var ( - meterSystemResources = []string{ - "rates", - "res_results", - } - meterDomainResources = []string{} - meterUserResources = []string{} - - k8sSystemResources = []string{} - k8sDomainResources = []string{} - k8sUserResources = []string{} - - yunionagentSystemResources = []string{ - "notices", - "readmarks", - "infos", - } - yunionagentDomainResources = []string{} - yunionagentUserResources = []string{} - itsmSystemResources = []string{ "process-definitions", } @@ -45,24 +26,15 @@ var ( itsmUserResources = []string{} systemResources = map[string][]string{ - "meter": meterSystemResources, - "k8s": k8sSystemResources, - "yunionagent": yunionagentSystemResources, - "itsm": itsmSystemResources, + "itsm": itsmSystemResources, } domainResources = map[string][]string{ - "meter": meterDomainResources, - "k8s": k8sDomainResources, - "yunionagent": yunionagentDomainResources, - "itsm": itsmDomainResources, + "itsm": itsmDomainResources, } userResources = map[string][]string{ - "meter": meterUserResources, - "k8s": k8sUserResources, - "yunionagent": yunionagentUserResources, - "itsm": itsmUserResources, + "itsm": itsmUserResources, } )