fix: update import paths for meshmodel and component definitions to u…

…se v1beta1

Signed-off-by: devhindo <[email protected]>

adapter/meshmodel.go

@@ -11,6 +11,7 @@
 	backoff "github.com/cenkalti/backoff/v4"
 	"github.com/layer5io/meshkit/models/meshmodel/entity"
 	"github.com/meshery/schemas/models/v1beta1/component"
+	"github.com/layer5io/meshkit/models/meshmodel/core/v1beta1"
 
 	"github.com/layer5io/meshkit/models/meshmodel/registry"
 )
@@ -20,7 +21,7 @@
 	// EntityDefinitionPath holds the path for Entity Definition file
 	EntityDefintionPath string
 
 	Type types.CapabilityType
 	// Host is the address of the gRPC host capable of processing the request
 	Host string
 	Port int
@@ -56,7 +57,7 @@
 		if err != nil {
 			return ErrOpenOAMDefintionFile(err)
 		}
 		mrd.Host = registry.Host{
 			Hostname: dpath.Host,
 			Port:     dpath.Port,
 			Metadata: ctxID,

adapter/oam.go

@@ -15,6 +15,7 @@
 	"github.com/layer5io/meshkit/models/oam/core/v1alpha1"
 	"github.com/layer5io/meshkit/utils"
 	"github.com/layer5io/meshkit/utils/manifests"
+	"github.com/meshery/schemas/models/v1beta1/component"
 )
 
 var (
@@ -91,7 +92,7 @@
 	if err != nil {
 		return nil, err
 	}
 	var c meshmodel.ComponentDefinition
 	c.Metadata = make(map[string]interface{})
 	metaname := strings.Split(manifests.FormatToReadableString(oamdef.ObjectMeta.Name), ".")
 	var displayname string
@@ -99,7 +100,7 @@
 		displayname = metaname[0]
 	}
 	c.DisplayName = displayname
 	c.Model.Category = meshmodel.Category{
 		Name: mcfg.Category,
 	}
 	if mcfg.CategoryMetadata != nil {
@@ -120,7 +121,7 @@
 	c.Model.DisplayName = manifests.FormatToReadableString(c.Model.Name)
 	c.Model.Name = strings.ToLower(c.Model.Name)
 	c.Model.Metadata = c.Metadata
 	c.Format = meshmodel.JSON
 	c.Schema = schema
 	byt, err := json.Marshal(c)
 	if err != nil {
@@ -181,7 +182,7 @@
 	return nil
 }
 func modifyMeshmodelVersionInDefinition(old []byte, newversion string) (new []byte, err error) {
-	var def meshmodel.ComponentDefinition
+	var def component.ComponentDefinition
 	err = json.Unmarshal(old, &def)
 	if err != nil {
 		return