makes this more package friendly and removes cruft

cli/actions/key.go

@@ -7,12 +7,7 @@ import (
 	"github.com/nqd/flat"
 )
 
-func ReadKeyCmd(configFilePath string, key string, outputFilePath string, traceOutFilePath string) (string, error) {
-	configurationMap, err := ReadConfigurationMap(configFilePath)
-
-	if err != nil {
-		return "", err
-	}
+func ReadKeyCmd(configurationMap *ConfigurationMap, key string, outputFilePath string, traceOutFilePath string) (string, error) {
 
 	memoryMap, traces, err := ReadMemoryMap(configurationMap)
 

cli/actions/replace.go

@@ -6,13 +6,7 @@ import (
 	"github.com/nqd/flat"
 )
 
-func ReplaceCmd(configMap string, inputPath string, outputPath string, traceFileOutput string) {
-	configurationMap, err := ReadConfigurationMap(configMap)
-
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
+func ReplaceCmd(configurationMap *ConfigurationMap, inputPath string, outputPath string, traceFileOutput string) {
 
 	memoryMap, traces, err := ReadMemoryMap(configurationMap)
 

cli/actions/replace_test.go

@@ -16,30 +16,28 @@ func TestReplaceCmd(t *testing.T) {
 	_ = afero.WriteFile(AppFs, "test.json", []byte(jsonData), 0644)
 	_ = afero.WriteFile(AppFs, "test.yaml", []byte(yamlData), 0644)
 
-	ConfigurationMap := `{
-		"version": "1.0.0",
-		"configs": [
+	ConfigurationMap := &ConfigurationMap{
+		Version: "1.0.0",
+		Configs: []Config{
 			{
-				"path": "test.json",
-				"mappings": [],
-				"applyFile": "after"
+				Path:      "test.json",
+				Mappings:  []Mapping{},
+				ApplyFile: "after",
 			},
 			{
-				"path": "test.yaml",
-				"mappings": [],
-				"applyFile": "after"
-			}
-		]
-	}`
-
-	_ = afero.WriteFile(AppFs, "config.json", []byte(ConfigurationMap), 0644)
+				Path:      "test.yaml",
+				Mappings:  []Mapping{},
+				ApplyFile: "after",
+			},
+		},
+	}
 
 	inputFile := "I am {{ .key }}"
 	outputFile := "I am key"
 
 	_ = afero.WriteFile(AppFs, "test.txt", []byte(inputFile), 0644)
 
-	ReplaceCmd("config.json", "test.txt", "output.txt", "")
+	ReplaceCmd(ConfigurationMap, "test.txt", "output.txt", "")
 
 	file, _ := afero.ReadFile(AppFs, "output.txt")
 

cli/cmd/key.go

@@ -30,7 +30,14 @@ var keyCmd = &cobra.Command{
 		outputFilePath := cmd.Flag("output").Value.String()
 		traceOutFilePath := cmd.Flag("memoryTraceOut").Value.String()
 
-		keyValue, err := actions.ReadKeyCmd(configFilePath, key, outputFilePath, traceOutFilePath)
+		configurationMap, err := actions.ReadConfigurationMap(configFilePath)
+
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		keyValue, err := actions.ReadKeyCmd(configurationMap, key, outputFilePath, traceOutFilePath)
 
 		if err != nil {
 			fmt.Println(err)

cli/cmd/replace.go

@@ -4,6 +4,8 @@ Copyright © 2024 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/mtintes/configamajig/actions"
 	"github.com/spf13/cobra"
 )
@@ -14,14 +16,18 @@ var replaceCmd = &cobra.Command{
 	Short: "Replaces the variables in the input file using a config file",
 	Long:  `This is for replacing the variables in the input file using a config file.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		configMap := cmd.Flag("config").Value.String()
-
+		configMapPath := cmd.Flag("config").Value.String()
 		traceFileOutput := cmd.Flag("memoryTraceOut").Value.String()
-
 		inputPath := cmd.Flag("input").Value.String()
-
 		outputPath := cmd.Flag("output").Value.String()
-		actions.ReplaceCmd(configMap, inputPath, outputPath, traceFileOutput)
+
+		configurationMap, err := actions.ReadConfigurationMap(configMapPath)
+
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		actions.ReplaceCmd(configurationMap, inputPath, outputPath, traceFileOutput)
 	},
 }