refactoring (#13)

.pp/parameters_dev.yaml

@@ -0,0 +1,6 @@
+local_file:
+  FilePath: parameters_dev.json
+azure_blob:
+  StorageAccountName: stparampiper
+  ContainerName: abc
+  BlobName: parampiper_dev.json

.pp/parameters_tst.yaml

@@ -0,0 +1,6 @@
+local_file:
+  FilePath: parameters_tst.json
+azure_blob:
+  StorageAccountName: stparampiper
+  ContainerName: abc
+  BlobName: parampiper_tst.json

cmd/get.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/cdalar/parampiper/pkg/common"
 	"github.com/spf13/cobra"
 )
 
@@ -30,9 +31,10 @@ var getCmd = &cobra.Command{
 				log.Println("[DEBUG] Parameter name: ", args[0])
 				param.Name = args[0]
 			}
+		} else {
+			log.Println("[DEBUG] Parameter name: ", param.Name)
 		}
 
-		param.Name = args[0]
 		parameters, err := provider.Read()
 		if err != nil {
 			log.Println(err)
@@ -51,7 +53,7 @@ var getCmd = &cobra.Command{
 					fmt.Print(p.ToYAML())
 				case "table":
 					tmpl := "NAME\tVALUE\tINFO\n{{.Name}}\t{{.Value}}\t{{.Info}}\n"
-					TabWriter(p, tmpl)
+					common.TabWriter(p, tmpl)
 				default:
 					fmt.Print(p.Value, "\n")
 				}

cmd/list.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"log"
 
+	"github.com/cdalar/parampiper/pkg/common"
 	"github.com/spf13/cobra"
 )
 
@@ -23,6 +24,6 @@ var listCmd = &cobra.Command{
 
 		log.Println("[DEBUG]", parameters)
 		tmpl := "NAME\tVALUE\tINFO\n{{range .}}{{.Name}}\t{{.Value}}\t{{.Info}}\n{{end}}"
-		TabWriter(parameters, tmpl)
+		common.TabWriter(parameters, tmpl)
 	},
 }

cmd/out.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"log"
 
+	"github.com/cdalar/parampiper/pkg/common"
 	"github.com/spf13/cobra"
 )
 
@@ -35,10 +36,12 @@ var outCmd = &cobra.Command{
 		switch outputType {
 		case "tfvars":
 			tmpl = "{{range .}}{{.Name}} = \"{{.Value}}\"\n{{end}}"
+		case "export":
+			tmpl = "{{range .}}export {{.Name | upperCase}}=\"{{.Value}}\"\n{{end}}"
 		default:
 			tmpl = "NAME\tVALUE\tINFO\n{{range .}}{{.Name}}\t{{.Value}}\t{{.Info}}\n{{end}}"
 		}
 
-		TabWriter(parameters, tmpl)
+		common.TabWriter(parameters, tmpl)
 	},
 }

