Margo support in maestro CLI

.github/version/versions.txt

@@ -1 +1 @@
-0.48.34
+0.48-margo.34

.gitmodules

@@ -1,10 +1,10 @@
-[submodule "landing/public"]
-	path = landing/public
-	url = https://github.com/eclipse-symphony/symphony-website.git
-	branch = main
 [submodule "docs-site/public"]
 	path = docs-site/public
 	url = https://github.com/eclipse-symphony/docs.git
 [submodule "docs-site/themes/docsy"]
 	path = docs-site/themes/docsy
-	url = https://github.com/google/docsy.git
+	url = https://github.com/google/docsy.git
+[submodule "landing/public"]
+	path = landing/public
+	url = https://github.com/eclipse-symphony/symphony-website.git
+	branch = main

cli/cmd/margo.go

@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * SPDX-License-Identifier: MIT
+ */
+
+package cmd
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
+	"github.com/eclipse-symphony/symphony/cli/config"
+	"github.com/eclipse-symphony/symphony/cli/utils"
+	"github.com/eclipse-symphony/symphony/hydra"
+	"github.com/eclipse-symphony/symphony/hydra/margo/v0"
+	"github.com/spf13/cobra"
+)
+
+var (
+	appPackagePath string
+)
+
+var MargoCmd = &cobra.Command{
+	Use:   "margo",
+	Short: "Margo commands",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("\n%sPlease use either 'margo run' or 'margo list'%s\n\n", utils.ColorRed(), utils.ColorReset())
+	},
+}
+
+var MargoRunCmd = &cobra.Command{
+	Use:   "run",
+	Short: "run a Margo application package",
+	Run: func(cmd *cobra.Command, args []string) {
+		//check context
+		c := config.GetMaestroConfig(configFile)
+		ctx := c.DefaultContext
+		if configContext != "" {
+			ctx = configContext
+		}
+
+		if ctx == "" {
+			ctx = "default"
+		}
+		//check target
+		targets, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "targets", "", "", target)
+		if err != nil && targets != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(targets) == 0 {
+			fmt.Printf("\n%s  Target '%s' is not found%s\n\n", utils.ColorRed(), target, utils.ColorReset())
+			return
+		}
+		reader := margo.MargoSolutionReader{}
+		solution, err := reader.Parse(hydra.AppPackageDescription{
+			Path:    appPackagePath,
+			Type:    "margo",
+			Version: "v0",
+		})
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		solutionContainerName := solution.ObjectMeta.Name
+
+		solutionContainers, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "solutioncontainers", "", "", solutionContainerName)
+		if err != nil && solutionContainers != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(solutionContainers) != 0 {
+			fmt.Printf("\n%s  Solution '%s' already exists%s\n\n", utils.ColorRed(), solutionContainerName, utils.ColorReset())
+			return
+		}
+
+		//create solution container
+		solutionContainer := model.SolutionContainerState{
+			ObjectMeta: model.ObjectMeta{
+				Name: solutionContainerName,
+			},
+			Spec: &model.SolutionContainerSpec{},
+		}
+		solutionContainerData, err := json.Marshal(solutionContainer)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		err = utils.Upsert(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "solution-containers", solutionContainerName, solutionContainerData)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		solutionName := solutionContainerName + "-v-v1"
+		solution.ObjectMeta.Name = solutionName
+		solution.Spec.RootResource = solutionContainerName
+
+		//create solution
+		solutionData, err := json.Marshal(solution)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		err = utils.Upsert(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "solutions", solutionName, solutionData)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+
+		instanceName := solutionName + "-instance"
+		//check instance
+		instances, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "instances", "", "", instanceName)
+		if err != nil && instances != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(instances) > 0 {
+			fmt.Printf("\n%s  Solution instance '%s' already exists%s\n\n", utils.ColorRed(), instanceName, utils.ColorReset())
+			return
+		}
+		//create instance
+		instance := Instance{
+			Metadata: model.ObjectMeta{
+				Name: instanceName,
+			},
+			Spec: model.InstanceSpec{
+				Solution: solutionContainerName + ":v1",
+				Target: model.TargetSelector{
+					Name: target,
+				},
+			},
+		}
+		instanceData, err := json.Marshal(instance)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		err = utils.Upsert(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "instances", instanceName, instanceData)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		fmt.Printf("\n%s  Solution instance created successfully%s\n\n", utils.ColorGreen(), utils.ColorReset())
+	},
+}
+
+func init() {
+	MargoRunCmd.Flags().StringVarP(&appPackagePath, "package", "p", "", "Margo application package definition path")
+	MargoRunCmd.Flags().StringVarP(&target, "target", "t", "", "Target to run the solution on")
+	MargoRunCmd.MarkFlagRequired("package")
+	MargoRunCmd.MarkFlagRequired("target")
+	MargoCmd.AddCommand(MargoRunCmd)
+	RootCmd.AddCommand(MargoCmd)
+}

