Merge pull request #369 from zexi/project-registry

feat(kubeserver): make container_registry to VirtualResource
yunionio · May 6, 2024 · f136664 · f136664
2 parents 1a511a4 + 21c4e21
commit f136664
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pkg/kubeserver/api/container_registry.go b/pkg/kubeserver/api/container_registry.go
@@ -12,7 +12,7 @@ const (
 )
 
 type ContainerRegistryListInput struct {
-	apis.StatusInfrasResourceBaseListInput
+	apis.VirtualResourceListInput
 
 	Type string `json:"type"`
 	Url  string `json:"url"`
@@ -33,7 +33,7 @@ type ContainerRegistryConfig struct {
 }
 
 type ContainerRegistryCreateInput struct {
-	apis.StatusInfrasResourceBaseCreateInput
+	apis.VirtualResourceCreateInput
 
 	// Repo type
 	// required: true

diff --git a/pkg/kubeserver/models/container_registries.go b/pkg/kubeserver/models/container_registries.go
@@ -31,7 +31,7 @@ import (
 )
 
 type SContainerRegistryManager struct {
-	db.SStatusInfrasResourceBaseManager
+	db.SVirtualResourceBaseManager
 }
 
 var (
@@ -42,7 +42,7 @@ var (
 func GetContainerRegistryManager() *SContainerRegistryManager {
 	if containerRegistryManager == nil {
 		containerRegistryManager = &SContainerRegistryManager{
-			SStatusInfrasResourceBaseManager: db.NewStatusInfrasResourceBaseManager(SContainerRegistry{}, "container_registries_tbl", "container_registry", "container_registries"),
+			SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager(SContainerRegistry{}, "container_registries_tbl", "container_registry", "container_registries"),
 		}
 		containerRegistryManager.SetVirtualObject(containerRegistryManager)
 	}
@@ -54,7 +54,7 @@ func init() {
 }
 
 type SContainerRegistry struct {
-	db.SStatusInfrasResourceBase
+	db.SVirtualResourceBase
 
 	Url    string               `width:"256" charset:"ascii" nullable:"false" create:"required" update:"user" list:"user"`
 	Type   string               `charset:"ascii" width:"128" create:"required" nullable:"true" list:"user"`
@@ -68,7 +68,7 @@ func (man *SContainerRegistryManager) AddDispatcher(prefix string, app *appsrv.A
 }
 
 func (man *SContainerRegistryManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, input *api.ContainerRegistryListInput) (*sqlchemy.SQuery, error) {
-	q, err := man.SStatusInfrasResourceBaseManager.ListItemFilter(ctx, q, userCred, input.StatusInfrasResourceBaseListInput)
+	q, err := man.SVirtualResourceBaseManager.ListItemFilter(ctx, q, userCred, input.VirtualResourceListInput)
 	if err != nil {
 		return nil, err
 	}
@@ -86,11 +86,11 @@ func (man *SContainerRegistryManager) GetDriver(rType api.ContainerRegistryType)
 }
 
 func (man *SContainerRegistryManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *api.ContainerRegistryCreateInput) (*api.ContainerRegistryCreateInput, error) {
-	shareInput, err := man.SStatusInfrasResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data.StatusInfrasResourceBaseCreateInput)
+	shareInput, err := man.SVirtualResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data.VirtualResourceCreateInput)
 	if err != nil {
 		return nil, err
 	}
-	data.StatusInfrasResourceBaseCreateInput = shareInput
+	data.VirtualResourceCreateInput = shareInput
 	if data.Url == "" {
 		return nil, httperrors.NewInputParameterError("Missing repo url")
 	}
@@ -186,7 +186,7 @@ func (r *SContainerRegistry) GetDetailsImageTags(ctx context.Context, userCred m
 }
 
 func (m *SContainerRegistryManager) CustomizeHandlerInfo(info *appsrv.SHandlerInfo) {
-	m.SStatusInfrasResourceBaseManager.CustomizeHandlerInfo(info)
+	m.SVirtualResourceBaseManager.CustomizeHandlerInfo(info)
 
 	switch info.GetName(nil) {
 	case "perform_action", "get_specific", "get_property", "get_details":