Address minor comments

Author: blva

internal/file/file.go

@@ -15,15 +15,11 @@
 package file
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"path/filepath"
-	"strings"
 
-	"github.com/mongodb/mongocli/internal/config"
 	"github.com/mongodb/mongocli/internal/search"
-	"github.com/mongodb/mongocli/internal/version"
 	"github.com/spf13/afero"
 	"gopkg.in/yaml.v2"
 )
@@ -39,15 +35,15 @@ const (
 var supportedExts = []string{jsonName, yamlName, ymlName}
 
 // configType gets the config type from a given file path.
-func configType(filename string) (string, error) {
+func configType(filename string, supported []string) (string, error) {
 	ext := filepath.Ext(filename)
 
 	if len(ext) <= 1 {
 		return "", fmt.Errorf("filename: %s requires valid extension", filename)
 	}
 
 	configType := ext[1:]
-	if !search.StringInSlice(supportedExts, configType) {
+	if !search.StringInSlice(supported, configType) {
 		return "", fmt.Errorf("unsupported file type: %s", configType)
 	}
 	return configType, nil
@@ -60,7 +56,7 @@ func Load(fs afero.Fs, filename string, out interface{}) error {
 		return fmt.Errorf("file not found: %s", filename)
 	}
 
-	configType, err := configType(filename)
+	configType, err := configType(filename, supportedExts)
 	if err != nil {
 		return err
 	}
@@ -85,57 +81,23 @@ func Load(fs afero.Fs, filename string, out interface{}) error {
 }
 
 // Save saves a given data interface into a given file path
-// The file should be a valid json or yaml format.
+// The file should be a yaml format.
 func Save(fs afero.Fs, filePath string, data interface{}) error {
 	var content []byte
 
-	configType, err := configType(filePath)
-	if err != nil {
+	if _, err := configType(filePath, []string{yamlName}); err != nil {
 		return err
 	}
 
-	switch configType {
-	case yamlName, ymlName:
-		content, err = yaml.Marshal(data)
-		if err != nil {
-			return err
-		}
-	case jsonName:
-		content, err = json.Marshal(data)
-		if err != nil {
-			return err
-		}
-	}
-
-	err = fs.MkdirAll(filepath.Dir(filePath), configPermission)
+	content, err := yaml.Marshal(data)
 	if err != nil {
 		return err
 	}
 
-	err = afero.WriteFile(fs, filePath, content, filePermission)
-	return err
-}
-
-func Path(tool, fileName string) (string, error) {
-	var path bytes.Buffer
-	var home string
-	var err error
-
-	if tool == version.AtlasCLI {
-		home, err = config.AtlasCLIConfigHome()
-	} else {
-		home, err = config.MongoCLIConfigHome()
-	}
+	err = fs.MkdirAll(filepath.Dir(filePath), configPermission)
 	if err != nil {
-		return "", err
-	}
-
-	path.WriteString(home)
-	// Temporary until config home is changed
-	if !strings.Contains(home, tool) && tool == version.MongoCLI {
-		path.WriteString("/" + tool)
+		return err
 	}
 
-	path.WriteString(fileName)
-	return path.String(), nil
+	return afero.WriteFile(fs, filePath, content, filePermission)
 }

internal/file/file_test.go

@@ -18,7 +18,6 @@
 package file_test
 
 import (
-	"encoding/json"
 	"fmt"
 	"testing"
 
@@ -98,18 +97,6 @@ func TestFile(t *testing.T) {
 			t.Errorf("Save() unexpected error: %v", err)
 		}
 	})
-	t.Run("save valid json file", func(t *testing.T) {
-		appFS := afero.NewMemMapFs()
-		filename := jsonFileName
-
-		b := []byte(`{"Name":"MongoDB","Age":100,"Children":["mongocli", "atlascli"]}`)
-		j, _ := json.Marshal(b)
-
-		err := file.Save(appFS, filename, j)
-		if err != nil {
-			t.Fatalf("Save() unexpected error: %v", err)
-		}
-	})
 	t.Run("save valid yaml file", func(t *testing.T) {
 		appFS := afero.NewMemMapFs()
 		filename := yamlFileName

internal/homebrew/path.go

@@ -73,12 +73,7 @@ func homebrewFormulaPath(tool string) (string, error) {
 
 	brewFormulaPath := strings.TrimSpace(string(brewFormulaPathBytes))
 
-	brewFormulaPath, err = filepath.EvalSymlinks(brewFormulaPath)
-	if err != nil {
-		return "", err
-	}
-
-	return brewFormulaPath, nil
+	return filepath.EvalSymlinks(brewFormulaPath)
 }
 
 func executableCurrentPath() (string, error) {