fix: 安全组规则返回项目id信息

pkg/apis/compute/dbinstance_account.go

@@ -88,4 +88,6 @@ type DBInstanceAccountDetails struct {
 
 	// 账号权限列表
 	DBInstanceprivileges []DBInstancePrivilege `json:"dbinstanceprivileges,allowempty"`
+
+	ProjectId string `json:"tenant_id"`
 }

pkg/apis/compute/dbinstance_database.go

@@ -70,6 +70,7 @@ type DBInstancedatabaseDetails struct {
 
 	// 数据库权限
 	DBInstanceprivileges []DBInstancePrivilege `json:"dbinstanceprivileges"`
+	ProjectId            string                `json:"tenant_id"`
 }
 
 type DBInstanceparameterDetails struct {

pkg/apis/compute/elasticcache.go

@@ -73,6 +73,7 @@ type ElasticcacheAccountDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheAccount
+	ProjectId string `json:"tenant_id"`
 }
 
 type ElasticcacheAclDetails struct {
@@ -81,6 +82,7 @@ type ElasticcacheAclDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheAcl
+	ProjectId string `json:"tenant_id"`
 }
 
 type ElasticcacheParameterDetails struct {

pkg/apis/compute/elasticcachebackup.go

@@ -22,4 +22,5 @@ type ElasticcacheBackupDetails struct {
 	ElasticcacheResourceInfo
 
 	SElasticcacheBackup
+	ProjectId string `json:"tenant_id"`
 }

pkg/apis/compute/secgrouprule.go

@@ -21,4 +21,6 @@ type SecgroupRuleDetails struct {
 	apis.ProjectizedResourceInfo
 	SSecurityGroupRule
 	SecurityGroupResourceInfo
+
+	ProjectId string `json:"tenant_id"`
 }

pkg/compute/models/dbinstance_accounts.go

@@ -201,6 +201,7 @@ func (manager *SDBInstanceAccountManager) FetchCustomizeColumns(
 	for i := range rows {
 		if dbinstance, ok := dbinstances[dbinstanceIds[i]]; ok {
 			virObjs[i] = &dbinstance
+			rows[i].ProjectId = dbinstance.ProjectId
 		}
 	}
 

pkg/compute/models/dbinstance_databases.go

@@ -324,6 +324,7 @@ func (manager *SDBInstanceDatabaseManager) FetchCustomizeColumns(
 	for i := range rows {
 		if dbinstance, ok := dbinstances[dbinstanceIds[i]]; ok {
 			virObjs[i] = &dbinstance
+			rows[i].ProjectId = dbinstance.ProjectId
 		}
 	}
 

pkg/compute/models/elasticcache_accounts.go

@@ -557,6 +557,7 @@ func (manager *SElasticcacheAccountManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 

pkg/compute/models/elasticcache_acls.go

@@ -441,6 +441,7 @@ func (manager *SElasticcacheAclManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 

pkg/compute/models/elasticcache_backups.go

@@ -454,6 +454,7 @@ func (manager *SElasticcacheBackupManager) FetchCustomizeColumns(
 	for i := range rows {
 		if cache, ok := caches[cacheIds[i]]; ok {
 			virObjs[i] = &cache
+			rows[i].ProjectId = cache.ProjectId
 		}
 	}
 

pkg/compute/models/secgrouprules.go

@@ -238,6 +238,7 @@ func (manager *SSecurityGroupRuleManager) FetchCustomizeColumns(
 	for i := range rows {
 		if secgroup, ok := secgroups[secIds[i]]; ok {
 			virObjs[i] = &secgroup
+			rows[i].ProjectId = secgroup.ProjectId
 		}
 	}