fixes

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

Author: kumarabd

internal/config/config.go

@@ -4,7 +4,7 @@ package config
 type Handler interface {
 
 	// SetKey sets a key value in the config
-	SetKey(key string, value string)
+	SetKey(key string, value string) error
 
 	// GetKey gets a key value from the config
 	GetKey(key string) (string, error)
@@ -13,10 +13,7 @@ type Handler interface {
 	Server(result interface{}) error
 
 	// MeshSpec provides the mesh specific configuration
-	MeshSpec(result interface{}) error
-
-	// MeshInstance provides the mesh specific configuration
-	MeshInstance(result interface{}) error
+	Mesh(result interface{}) error
 
 	// Operations provides the list of operations available
 	Operations(result interface{}) error

internal/config/keys.go

@@ -4,7 +4,7 @@ const (
 	local = "local" // local is the key for local config
 
 	// Operation keys
-	InstallNginxLatest = "install-nginx-0.6.0" // InstallKuma is the key to install kuma
+	InstallNginxLatest = "install-nginx-060" // InstallNginxLatest is the key to install nginx
 
 	InstallSampleBookInfo = "install-sample-bookinfo" // InstallSampleBookInfo is the key to install sample bookinfo application
 

internal/config/local.go

@@ -22,8 +22,9 @@ func NewLocal() (Handler, error) {
 // -------------------------------------------Application config methods----------------------------------------------------------------
 
 // SetKey sets a key value in local store
-func (l *Local) SetKey(key string, value string) {
+func (l *Local) SetKey(key string, value string) error {
 	l.store[key] = value
+	return nil
 }
 
 // GetKey gets a key value from local store
@@ -47,7 +48,7 @@ func (l *Local) Server(result interface{}) error {
 }
 
 // MeshSpec provides mesh specific configuration
-func (l *Local) MeshSpec(result interface{}) error {
+func (l *Local) Mesh(result interface{}) error {
 	d := `{
 		"name":    "Nginx Service Mesh",
 		"status":  "not installed",
@@ -56,18 +57,6 @@ func (l *Local) MeshSpec(result interface{}) error {
 	return utils.Unmarshal(d, result)
 }
 
-// MeshInstance provides mesh specific configuration
-func (l *Local) MeshInstance(result interface{}) error {
-	d := `{
-		"installmode": "flat",
-		"installplatform": "kubernetes",
-		"installzone": " ",
-		"mgmtaddr": "0.0.0.0:8000",
-		"nginxaddr": "5681"
-	}`
-	return utils.Unmarshal(d, result)
-}
-
 // Operations provides operations in the mesh
 func (l *Local) Operations(result interface{}) error {
 	d, err := utils.Marshal(operations)

internal/config/viper.go

@@ -23,6 +23,8 @@ func NewViper() (Handler, error) {
 
 	v.SetDefault("server", server)
 	v.SetDefault("mesh", mesh)
+	v.SetDefault("operations", operations)
+
 	err := v.WriteConfig()
 	if err != nil {
 		_, er := os.Create(fmt.Sprintf("%s/%s", filepath, filename))
@@ -37,9 +39,13 @@ func NewViper() (Handler, error) {
 }
 
 // SetKey sets a key value in viper
-func (v *Viper) SetKey(key string, value string) {
+func (v *Viper) SetKey(key string, value string) error {
 	v.instance.Set(key, value)
-	_ = v.instance.WriteConfig()
+	err := v.instance.WriteConfig()
+	if err != nil {
+		return ErrViper(err)
+	}
+	return nil
 }
 
 // GetKey gets a key value from viper
@@ -68,28 +74,21 @@ func (v *Viper) Server(result interface{}) error {
 }
 
 // MeshSpec provides mesh specific configuration
-func (v *Viper) MeshSpec(result interface{}) error {
-	err := v.instance.ReadInConfig()
+func (v *Viper) Mesh(result interface{}) error {
+	s, err := v.GetKey("mesh")
 	if err != nil {
 		return ErrViper(err)
 	}
-	return v.instance.Unmarshal(&result)
-}
 
-// MeshInstance provides mesh specific configuration
-func (v *Viper) MeshInstance(result interface{}) error {
-	err := v.instance.ReadInConfig()
-	if err != nil {
-		return ErrViper(err)
-	}
-	return v.instance.Unmarshal(&result)
+	return utils.Unmarshal(s, &result)
 }
 
 // Operations provides list of operations available
 func (v *Viper) Operations(result interface{}) error {
-	err := v.instance.ReadInConfig()
+	s, err := v.GetKey("operations")
 	if err != nil {
 		return ErrViper(err)
 	}
-	return v.instance.Unmarshal(&result)
+
+	return utils.Unmarshal(s, &result)
 }

main.go

@@ -38,7 +38,11 @@ func main() {
 	}
 	service := &grpc.Service{}
 	_ = cfg.Server(&service)
-	cfg.SetKey("kube-config-path", kubeConfigPath)
+	err = cfg.SetKey("kube-config-path", kubeConfigPath)
+	if err != nil {
+		log.Err("Cannot set kubeconfig path", err.Error())
+		os.Exit(1)
+	}
 
 	// // Initialize Tracing instance
 	// tracer, err := tracing.New(service.Name, service.TraceURL)

nginx/install.go

@@ -27,7 +27,7 @@ func (h *handler) installNginx(del bool, version string) (string, error) {
 	meshinstance := &MeshInstance{
 		InstallVersion: version,
 	}
-	err := h.config.MeshInstance(meshinstance)
+	err := h.config.Mesh(meshinstance)
 	if err != nil {
 		return status, ErrMeshConfig(err)
 	}

nginx/operations.go

@@ -41,7 +41,13 @@ func (h *handler) ApplyOperation(ctx context.Context, op string, id string, del
 				hh.StreamErr(e, err)
 				return
 			}
-			h.config.SetKey(cfg.RunningMeshVersion, operations[op].Properties["version"])
+			err = h.config.SetKey(cfg.RunningMeshVersion, operations[op].Properties["version"])
+			if err != nil {
+				e.Summary = fmt.Sprintf("Error while %s Nginx service mesh", status)
+				e.Details = err.Error()
+				hh.StreamErr(e, err)
+				return
+			}
 			ee.Summary = fmt.Sprintf("Nginx service mesh %s successfully", status)
 			ee.Details = fmt.Sprintf("The Nginx service mesh is now %s.", status)
 			hh.StreamInfo(e)

nginx/spec.go

@@ -10,7 +10,7 @@ type Spec struct {
 // GetName returns the name of the mesh
 func (h *handler) GetName() string {
 	spec := &Spec{}
-	err := h.config.MeshSpec(&spec)
+	err := h.config.Mesh(&spec)
 	if err != nil {
 		h.log.Err("1000", err.Error())
 		return "Not set"