fix mon_folder variable not used and disable cgo

Took 51 minutes
OpenSLO · Mar 27, 2023 · a520a94 · a520a94
1 parent 28b7cc1
commit a520a94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/libs/gen.go b/libs/gen.go
@@ -87,7 +87,8 @@ func GenTerraform(slosMv map[string]*SLOMultiVerse, c GenConf) (string, error) {
 		panic(err)
 	}
 
-	makeOSLODepGraph(slosMv, c)
+	//to be moved to conditional compilation later
+	//graph.MakeOSLODepGraph(slosMv, c)
 
 	return genTerraformForAlpha(slosAlpha, c)
 }
@@ -275,7 +276,7 @@ func SetupOutDir(c GenConf) error {
 			{Path: filepath.Join(c.OutDir, ViewsFolder), Vars: nil},
 			{Path: filepath.Join(c.OutDir, MonitorsFolder), Vars: []string{VarNameMonRootFolder}},
 			{Path: filepath.Join(c.OutDir, DashboardsFolder), Vars: []string{VarNameDashRootFolder}},
-			{Path: filepath.Join(c.OutDir, NativeSLOFolder), Vars: []string{VarNameNativeSLORootFolder}},
+			{Path: filepath.Join(c.OutDir, NativeSLOFolder), Vars: []string{VarNameNativeSLORootFolder, VarNameSLOMonitorRootFolder}},
 		}
 	}
 

diff --git a/libs/graph.go → libs/graph/graph.go b/libs/graph.go → libs/graph/graph.go
@@ -1,32 +1,33 @@
-package libs
+package graph
 
 import (
+	"github.com/OpenSLO/slogen/libs"
 	"github.com/goccy/go-graphviz/cgraph"
 
 	"github.com/goccy/go-graphviz"
 )
 
-func makeOSLODepGraph(confs map[string]*SLOMultiVerse, c GenConf) *graphviz.Graphviz {
+func MakeOSLODepGraph(confs map[string]*libs.SLOMultiVerse, c libs.GenConf) *graphviz.Graphviz {
 	g := graphviz.New()
 	graph, err := g.Graph()
 	if err != nil {
-		log.Fatal(err)
+		libs.Log().Fatal(err)
 	}
 	defer func() {
 		if err := graph.Close(); err != nil {
-			log.Fatal(err)
+			libs.Log().Fatal(err)
 		}
 		g.Close()
 	}()
 
 	err = createNodes(graph, confs)
 	if err != nil {
-		log.Errorw("error generating slo graph nodes", "err", err)
+		libs.Log().Errorw("error generating slo graph nodes", "err", err)
 	}
 
 	err = createEdges(graph, confs)
 	if err != nil {
-		log.Errorw("error generating slo graph edges", "err", err)
+		libs.Log().Errorw("error generating slo graph edges", "err", err)
 	}
 
 	filePath := c.OutDir + "/" + "slo-dep-graph.png"
@@ -36,7 +37,7 @@ func makeOSLODepGraph(confs map[string]*SLOMultiVerse, c GenConf) *graphviz.Grap
 	return g
 }
 
-func createNodes(graph *cgraph.Graph, confs map[string]*SLOMultiVerse) error {
+func createNodes(graph *cgraph.Graph, confs map[string]*libs.SLOMultiVerse) error {
 
 	var err error
 	for _, v := range confs {
@@ -70,7 +71,7 @@ func createNodes(graph *cgraph.Graph, confs map[string]*SLOMultiVerse) error {
 		}
 
 		if err != nil {
-			log.Errorw("error generating slo graph", "err", err)
+			libs.Log().Errorw("error generating slo graph", "err", err)
 			return err
 		}
 		//node.
@@ -79,7 +80,7 @@ func createNodes(graph *cgraph.Graph, confs map[string]*SLOMultiVerse) error {
 	return nil
 }
 
-func createEdges(graph *cgraph.Graph, confs map[string]*SLOMultiVerse) error {
+func createEdges(graph *cgraph.Graph, confs map[string]*libs.SLOMultiVerse) error {
 
 	for _, v := range confs {