Merge pull request #972 from meshery/core-uuid-transition

Transition UUID type references to schemas core.Uuid

Author: yi-nuo426

models/events/build.go

@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/gofrs/uuid"
+	core "github.com/meshery/schemas/models/core"
 )
 
 type EventBuilder struct {
@@ -21,7 +22,7 @@ func NewEvent() *EventBuilder {
 	}
 }
 
-func (e *EventBuilder) ActedUpon(resource uuid.UUID) *EventBuilder {
+func (e *EventBuilder) ActedUpon(resource core.Uuid) *EventBuilder {
 	e.event.ActedUpon = resource
 	return e
 }
@@ -56,12 +57,12 @@ func (e *EventBuilder) WithStatus(status EventStatus) *EventBuilder {
 	return e
 }
 
-func (e *EventBuilder) FromUser(id uuid.UUID) *EventBuilder {
+func (e *EventBuilder) FromUser(id core.Uuid) *EventBuilder {
 	e.event.UserID = &id
 	return e
 }
 
-func (e *EventBuilder) FromSystem(id uuid.UUID) *EventBuilder {
+func (e *EventBuilder) FromSystem(id core.Uuid) *EventBuilder {
 	e.event.SystemID = id
 	return e
 }

models/events/constants.go

@@ -3,17 +3,17 @@ package events
 import (
 	"fmt"
 
-	"github.com/gofrs/uuid"
+	core "github.com/meshery/schemas/models/core"
 )
 
-func DesignDownloadEvent(designID uuid.UUID, designName string, userID uuid.UUID, systemID uuid.UUID) *Event {
+func DesignDownloadEvent(designID core.Uuid, designName string, userID core.Uuid, systemID core.Uuid) *Event {
 
 	event := NewEvent().ActedUpon(designID).FromSystem(systemID).FromUser(userID).WithCategory("pattern").WithAction("download").
 		WithSeverity(Informational).WithDescription(fmt.Sprintf("Downloaded \"%s\" design", designName)).Build()
 	return event
 }
 
-func DesignViewEvent(designID uuid.UUID, designName string, userID uuid.UUID, systemID uuid.UUID) *Event {
+func DesignViewEvent(designID core.Uuid, designName string, userID core.Uuid, systemID core.Uuid) *Event {
 
 	event := NewEvent().ActedUpon(designID).FromSystem(systemID).FromUser(userID).WithCategory("pattern").WithAction("view").WithSeverity(Informational).WithDescription(fmt.Sprintf("Accessed \"%s\" pattern.", designName)).Build()
 	return event

models/events/events.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/meshery/meshkit/database"
 	"github.com/meshery/meshkit/utils"
+	core "github.com/meshery/schemas/models/core"
 	v1beta1 "github.com/meshery/schemas/models/v1beta1/model"
 	"gorm.io/gorm/clause"
 
@@ -16,22 +17,22 @@ import (
 
 // swagger:response PolicyDefinition
 type PolicyDefinition struct {
-	ID         uuid.UUID               `json:"-"`
+	ID         core.Uuid               `json:"-"`
 	Kind       string                  `json:"kind,omitempty" yaml:"kind"`
 	Version    string                  `json:"version,omitempty" yaml:"version"`
-	ModelID    uuid.UUID               `json:"-" gorm:"column:modelID"`
+	ModelID    core.Uuid               `json:"-" gorm:"column:modelID"`
 	Model      v1beta1.ModelDefinition `json:"model"`
 	SubType    string                  `json:"subType" yaml:"subType"`
 	Expression map[string]interface{}  `json:"expression" yaml:"expression" gorm:"type:bytes;serializer:json"`
 	CreatedAt  time.Time               `json:"-"`
 	UpdatedAt  time.Time               `json:"-"`
 }
 
-func (p PolicyDefinition) GetID() uuid.UUID {
+func (p PolicyDefinition) GetID() core.Uuid {
 	return p.ID
 }
 
-func (p *PolicyDefinition) GenerateID() (uuid.UUID, error) {
+func (p *PolicyDefinition) GenerateID() (core.Uuid, error) {
 	return uuid.NewV4()
 }
 
@@ -43,17 +44,17 @@ func (p *PolicyDefinition) GetEntityDetail() string {
 	return fmt.Sprintf("type: %s, definition version: %s, name: %s, model: %s, version: %s", p.Type(), p.Version, p.Kind, p.Model.Name, p.Model.Version)
 }
 
-func (p *PolicyDefinition) Create(db *database.Handler, hostID uuid.UUID) (uuid.UUID, error) {
+func (p *PolicyDefinition) Create(db *database.Handler, hostID core.Uuid) (core.Uuid, error) {
 	p.ID, _ = p.GenerateID()
 
 	mid, err := p.Model.Create(db, hostID)
 	if err != nil {
-		return uuid.UUID{}, err
+		return core.Uuid{}, err
 	}
 	p.ModelID = mid
 	err = db.Omit(clause.Associations).Create(&p).Error
 	if err != nil {
-		return uuid.UUID{}, err
+		return core.Uuid{}, err
 	}
 	return p.ID, nil
 }

models/meshmodel/core/v1beta1/policy.go

@@ -1,8 +1,8 @@
 package entity
 
 import (
-	"github.com/gofrs/uuid"
 	"github.com/meshery/meshkit/database"
+	core "github.com/meshery/schemas/models/core"
 )
 
 type EntityType string
@@ -27,7 +27,7 @@ type Entity interface {
 	// ComponentDefinitions and PolicyDefinitions are examples of entities
 	Type() EntityType
 	GetEntityDetail() string
-	GenerateID() (uuid.UUID, error)
-	GetID() uuid.UUID
-	Create(db *database.Handler, hostID uuid.UUID) (entityID uuid.UUID, err error)
+	GenerateID() (core.Uuid, error)
+	GetID() core.Uuid
+	Create(db *database.Handler, hostID core.Uuid) (entityID core.Uuid, err error)
 }

models/meshmodel/entity/types.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/gofrs/uuid"
 	"github.com/meshery/meshkit/database"
+	core "github.com/meshery/schemas/models/core"
 	models "github.com/meshery/meshkit/models/meshmodel/core/v1beta1"
 	"github.com/meshery/meshkit/models/meshmodel/entity"
 	"github.com/meshery/schemas/models/v1alpha3/relationship"
@@ -70,9 +71,9 @@ func (c *RegistryEntityCache) Set(f entity.Filter, value EntityCacheValue) {
 }
 
 type Registry struct {
-	ID           uuid.UUID
-	RegistrantID uuid.UUID
-	Entity       uuid.UUID
+	ID           core.Uuid
+	RegistrantID core.Uuid
+	Entity       core.Uuid
 	Type         entity.EntityType
 	CreatedAt    time.Time
 	UpdatedAt    time.Time