fix: 公有云子账号加域属性

pkg/apis/cloudid/clouduser.go

@@ -35,7 +35,7 @@ const (
 )
 
 type ClouduserCreateInput struct {
-	apis.StatusUserResourceCreateInput
+	apis.StatusDomainLevelUserResourceCreateInput
 	apis.StatusBaseResourceCreateInput
 
 	// 云订阅ID
@@ -100,11 +100,15 @@ type ClouduserCreateInput struct {
 }
 
 type ClouduserListInput struct {
-	apis.StatusUserResourceListInput
+	apis.StatusDomainLevelUserResourceListInput
 
 	CloudaccountResourceListInput
 	CloudproviderResourceListInput
 
+	// 通过关联用户查找公有云子账号
+	// example: cloudadmin
+	OwnerName string `json:"owner_name"`
+
 	// 过滤绑定权限的子账号
 	CloudpolicyId string `json:"cloudpolicy_id"`
 
@@ -113,7 +117,7 @@ type ClouduserListInput struct {
 }
 
 type ClouduserDetails struct {
-	apis.StatusUserResourceDetails
+	apis.StatusDomainLevelUserResourceDetails
 	SClouduser
 
 	CloudaccountResourceDetails

pkg/apis/input.go

@@ -75,9 +75,11 @@ type SharableVirtualResourceCreateInput struct {
 	SharableResourceBaseCreateInput
 }
 
-type StatusUserResourceCreateInput struct {
-	StatusBaseResourceCreateInput
-	UserResourceCreateInput
+type StatusDomainLevelUserResourceCreateInput struct {
+	StatusDomainLevelResourceCreateInput
+
+	// 本地用户Id，若为空则使用当前用户Id作为此参数值
+	OwnerId string `json:"owner_id"`
 }
 
 type UserResourceCreateInput struct {

pkg/apis/list.go

@@ -53,8 +53,8 @@ type ProjectizedResourceListInput struct {
 	OrderByTenant string `json:"order_by_tenant" "yunion:deprecated-by":"order_by_project"`
 }
 
-type StatusUserResourceListInput struct {
-	StatusResourceBaseListInput
+type StatusDomainLevelUserResourceListInput struct {
+	StatusDomainLevelResourceListInput
 	UserResourceListInput
 }
 

pkg/apis/output.go

@@ -121,7 +121,9 @@ type MetadataResourceInfo struct {
 	Metadata map[string]string `json:"metadata"`
 }
 
-type StatusUserResourceDetails struct {
+type StatusDomainLevelUserResourceDetails struct {
+	StatusDomainLevelResourceDetails
+
 	UserResourceDetails
 }
 

pkg/cloudcommon/db/statusinfrasuserresource.go

@@ -0,0 +1,166 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package db
+
+import (
+	"context"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/reflectutils"
+	"yunion.io/x/sqlchemy"
+
+	"yunion.io/x/onecloud/pkg/apis"
+	"yunion.io/x/onecloud/pkg/httperrors"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/util/rbacutils"
+	"yunion.io/x/onecloud/pkg/util/stringutils2"
+)
+
+type SStatusDomainLevelUserResourceBase struct {
+	SStatusDomainLevelResourceBase
+
+	// 本地用户Id
+	OwnerId string `width:"128" charset:"ascii" index:"true" list:"user" nullable:"false" create:"required"`
+}
+
+type SStatusDomainLevelUserResourceBaseManager struct {
+	SStatusDomainLevelResourceBaseManager
+}
+
+func NewStatusDomainLevelUserResourceBaseManager(dt interface{}, tableName string, keyword string, keywordPlural string) SStatusDomainLevelUserResourceBaseManager {
+	return SStatusDomainLevelUserResourceBaseManager{
+		SStatusDomainLevelResourceBaseManager: NewStatusDomainLevelResourceBaseManager(dt, tableName, keyword, keywordPlural),
+	}
+}
+
+func (model *SStatusDomainLevelUserResourceBase) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
+	return statusBaseSetStatus(model, userCred, status, reason)
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, input apis.StatusDomainLevelUserResourceCreateInput) (apis.StatusDomainLevelUserResourceCreateInput, error) {
+	var err error
+	input.StatusDomainLevelResourceCreateInput, err = manager.SStatusDomainLevelResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, input.StatusDomainLevelResourceCreateInput)
+	if err != nil {
+		return input, err
+	}
+	return input, nil
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) ListItemFilter(
+	ctx context.Context,
+	q *sqlchemy.SQuery,
+	userCred mcclient.TokenCredential,
+	query apis.StatusDomainLevelUserResourceListInput,
+) (*sqlchemy.SQuery, error) {
+	q, err := manager.SStandaloneResourceBaseManager.ListItemFilter(ctx, q, userCred, query.StandaloneResourceListInput)
+	if err != nil {
+		return nil, errors.Wrap(err, "SUserResourceBaseManager.ListItemFilter")
+	}
+
+	if ((query.Admin != nil && *query.Admin) || query.Scope == string(rbacutils.ScopeSystem)) && IsAdminAllowList(userCred, manager) {
+		user := query.User
+		if len(user) > 0 {
+			uc, _ := UserCacheManager.FetchUserByIdOrName(ctx, user)
+			if uc == nil {
+				return nil, httperrors.NewUserNotFoundError("user %s not found", user)
+			}
+			q = q.Equals("owner_id", uc.Id)
+		}
+	} else if query.Scope == string(rbacutils.ScopeDomain) && IsDomainAllowList(userCred, manager) {
+		q = q.Equals("domain_id", userCred.GetProjectDomainId())
+	} else {
+		q = q.Equals("owner_id", userCred.GetUserId())
+	}
+
+	q, err = manager.SStatusResourceBaseManager.ListItemFilter(ctx, q, userCred, query.StatusResourceBaseListInput)
+	if err != nil {
+		return nil, errors.Wrap(err, "SStatusResourceBaseManager.ListItemFilter")
+	}
+	return q, nil
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) OrderByExtraFields(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query apis.StatusDomainLevelUserResourceListInput) (*sqlchemy.SQuery, error) {
+	var err error
+	q, err = manager.SStatusDomainLevelResourceBaseManager.OrderByExtraFields(ctx, q, userCred, query.StatusDomainLevelResourceListInput)
+	if err != nil {
+		return nil, errors.Wrap(err, "SStatusDomainLevelResourceBaseManager.ListItemFilter")
+	}
+	return q, nil
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
+	var err error
+	q, err = manager.SStatusDomainLevelResourceBaseManager.QueryDistinctExtraField(q, field)
+	if err == nil {
+		return q, nil
+	}
+	return q, httperrors.ErrNotFound
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) ListItemExportKeys(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, keys stringutils2.SSortedStrings) (*sqlchemy.SQuery, error) {
+	var err error
+	q, err = manager.SStatusDomainLevelResourceBaseManager.ListItemExportKeys(ctx, q, userCred, keys)
+	if err != nil {
+		return nil, errors.Wrap(err, "SStatusDomainLevelResourceBaseManager.ListItemExportKeys")
+	}
+
+	return q, nil
+}
+
+func (manager *SStatusDomainLevelUserResourceBaseManager) FetchCustomizeColumns(
+	ctx context.Context,
+	userCred mcclient.TokenCredential,
+	query jsonutils.JSONObject,
+	objs []interface{},
+	fields stringutils2.SSortedStrings,
+	isList bool,
+) []apis.StatusDomainLevelUserResourceDetails {
+	rows := make([]apis.StatusDomainLevelUserResourceDetails, len(objs))
+	domainRows := manager.SStatusDomainLevelResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
+	userIds := make([]string, len(objs))
+	for i := range rows {
+		rows[i] = apis.StatusDomainLevelUserResourceDetails{
+			StatusDomainLevelResourceDetails: domainRows[i],
+		}
+		var base *SStatusDomainLevelUserResourceBase
+		reflectutils.FindAnonymouStructPointer(objs[i], &base)
+		if base != nil && len(base.OwnerId) > 0 {
+			userIds[i] = base.OwnerId
+		}
+	}
+
+	userMaps, err := FetchIdNameMap2(UserCacheManager, userIds)
+	if err != nil {
+		log.Errorf("FetchIdNameMap2 fail: %v", err)
+		return rows
+	}
+
+	for i := range rows {
+		rows[i].OwnerName, _ = userMaps[userIds[i]]
+	}
+
+	return rows
+}
+
+func (model *SStatusDomainLevelUserResourceBase) GetExtraDetails(
+	ctx context.Context,
+	userCred mcclient.TokenCredential,
+	query jsonutils.JSONObject,
+	isList bool,
+) (apis.StatusDomainLevelUserResourceDetails, error) {
+	return apis.StatusDomainLevelUserResourceDetails{}, nil
+}