Merge pull request #133 from MUzairS15/bug-fix

leecalcote · web-flow · commit 8a3a430c8079 · 2022-06-02T02:47:22.000-05:00
Bug Fix
diff --git a/internal/config/default_config.go b/internal/config/default_config.go
@@ -2,15 +2,13 @@ package config
 
 import (
 	"time"
-
-	"github.com/spf13/viper"
 )
 
 var (
 	Server = map[string]string{
 		"name":      "meshery-meshsync",
 		"port":      "11000",
-		"version":   viper.GetString("BUILD"),
+		"version":   "latest",
 		"startedat": time.Now().String(),
 	}
 
diff --git a/main.go b/main.go
@@ -44,6 +44,8 @@ func main() {
 	}
 
 	cfg.SetKey(config.BrokerURL, os.Getenv("BROKER_URL"))
+
+	config.Server["version"] = version
 	err = cfg.SetObject(config.ServerKey, config.Server)
 	if err != nil {
 		log.Error(err)

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,13 @@ package config`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`		`-`
`6`		`- "github.com/spf13/viper"`
`7`	`5`	`)`
`8`	`6`
`9`	`7`	`var (`
`10`	`8`	`Server = map[string]string{`
`11`	`9`	`"name": "meshery-meshsync",`
`12`	`10`	`"port": "11000",`
`13`		`- "version": viper.GetString("BUILD"),`
	`11`	`+ "version": "latest",`
`14`	`12`	`"startedat": time.Now().String(),`
`15`	`13`	`}`
`16`	`14`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ func main() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`cfg.SetKey(config.BrokerURL, os.Getenv("BROKER_URL"))`
	`47`	`+`
	`48`	`+ config.Server["version"] = version`
`47`	`49`	`err = cfg.SetObject(config.ServerKey, config.Server)`
`48`	`50`	`if err != nil {`
`49`	`51`	`log.Error(err)`