cli/cmd/run.go

@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * SPDX-License-Identifier: MIT
+ */
+
+package cmd
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/eclipse-symphony/symphony/api/pkg/apis/v1alpha1/model"
+	"github.com/eclipse-symphony/symphony/cli/config"
+	"github.com/eclipse-symphony/symphony/cli/utils"
+	"github.com/spf13/cobra"
+)
+
+var (
+	solutionPath string
+	target       string
+	instanceName string
+)
+
+var RunCmd = &cobra.Command{
+	Use:   "run",
+	Short: "run a Margo application package",
+	Run: func(cmd *cobra.Command, args []string) {
+		//check context
+		c := config.GetMaestroConfig(configFile)
+		ctx := c.DefaultContext
+		if configContext != "" {
+			ctx = configContext
+		}
+
+		if ctx == "" {
+			ctx = "default"
+		}
+		//check target
+		targets, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "targets", "", "", target)
+		if err != nil && targets != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(targets) == 0 {
+			fmt.Printf("\n%s  Target '%s' is not found%s\n\n", utils.ColorRed(), target, utils.ColorReset())
+			return
+		}
+		//check instance
+		instances, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "instances", "", "", instanceName)
+		if err != nil && instances != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(instances) > 0 {
+			fmt.Printf("\n%s  Solution instance '%s' already exists%s\n\n", utils.ColorRed(), instanceName, utils.ColorReset())
+			return
+		}
+		//check solution
+		solutionData, err := utils.GetArtifactFile(solutionPath)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		var solution Solution
+		err = json.Unmarshal(solutionData, &solution)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		solutionName := solution.Metadata.Name
+		solutions, err := utils.Get(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "solutions", "", "", solutionName)
+		if err != nil && solutions != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		if len(solutions) != 0 {
+			fmt.Printf("\n%s  Solution '%s' already exists%s\n\n", utils.ColorRed(), solutionName, utils.ColorReset())
+			return
+		}
+		//create solution
+		err = utils.Upsert(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "solutions", solutionName, solutionData)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		//create instance
+		instance := Instance{
+			Metadata: model.ObjectMeta{
+				Name: instanceName,
+			},
+			Spec: model.InstanceSpec{
+				Solution: solutionName,
+				Target: model.TargetSelector{
+					Name: target,
+				},
+			},
+		}
+		instanceData, err := json.Marshal(instance)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		err = utils.Upsert(c.Contexts[ctx].Url, c.Contexts[ctx].User, c.Contexts[ctx].Secret, "instances", instanceName, instanceData)
+		if err != nil {
+			fmt.Printf("\n%s  %s%s\n\n", utils.ColorRed(), err.Error(), utils.ColorReset())
+			return
+		}
+		fmt.Printf("\n%s  Solution instance created successfully%s\n\n", utils.ColorGreen(), utils.ColorReset())
+	},
+}
+
+func init() {
+	RunCmd.Flags().StringVarP(&solutionPath, "solution", "s", "", "Symphony solution file path")
+	RunCmd.Flags().StringVarP(&target, "target", "t", "", "Target to run the solution on")
+	RunCmd.Flags().StringVarP(&instanceName, "name", "n", "", "Name of the solution instance")
+	RunCmd.Flags().StringVarP(&configFile, "config", "c", "", "Maestro CLI config file")
+	RunCmd.Flags().StringVarP(&configContext, "context", "", "", "Maestro CLI configuration context")
+	RunCmd.MarkFlagRequired("solution")
+	RunCmd.MarkFlagRequired("target")
+	RunCmd.MarkFlagRequired("name")
+	RootCmd.AddCommand(RunCmd)
+}

