opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7455 from swordqiu/hotfix/qj-avoid-duplicate-generated-performsetscope

Browse Source 
fix: avoid generated codes having duplicate PerformSetScope methods
This commit is contained in:
Zexi Li
2020-08-02 10:04:22 +08:00
committed by GitHub
parent a51f0271eb 9bdf2c75e1
commit da7342368e
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/zz_generated.model.go
+7 -4
View File
@@ -1385,7 +1385,7 @@ type SLoadbalancerHTTPRedirect struct {
// SLoadbalancerHTTPSListener is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerHTTPSListener.
type SLoadbalancerHTTPSListener struct {
CertificateId string `json:"certificate_id"`
SLoadbalancerCertificateResourceBase
CachedCertificateId string `json:"cached_certificate_id"`
TLSCipherPolicy string `json:"tls_cipher_policy"`
EnableHttp2 bool `json:"enable_http2"`
@@ -1433,8 +1433,8 @@ type SLoadbalancerListener struct {
BackendIdleTimeout int `json:"backend_idle_timeout"`
AclStatus string `json:"acl_status"`
AclType string `json:"acl_type"`
AclId string `json:"acl_id"`
CachedAclId string `json:"cached_acl_id"`
SLoadbalancerAclResourceBase
CachedAclId string `json:"cached_acl_id"`
SLoadbalancerRateLimiter
SLoadbalancerTCPListener
SLoadbalancerUDPListener
@@ -1592,6 +1592,8 @@ type SNetwork struct {
// 分配策略
AllocPolicy string `json:"alloc_policy"`
AllocTimoutSeconds int `json:"alloc_timout_seconds"`
// 是否自动分配IP
IsAutoAlloc bool `json:"is_auto_alloc"`
}
// SNetworkInterface is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetworkInterface.
@@ -1887,7 +1889,8 @@ type SSecurityGroupCache struct {
SManagedResourceBase
SSecurityGroupResourceBase
// 虚拟私有网络外部Id
VpcId string `json:"vpc_id"`
VpcId string `json:"vpc_id"`
ExternalProjectId string `json:"external_project_id"`
}
// SSecurityGroupResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroupResourceBase.
pkg/cloudcommon/db/scoperesource.go
+7 -7
View File
@@ -215,7 +215,7 @@ type IScopedResourceModel interface {
SetResourceScope(domainId, projectId string) error
}
func (m *SScopedResourceBaseManager) PerformSetScope(
func PerformSetScope(
ctx context.Context,
obj IScopedResourceModel,
userCred mcclient.TokenCredential,
@@ -242,11 +242,11 @@ func (m *SScopedResourceBaseManager) PerformSetScope(
var err error
switch scopeToSet {
case rbacutils.ScopeSystem:
err = m.SetScopedResourceToSystem(obj, userCred)
err = setScopedResourceToSystem(obj, userCred)
case rbacutils.ScopeDomain:
err = m.SetScopedResourceToDomain(obj, userCred, domainId)
err = setScopedResourceToDomain(obj, userCred, domainId)
case rbacutils.ScopeProject:
err = m.SetScopedResourceToProject(obj, userCred, projectId)
err = setScopedResourceToProject(obj, userCred, projectId)
}
return nil, err
}
@@ -262,7 +262,7 @@ func setScopedResourceIds(model IScopedResourceModel, userCred mcclient.TokenCre
return err
}
func (m *SScopedResourceBaseManager) SetScopedResourceToSystem(model IScopedResourceModel, userCred mcclient.TokenCredential) error {
func setScopedResourceToSystem(model IScopedResourceModel, userCred mcclient.TokenCredential) error {
if !IsAdminAllowPerform(userCred, model, "set-scope") {
return httperrors.NewForbiddenError("Not allow set scope to system")
}
@@ -272,7 +272,7 @@ func (m *SScopedResourceBaseManager) SetScopedResourceToSystem(model IScopedReso
return setScopedResourceIds(model, userCred, "", "")
}
func (m *SScopedResourceBaseManager) SetScopedResourceToDomain(model IScopedResourceModel, userCred mcclient.TokenCredential, domainId string) error {
func setScopedResourceToDomain(model IScopedResourceModel, userCred mcclient.TokenCredential, domainId string) error {
if !IsDomainAllowPerform(userCred, model, "set-scope") {
return httperrors.NewForbiddenError("Not allow set scope to domain %s", domainId)
}
@@ -286,7 +286,7 @@ func (m *SScopedResourceBaseManager) SetScopedResourceToDomain(model IScopedReso
return setScopedResourceIds(model, userCred, domain.GetId(), "")
}
func (m *SScopedResourceBaseManager) SetScopedResourceToProject(model IScopedResourceModel, userCred mcclient.TokenCredential, projectId string) error {
func setScopedResourceToProject(model IScopedResourceModel, userCred mcclient.TokenCredential, projectId string) error {
if !IsProjectAllowPerform(userCred, model, "set-scope") {
return httperrors.NewForbiddenError("Not allow set scope to project %s", projectId)
}
pkg/compute/models/schedtags.go
+1 -1
View File
@@ -609,5 +609,5 @@ func (s *SSchedtag) AllowPerformSetScope(ctx context.Context, userCred mcclient.
}
func (s *SSchedtag) PerformSetScope(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
return SchedtagManager.PerformSetScope(ctx, s, userCred, data)
return db.PerformSetScope(ctx, s, userCred, data)
}
pkg/monitor/models/commonalert.go
+1 -1
View File
@@ -680,7 +680,7 @@ func (alert *SCommonAlert) AllowPerformSetScope(ctx context.Context, userCred mc
}
func (alert *SCommonAlert) PerformSetScope(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
return CommonAlertManager.PerformSetScope(ctx, alert, userCred, data)
return db.PerformSetScope(ctx, alert, userCred, data)
}
func (manager *SCommonAlertManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {