little refactor

snowflakedb · Oct 19, 2023 · b599b51 · b599b51
1 parent 6326fa9
commit b599b51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/client_configuration.go b/client_configuration.go
@@ -27,9 +27,8 @@ const (
 )
 
 func getClientConfig(filePathFromConnectionString string) (*ClientConfig, error) {
-	configPredefinedFilePaths, err := clientConfigPredefinedDirs()
-	var filePath string
-	filePath, err = findClientConfigFilePath(filePathFromConnectionString, configPredefinedFilePaths)
+	configPredefinedFilePaths := clientConfigPredefinedDirs()
+	filePath, err := findClientConfigFilePath(filePathFromConnectionString, configPredefinedFilePaths)
 	if err != nil {
 		return nil, err
 	}
@@ -75,12 +74,13 @@ func existsFile(filePath string) (bool, error) {
 	return false, err
 }
 
-func clientConfigPredefinedDirs() ([]string, error) {
+func clientConfigPredefinedDirs() []string {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
-		return nil, err
+		logger.Warnf("Home dir could not be determined: %w", err)
+		return []string{".", os.TempDir()}
 	}
-	return []string{".", homeDir, os.TempDir()}, nil
+	return []string{".", homeDir, os.TempDir()}
 }
 
 // ClientConfig config root

diff --git a/client_configuration_test.go b/client_configuration_test.go
@@ -38,7 +38,7 @@ func TestFindConfigFileFromEnvVariable(t *testing.T) {
 	assertEqualE(t, clientConfigFilePath, envConfigPath, "config file path")
 }
 
-func TestFindConfigFileFromDriverDirectory(t *testing.T) {
+func TestFindConfigFileFromFirstPredefinedDir(t *testing.T) {
 	dirs := createTestDirectories(t)
 	driverConfigPath := createFile(t, defaultConfigName, "random content", dirs.driverDir)
 	createFile(t, defaultConfigName, "random content", dirs.homeDir)
@@ -50,7 +50,7 @@ func TestFindConfigFileFromDriverDirectory(t *testing.T) {
 	assertEqualE(t, clientConfigFilePath, driverConfigPath, "config file path")
 }
 
-func TestFindConfigFileFromHomeDirectory(t *testing.T) {
+func TestFindConfigFileFromSubsequentDirectoryIfNotFoundInPreviousOne(t *testing.T) {
 	dirs := createTestDirectories(t)
 	createFile(t, "wrong_file_name.json", "random content", dirs.driverDir)
 	homeConfigPath := createFile(t, defaultConfigName, "random content", dirs.homeDir)
@@ -62,18 +62,6 @@ func TestFindConfigFileFromHomeDirectory(t *testing.T) {
 	assertEqualE(t, clientConfigFilePath, homeConfigPath, "config file path")
 }
 
-func TestFindConfigFileFromTempDirectory(t *testing.T) {
-	dirs := createTestDirectories(t)
-	createFile(t, "wrong_file_name.json", "random content", dirs.driverDir)
-	createFile(t, "wrong_file_name.json", "random content", dirs.homeDir)
-	tempConfigPath := createFile(t, defaultConfigName, "random content", dirs.tempDir)
-
-	clientConfigFilePath, err := findClientConfigFilePath("", predefinedTestDirs(dirs))
-
-	assertNilF(t, err, "get client config error")
-	assertEqualE(t, clientConfigFilePath, tempConfigPath, "config file path")
-}
-
 func TestNotFindConfigFileWhenNotDefined(t *testing.T) {
 	dirs := createTestDirectories(t)
 	createFile(t, "wrong_file_name.json", "random content", dirs.driverDir)
@@ -89,11 +77,9 @@ func TestNotFindConfigFileWhenNotDefined(t *testing.T) {
 func TestCreatePredefinedDirs(t *testing.T) {
 	homeDir, err := os.UserHomeDir()
 	assertNilF(t, err, "get home dir error")
-	var locations []string
 
-	locations, err = clientConfigPredefinedDirs()
+	locations := clientConfigPredefinedDirs()
 
-	assertNilF(t, err, "error")
 	assertEqualF(t, len(locations), 3, "size")
 	assertEqualE(t, locations[0], ".", "driver directory")
 	assertEqualE(t, locations[1], homeDir, "home directory")