Merge pull request #210 from gr455/meshmodel-components

Add Meshmodel support

Author: Revolyssup

build/config.go

@@ -1,6 +1,9 @@
 package build
 
 import (
+	"encoding/json"
+	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -16,12 +19,21 @@ import (
 var DefaultGenerationMethod string
 var LatestVersion string
 var WorkloadPath string
+var MeshModelPath string
 var CRDnames []string
 var OverrideURL string
 var AllVersions []string
 
 const Component = "OSM"
 
+var meshmodelmetadata = make(map[string]interface{})
+
+var MeshModelConfig = adapter.MeshModelConfig{ //Move to build/config.go
+	Category:    "Orchestration & Management",
+	SubCategory: "Service Mesh",
+	Metadata:    meshmodelmetadata,
+}
+
 // NewConfig creates the configuration for creating components
 func NewConfig(version string) manifests.Config {
 	return manifests.Config{
@@ -48,7 +60,18 @@ func GetDefaultURL(crd string) string {
 }
 func init() {
 	wd, _ := os.Getwd()
+	f, _ := os.Open("./build/meshmodel_metadata.json")
+	defer func() {
+		err := f.Close()
+		if err != nil {
+			fmt.Println(err.Error())
+		}
+	}()
+	byt, _ := io.ReadAll(f)
+
+	_ = json.Unmarshal(byt, &meshmodelmetadata)
 	WorkloadPath = filepath.Join(wd, "templates", "oam", "workloads")
+	MeshModelPath = filepath.Join(wd, "templates", "meshmodel", "components")
 	AllVersions, _ = utils.GetLatestReleaseTagsSorted("openservicemesh", "osm")
 	if len(AllVersions) == 0 {
 		return

build/meshmodel_component.json

@@ -10,8 +10,8 @@ replace (
 
 require (
 	github.com/google/uuid v1.3.0
-	github.com/layer5io/meshery-adapter-library v0.6.0
-	github.com/layer5io/meshkit v0.6.15
+	github.com/layer5io/meshery-adapter-library v0.6.3
+	github.com/layer5io/meshkit v0.6.16
 	github.com/layer5io/service-mesh-performance v0.3.4
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/apimachinery v0.25.3

go.mod

@@ -628,10 +628,12 @@ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6Fm
 github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f/go.mod h1:UmrVd7x+bNVKrpmKgTtfRiTKHZeNPcMjQproJ0vGwhE=
 github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34 h1:QaViadDOBCMDUwYx78kfRvHMkzRVnh/GOhm3s2gxoP4=
 github.com/layer5io/learn-layer5/smi-conformance v0.0.0-20210317075357-06b4f88b3e34/go.mod h1:BQPLwdJt7v7y0fXIejI4whR9zMyX07Wjt5xrbgEmHLw=
-github.com/layer5io/meshery-adapter-library v0.6.0 h1:Tg3/e7qqVDOWtj1ZHEq8/dvQ/MG7Ebg5Q3dS6qvA0Is=
-github.com/layer5io/meshery-adapter-library v0.6.0/go.mod h1:uEAy+N9/50nnmH3kdTU+J1ZaKAn5ajL4hSHyQYHeasM=
-github.com/layer5io/meshkit v0.6.15 h1:W6eaIPZrccYjtewjQHfZS9xKZrIGsv5dX3IZfj5Zr/k=
-github.com/layer5io/meshkit v0.6.15/go.mod h1:9ZXmiP0dxRCNlVYgchrOnfFcNrdHVXuayiuN8RRTQ68=
+github.com/layer5io/meshery-adapter-library v0.6.3 h1:5tsbgrB1q84X2rM1TsRVe3pSBZ8kztjo4lPsHuPBe/Y=
+github.com/layer5io/meshery-adapter-library v0.6.3/go.mod h1:x9/295iLiWab88uOwjgyZbJTX8aqkxfUlVZhqQKabew=
+github.com/layer5io/meshkit v0.6.11 h1:VS2k34BALzYzHbsikyqii7J/v9bDKC4QdfHjeBgocnU=
+github.com/layer5io/meshkit v0.6.11/go.mod h1:9ZXmiP0dxRCNlVYgchrOnfFcNrdHVXuayiuN8RRTQ68=
+github.com/layer5io/meshkit v0.6.16 h1:bU9Q4Fl31yPqPjNJkf91wT7bM5LtLh+7P0eQix9f22I=
+github.com/layer5io/meshkit v0.6.16/go.mod h1:9ZXmiP0dxRCNlVYgchrOnfFcNrdHVXuayiuN8RRTQ68=
 github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=
 github.com/layer5io/service-mesh-performance v0.3.4 h1:aw/elsx0wkry7SyiQRIj31wW7TPCP4YfhINdNOLXVg8=
 github.com/layer5io/service-mesh-performance v0.3.4/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=

go.sum

@@ -22,6 +22,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/layer5io/meshery-adapter-library/adapter"
 	"github.com/layer5io/meshery-adapter-library/api/grpc"
 	"github.com/layer5io/meshery-osm/build"
@@ -38,6 +39,7 @@ var (
 	serviceName = "osm-adapter"
 	version     = "edge"
 	gitsha      = "none"
+	instanceID  = uuid.NewString()
 )
 
 func main() {
@@ -139,6 +141,11 @@ func registerCapabilities(port string, log logger.Handler) {
 	if err := oam.RegisterTraits(mesheryServerAddress(), serviceAddress()+":"+port); err != nil {
 		log.Info(err.Error())
 	}
+
+	// Register meshmodel components
+	if err := oam.RegisterMeshModelComponents(instanceID, mesheryServerAddress(), serviceAddress(), port); err != nil {
+		log.Info(err.Error())
+	}
 }
 
 func registerDynamicCapabilities(port string, log logger.Handler) {
@@ -174,11 +181,13 @@ func registerWorkloads(port string, log logger.Handler) {
 	for _, crd := range build.CRDnames {
 		log.Info("Generating components for ", crd)
 		if err := adapter.CreateComponents(adapter.StaticCompConfig{
-			URL:     build.GetDefaultURL(crd),
-			Method:  gm,
-			Path:    build.WorkloadPath,
-			DirName: version,
-			Config:  build.NewConfig(version),
+			URL:             build.GetDefaultURL(crd),
+			Method:          gm,
+			OAMPath:         build.WorkloadPath,
+			MeshModelPath:   build.MeshModelPath,
+			MeshModelConfig: build.MeshModelConfig,
+			DirName:         version,
+			Config:          build.NewConfig(version),
 		}); err != nil {
 			log.Error(err)
 			return

main.go

@@ -4,29 +4,59 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/layer5io/meshery-adapter-library/adapter"
 	"github.com/layer5io/meshery-osm/internal/config"
+	"github.com/layer5io/meshkit/models/meshmodel/core/types"
 )
 
 var (
 	basePath, _ = os.Getwd()
 	//WorkloadPath will be used by both static and component generation
-	WorkloadPath = filepath.Join(basePath, "templates", "oam", "workloads")
-	traitPath    = filepath.Join(basePath, "templates", "oam", "traits")
+	WorkloadPath        = filepath.Join(basePath, "templates", "oam", "workloads")
+	MeshmodelComponents = filepath.Join(basePath, "templates", "meshmodel", "components")
+	traitPath           = filepath.Join(basePath, "templates", "oam", "traits")
 )
 
 // AvailableVersions denote the component versions available statically
 var AvailableVersions = map[string]bool{}
 var pathSets []schemaDefinitionPathSet
+var availableVersionGlobalMutex sync.Mutex
 
 type schemaDefinitionPathSet struct {
 	oamDefinitionPath string
 	jsonSchemaPath    string
 	name              string
 }
 
+type meshmodelDefinitionPathSet struct {
+	meshmodelDefinitionPath string
+}
+
+func RegisterMeshModelComponents(uuid, runtime, host, port string) error {
+	meshmodelRDP := []adapter.MeshModelRegistrantDefinitionPath{}
+	pathSets, err := loadMeshmodelComponents(MeshmodelComponents)
+	if err != nil {
+		return err
+	}
+	portint, _ := strconv.Atoi(port)
+	for _, pathSet := range pathSets {
+		meshmodelRDP = append(meshmodelRDP, adapter.MeshModelRegistrantDefinitionPath{
+			EntityDefintionPath: pathSet.meshmodelDefinitionPath,
+			Host:                host,
+			Port:                portint,
+			Type:                types.ComponentDefinition,
+		})
+	}
+
+	return adapter.
+		NewMeshModelRegistrant(meshmodelRDP, fmt.Sprintf("%s/api/meshmodel/components/register", runtime)).
+		Register(uuid)
+}
+
 // RegisterWorkloads will register all of the workload definitions
 // present in the path oam/workloads
 //
@@ -86,6 +116,31 @@ func RegisterTraits(runtime, host string) error {
 		Register()
 }
 
+func loadMeshmodelComponents(basepath string) ([]meshmodelDefinitionPathSet, error) {
+	res := []meshmodelDefinitionPathSet{}
+	if err := filepath.Walk(basepath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if info.IsDir() {
+			return nil
+		}
+
+		res = append(res, meshmodelDefinitionPathSet{
+			meshmodelDefinitionPath: path,
+		})
+		availableVersionGlobalMutex.Lock()
+		AvailableVersions[filepath.Base(filepath.Dir(path))] = true // Getting available versions already existing on file system
+		availableVersionGlobalMutex.Unlock()
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
 func load(basePath string) ([]schemaDefinitionPathSet, error) {
 	res := []schemaDefinitionPathSet{}
 
@@ -108,7 +163,9 @@ func load(basePath string) ([]schemaDefinitionPathSet, error) {
 				jsonSchemaPath:    fmt.Sprintf("%s.meshery.layer5io.schema.json", nameWithPath),
 				name:              filepath.Base(nameWithPath),
 			})
+			availableVersionGlobalMutex.Lock()
 			AvailableVersions[filepath.Base(filepath.Dir(path))] = true
+			availableVersionGlobalMutex.Unlock()
 		}
 
 		return nil