cmd/root.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/cdalar/parampiper/internal/data"
+	"github.com/cdalar/parampiper/pkg/common"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -18,7 +19,7 @@ var (
 			log.Println("[DEBUG] Args: " + strings.Join(os.Args, ","))
 			log.Println("[DEBUG] Configuration File: " + configFilePath)
 			if len(os.Args) > 1 && os.Args[1] != "init" && os.Args[1] != "version" {
-				ReadConfig(configFilePath)
+				common.ReadConfig(configFilePath)
 			}
 			log.Println("[DEBUG]", viper.AllSettings())
 			dataProvider, isEnvExits := os.LookupEnv("PP_DATA")
@@ -53,7 +54,6 @@ var (
 
 func init() {
 	rootCmd.PersistentFlags().StringVarP(&configFilePath, "config", "c", ".pp/parampiper.yaml", "Configuration file")
-
 }
 
 // Execute executes the root command.
@@ -64,7 +64,7 @@ func Execute() error {
 func checkDataProvider(dataProvider string) {
 	log.Println("[DEBUG] Using: " + dataProvider)
 	if dataProvider != "" {
-		if !Contains(providerList, dataProvider) {
+		if !common.Contains(providerList, dataProvider) {
 			log.Println("Provider (" + dataProvider + ") is not Supported\nPlease use one of the following: " + strings.Join(providerList, ","))
 			os.Exit(1)
 		}

cmd/set.go

@@ -4,6 +4,7 @@ import (
 	"log"
 
 	"github.com/cdalar/parampiper/internal/data"
+	"github.com/cdalar/parampiper/pkg/common"
 	"github.com/spf13/cobra"
 )
 
@@ -28,6 +29,11 @@ var addCmd = &cobra.Command{
 	Short:   "Add/Update Parameter",
 	Run: func(cmd *cobra.Command, args []string) {
 		log.Println("[DEBUG] Add/Update Parameters")
+		unsupportChars := []rune{'-', '*', ',', '.', ':', ';', '<', '>', '?', '\\', '|', ' '}
+		if common.ContainsAny(param.Name, unsupportChars) {
+			log.Println("[ERROR] Parameter name cannot contain any of the following characters:", string(unsupportChars))
+			return
+		}
 		parameters, err := provider.Read()
 		if err != nil {
 			log.Println(err)

internal/data/data.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"sort"
 	"strings"
 
 	"gopkg.in/yaml.v2"
@@ -29,11 +30,24 @@ func (p *Parameters) Add(prm Parameter) {
 	}
 	isExists, paramPos := p.IfExists(prm)
 	if isExists {
+		if prm.Value == "" {
+			log.Println("[DEBUG] Parameter value is empty")
+			log.Println("[DEBUG] Keep Parameter Value: ", (*p)[paramPos].Value)
+			prm.Value = (*p)[paramPos].Value
+		}
+		if prm.Info == "" {
+			log.Println("[DEBUG] Parameter info is empty")
+			log.Println("[DEBUG] Keep Parameter Info: ", (*p)[paramPos].Info)
+			prm.Info = (*p)[paramPos].Info
+		}
 		(*p)[paramPos] = prm
-		return
 	} else {
 		*p = append(*p, prm)
 	}
+	// Sort the parameters by Name
+	sort.Slice(*p, func(i, j int) bool {
+		return (*p)[i].Name < (*p)[j].Name
+	})
 }
 
 func (p *Parameters) Remove(parameterList string) {

internal/data/data_test.go

@@ -30,6 +30,18 @@ func TestParameters_Add(t *testing.T) {
 			param:    Parameter{Name: "", Value: "value2", Info: "info2"},
 			expected: Parameters{{Name: "param1", Value: "value1", Info: "info1"}},
 		},
+		{
+			name:     "Update parameter with Empty Value",
+			params:   Parameters{{Name: "param1", Value: "value1", Info: "info1"}},
+			param:    Parameter{Name: "param1", Value: "", Info: "info2"},
+			expected: Parameters{{Name: "param1", Value: "value1", Info: "info2"}},
+		},
+		{
+			name:     "Update parameter with Empty Info value",
+			params:   Parameters{{Name: "param1", Value: "value1", Info: "info1"}},
+			param:    Parameter{Name: "param1", Value: "value2"},
+			expected: Parameters{{Name: "param1", Value: "value2", Info: "info1"}},
+		},
 	}
 
 	for _, tc := range testCases {

parameters_dev.json

@@ -0,0 +1,37 @@
+[
+    {
+        "name": "environment",
+        "value": "dev",
+        "info": ""
+    },
+    {
+        "name": "location",
+        "value": "westeurope",
+        "info": ""
+    },
+    {
+        "name": "resource_group_name",
+        "value": "dev_testing",
+        "info": ""
+    },
+    {
+        "name": "t1",
+        "value": "value1",
+        "info": ""
+    },
+    {
+        "name": "t2",
+        "value": "t2",
+        "info": ""
+    },
+    {
+        "name": "t3",
+        "value": "dev3",
+        "info": ""
+    },
+    {
+        "name": "testing",
+        "value": "devValue",
+        "info": ""
+    }
+]

parameters_tst.json

@@ -0,0 +1,37 @@
+[
+    {
+        "name": "environment",
+        "value": "tst",
+        "info": ""
+    },
+    {
+        "name": "location",
+        "value": "westeurope",
+        "info": ""
+    },
+    {
+        "name": "resource_group_name",
+        "value": "tst_testing",
+        "info": ""
+    },
+    {
+        "name": "t1",
+        "value": "value1",
+        "info": ""
+    },
+    {
+        "name": "t2",
+        "value": "tst_t2",
+        "info": ""
+    },
+    {
+        "name": "t3",
+        "value": "v3",
+        "info": ""
+    },
+    {
+        "name": "testing",
+        "value": "tst_testValue",
+        "info": ""
+    }
+]