cli/cmd/samples.go

@@ -150,7 +150,7 @@ var DescribeCmd = &cobra.Command{
 	},
 }
 
-var RunCmd = &cobra.Command{
+var SampleRunCmd = &cobra.Command{
 	Use:   "run",
 	Short: "run a Symphony sample",
 	Run: func(cmd *cobra.Command, args []string) {
@@ -339,14 +339,14 @@ var RemoveCmd = &cobra.Command{
 }
 
 func init() {
-	RunCmd.Flags().StringArrayVarP(&setSwitches, "set", "s", nil, "set sample parameter as key=value")
-	RunCmd.Flags().StringVarP(&sampleConfigFile, "config", "c", "", "Maestro CLI config file")
-	RunCmd.Flags().StringVarP(&sampleConfigContext, "context", "", "", "Maestro CLI configuration context")
+	SampleRunCmd.Flags().StringArrayVarP(&setSwitches, "set", "s", nil, "set sample parameter as key=value")
+	SampleRunCmd.Flags().StringVarP(&sampleConfigFile, "config", "c", "", "Maestro CLI config file")
+	SampleRunCmd.Flags().StringVarP(&sampleConfigContext, "context", "", "", "Maestro CLI configuration context")
 	RemoveCmd.Flags().StringVarP(&sampleConfigFile, "config", "c", "", "Maestro CLI config file")
 	RemoveCmd.Flags().StringVarP(&sampleConfigContext, "context", "", "", "Maestro CLI configuration context")
 	DescribeCmd.Flags().StringVarP(&sampleConfigFile, "config", "c", "", "Maestro CLI config file")
 	DescribeCmd.Flags().StringVarP(&sampleConfigContext, "context", "", "", "Maestro CLI configuration context")
-	SamplesCmd.AddCommand(RunCmd)
+	SamplesCmd.AddCommand(SampleRunCmd)
 	SamplesCmd.AddCommand(RemoveCmd)
 	SamplesCmd.AddCommand(DescribeCmd)
 	SamplesCmd.AddCommand(ListCmd)

cli/go.mod

@@ -8,6 +8,8 @@ replace github.com/eclipse-symphony/symphony/api => ../api
 
 replace github.com/eclipse-symphony/symphony/coa => ../coa
 
+replace github.com/eclipse-symphony/symphony/hydra => ../hydra
+
 require github.com/spf13/cobra v1.8.1
 
 require (
@@ -48,6 +50,7 @@ require (
 
 require (
 	github.com/eclipse-symphony/symphony/api v0.0.0
+	github.com/eclipse-symphony/symphony/hydra v0.0.0
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jedib0t/go-pretty/v6 v6.4.2
 	github.com/mattn/go-runewidth v0.0.15 // indirect

cli/utils/api.go

@@ -13,6 +13,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 
 	"sigs.k8s.io/yaml"
 )
@@ -100,6 +101,25 @@ func yamlToJson(payload []byte) ([]byte, error) {
 	return json.Marshal(o)
 }
 
+func GetArtifactFile(filePath string) ([]byte, error) {
+	data, err := os.ReadFile(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	// Try to unmarshal as JSON first
+	var jsonObj interface{}
+	if err = json.Unmarshal(data, &jsonObj); err == nil {
+		return data, nil // It's already JSON, return it
+	}
+
+	// If it's not JSON, try to unmarshal as YAML
+	if err = yaml.Unmarshal(data, &jsonObj); err == nil {
+		return yamlToJson(data) // Convert YAML to JSON and return it
+	}
+
+	return nil, errors.New("file is neither valid JSON nor valid YAML")
+}
 func Get(url string, username string, password string, objType string, path string, docType string, objName string) ([]interface{}, error) {
 	token, err := Login(url, username, password)
 	if err != nil {