fix: 支持公有云域过滤操作日志

pkg/apis/cloudevent/cloudevent.go

@@ -23,6 +23,7 @@ import (
 
 type CloudeventListInput struct {
 	apis.ModelBaseListInput
+	apis.ProjectizedResourceListInput
 
 	compute.CloudenvResourceListInput
 
@@ -43,3 +44,9 @@ type CloudeventListInput struct {
 	// 操作日志截止时间
 	Until time.Time `json:"until"`
 }
+
+type CloudeventDetails struct {
+	apis.ModelBaseDetails
+	apis.ProjectizedResourceInfo
+	SCloudevent
+}

pkg/apis/cloudevent/zz_generated.model.go

@@ -0,0 +1,49 @@
+// 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.
+
+// Code generated by model-api-gen. DO NOT EDIT.
+
+package cloudevent
+
+import (
+	time "time"
+
+	"yunion.io/x/onecloud/pkg/apis"
+)
+
+// SCloudevent is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudevent/models.SCloudevent.
+type SCloudevent struct {
+	apis.SProjectizedResourceBase
+	EventId         int64       `json:"event_id"`
+	Name            string      `json:"name"`
+	Service         string      `json:"service"`
+	ResourceType    string      `json:"resource_type"`
+	Action          string      `json:"action"`
+	RequestId       string      `json:"request_id"`
+	Request         interface{} `json:"request"`
+	Account         string      `json:"account"`
+	Success         bool        `json:"success"`
+	CreatedAt       time.Time   `json:"created_at"`
+	CloudproviderId string      `json:"cloudprovider_id"`
+	Manager         string      `json:"manager"`
+	Provider        string      `json:"provider"`
+	Brand           string      `json:"brand"`
+}
+
+// SCloudprovider is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudevent/models.SCloudprovider.
+type SCloudprovider struct {
+	apis.SEnabledStatusStandaloneResourceBase
+	apis.SProjectizedResourceBase
+	SyncStatus string `json:"sync_status"`
+	Provider   string `json:"provider"`
+	Brand      string `json:"brand"`
+}

pkg/apis/compute/zz_generated.model.go

@@ -116,7 +116,7 @@ type SCachedLoadbalancerCertificate struct {
 
 // SCachedimage is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SCachedimage.
 type SCachedimage struct {
-	apis.SStandaloneResourceBase
+	apis.SSharableVirtualResourceBase
 	apis.SExternalizedResourceBase
 	// 镜像大小单位: Byte
 	// example: 53687091200
@@ -520,9 +520,10 @@ type SDnsRecord struct {
 type SDnsRecordSet struct {
 	apis.SEnabledStatusStandaloneResourceBase
 	SDnsZoneResourceBase
-	DnsType  string `json:"dns_type"`
-	DnsValue string `json:"dns_value"`
-	TTL      int64  `json:"ttl"`
+	DnsType    string `json:"dns_type"`
+	DnsValue   string `json:"dns_value"`
+	TTL        int64  `json:"ttl"`
+	MxPriority int64  `json:"mx_priority"`
 }
 
 // SDnsRecordSetTrafficPolicy is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsRecordSetTrafficPolicy.
@@ -556,6 +557,7 @@ type SDnsZoneCache struct {
 	SDnsZoneResourceBase
 	// 归属云账号ID
 	CloudaccountId string `json:"cloudaccount_id"`
+	ProductType    string `json:"product_type"`
 }
 
 // SDnsZoneResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsZoneResourceBase.

pkg/apis/notify/zz_generated.model.go

@@ -79,6 +79,7 @@ type SSubContact struct {
 	ParentContactType string `json:"parent_contact_type"`
 	Enabled           *bool  `json:"enabled,omitempty"`
 	Verified          *bool  `json:"verified,omitempty"`
+	VerifiedNote      string `json:"verified_note"`
 }
 
 // STemplate is an autogenerated struct via yunion.io/x/onecloud/pkg/notify/models.STemplate.

pkg/cloudevent/models/cloudevents.go

@@ -27,10 +27,13 @@ import (
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/util/rbacutils"
+	"yunion.io/x/onecloud/pkg/util/stringutils2"
 )
 
 type SCloudeventManager struct {
 	db.SModelBaseManager
+	db.SProjectizedResourceBaseManager
 }
 
 var CloudeventManager *SCloudeventManager
@@ -49,6 +52,7 @@ func init() {
 
 type SCloudevent struct {
 	db.SModelBase
+	db.SProjectizedResourceBase
 
 	EventId      int64                `primary:"true" auto_increment:"true" list:"user"`
 	Name         string               `width:"128" charset:"utf8" nullable:"false" index:"true" list:"user"`
@@ -125,6 +129,67 @@ func (manager *SCloudeventManager) ListItemFilter(
 	return q, nil
 }
 
+func (self *SCloudevent) GetExtraDetails(
+	ctx context.Context,
+	userCred mcclient.TokenCredential,
+	query jsonutils.JSONObject,
+	isList bool,
+) (api.CloudeventDetails, error) {
+	return api.CloudeventDetails{}, nil
+}
+
+func (manager *SCloudeventManager) FetchCustomizeColumns(
+	ctx context.Context,
+	userCred mcclient.TokenCredential,
+	query jsonutils.JSONObject,
+	objs []interface{},
+	fields stringutils2.SSortedStrings,
+	isList bool,
+) []api.CloudeventDetails {
+	rows := make([]api.CloudeventDetails, len(objs))
+	base := manager.SModelBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
+	projRows := manager.SProjectizedResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
+	for i := range rows {
+		rows[i].ModelBaseDetails = base[i]
+		rows[i].ProjectizedResourceInfo = projRows[i]
+	}
+	return rows
+}
+
+func (manager *SCloudeventManager) ResourceScope() rbacutils.TRbacScope {
+	return rbacutils.ScopeProject
+}
+
+func (self *SCloudevent) GetOwnerId() mcclient.IIdentityProvider {
+	owner := db.SOwnerId{DomainId: self.DomainId, ProjectId: self.ProjectId}
+	return &owner
+}
+
+func (manager *SCloudeventManager) FilterByOwner(q *sqlchemy.SQuery, owner mcclient.IIdentityProvider, scope rbacutils.TRbacScope) *sqlchemy.SQuery {
+	return manager.SProjectizedResourceBaseManager.FilterByOwner(q, owner, scope)
+}
+
+func (manager *SCloudeventManager) FetchOwnerId(ctx context.Context, data jsonutils.JSONObject) (mcclient.IIdentityProvider, error) {
+	return manager.SProjectizedResourceBaseManager.FetchOwnerId(ctx, data)
+}
+
+func (manager *SCloudeventManager) ListItemExportKeys(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, keys stringutils2.SSortedStrings) (*sqlchemy.SQuery, error) {
+	return manager.SProjectizedResourceBaseManager.ListItemExportKeys(ctx, q, userCred, keys)
+}
+
+func (manager *SCloudeventManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
+	return manager.SProjectizedResourceBaseManager.QueryDistinctExtraField(q, field)
+}
+
+func (manager *SCloudeventManager) OrderByExtraFields(
+	ctx context.Context,
+	q *sqlchemy.SQuery,
+	userCred mcclient.TokenCredential,
+	query api.CloudeventListInput,
+) (*sqlchemy.SQuery, error) {
+	return manager.SProjectizedResourceBaseManager.OrderByExtraFields(ctx, q, userCred, query.ProjectizedResourceListInput)
+}
+
 func (manager *SCloudeventManager) SyncCloudevent(ctx context.Context, userCred mcclient.TokenCredential, cloudprovider *SCloudprovider, iEvents []cloudprovider.ICloudEvent) int {
 	count := 0
 	for _, iEvent := range iEvents {
@@ -142,6 +207,8 @@ func (manager *SCloudeventManager) SyncCloudevent(ctx context.Context, userCred
 			Brand:           cloudprovider.Brand,
 			CloudproviderId: cloudprovider.Id,
 		}
+		event.DomainId = cloudprovider.DomainId
+		event.ProjectId = cloudprovider.ProjectId
 		if len(event.Brand) == 0 {
 			event.Brand = event.Provider
 		}

pkg/cloudevent/models/cloudproviders.go

@@ -28,6 +28,7 @@ import (
 	"yunion.io/x/pkg/util/compare"
 	"yunion.io/x/pkg/util/timeutils"
 	"yunion.io/x/pkg/utils"
+	"yunion.io/x/sqlchemy"
 
 	proxyapi "yunion.io/x/onecloud/pkg/apis/cloudcommon/proxy"
 	api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -35,6 +36,7 @@ import (
 	"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
 	"yunion.io/x/onecloud/pkg/cloudevent/options"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
@@ -44,6 +46,7 @@ import (
 
 type SCloudproviderManager struct {
 	db.SEnabledStatusStandaloneResourceBaseManager
+	db.SProjectizedResourceBaseManager
 }
 
 var CloudproviderManager *SCloudproviderManager
@@ -62,6 +65,7 @@ func init() {
 
 type SCloudprovider struct {
 	db.SEnabledStatusStandaloneResourceBase
+	db.SProjectizedResourceBase
 
 	SyncStatus     string
 	LastSync       time.Time
@@ -111,6 +115,17 @@ func (manager *SCloudproviderManager) GetLocalCloudproviders() ([]SCloudprovider
 	return dbProviders, nil
 }
 
+func (manager *SCloudproviderManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
+	var err error
+
+	q, err = manager.SEnabledStatusStandaloneResourceBaseManager.QueryDistinctExtraField(q, field)
+	if err == nil {
+		return q, nil
+	}
+
+	return q, httperrors.ErrNotFound
+}
+
 func (manager *SCloudproviderManager) syncCloudproviders(ctx context.Context, userCred mcclient.TokenCredential) compare.SyncResult {
 	result := compare.SyncResult{}
 	providers, err := manager.GetRegionCloudproviders(ctx, userCred)
@@ -176,6 +191,8 @@ func (provider *SCloudprovider) syncWithRegionProvider(ctx context.Context, user
 		provider.Status = cloudprovider.Status
 		provider.Enabled = cloudprovider.Enabled
 		provider.Brand = cloudprovider.Brand
+		provider.ProjectId = cloudprovider.ProjectId
+		provider.DomainId = cloudprovider.DomainId
 		return nil
 	})
 	return err

pkg/mcclient/modules/mod_cloudevents.go

@@ -23,7 +23,7 @@ var (
 func init() {
 	Cloudevents = NewCloudeventManager("cloudevent", "cloudevents",
 		[]string{"Action", "Service", "Success",
-			"Resource_Type", "Cloudprovider_Id", "Manager", "Provider"},
+			"Resource_Type", "Cloudprovider_Id", "Manager", "Provider", "Domain", "Domain_Id"},
 		[]string{})
 
 	register(&Cloudevents)

scripts/codegen.py

@@ -134,6 +134,7 @@ class ModelAPI(FuncDispatcher):
         self.run_model("image")
         self.run_model("cloudid")
         self.run_model("notify")
+        self.run_model("cloudevent")
 
     def gen_monitor(self):
         self.run(pkg=["monitor", "models"], out=["monitor"])
@@ -180,6 +181,11 @@ class SwaggerCode(FuncDispatcher):
     def gen_notify(self):
         self.run("notify", pkg=["models"], out="notify")
 
+    def gen_cloudevent(self):
+        self.run("cloudevent", pkg=["models"], out="cloudevent")
+
+
+
 class SwaggerYAML(FuncDispatcher):
 
     def __init__(self, swagger_dir, out_dir):
@@ -212,6 +218,9 @@ class SwaggerYAML(FuncDispatcher):
     def gen_notify(self):
         self.run("notify")
 
+    def gen_cloudevent(self):
+        self.run("cloudevent")
+
 class SwaggerServe(object):
 
     def __init__(self, output_dir):