From dd068e53a92e67ba8c09e913adf05fae5ee609a1 Mon Sep 17 00:00:00 2001
From: Ran Vaknin <rvaknin@amazon.com>
Date: Tue, 18 Oct 2022 11:06:27 -0700
Subject: [PATCH] fixed code based on mcgrails suggestions

---
 internal/shareddefaults/shared_config.go          | 15 ++++++++++++++-
 .../shared_config_resolve_home_go1.12.go          | 11 -----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/internal/shareddefaults/shared_config.go b/internal/shareddefaults/shared_config.go
index 8b3141bc1a4..34fea49ca81 100644
--- a/internal/shareddefaults/shared_config.go
+++ b/internal/shareddefaults/shared_config.go
@@ -1,6 +1,7 @@
 package shareddefaults
 
 import (
+	"os/user"
 	"path/filepath"
 )
 
@@ -29,5 +30,17 @@ func SharedConfigFilename() string {
 // UserHomeDir returns the home directory for the user the process is
 // running under.
 func UserHomeDir() string {
-	return userHomeDir()
+	var home string
+
+	home = userHomeDir()
+	if len(home) > 0 {
+		return home
+	}
+
+	currUser, _ := user.Current()
+	if currUser != nil {
+		home = currUser.HomeDir
+	}
+
+	return home
 }
diff --git a/internal/shareddefaults/shared_config_resolve_home_go1.12.go b/internal/shareddefaults/shared_config_resolve_home_go1.12.go
index 1b214d2fefb..51541b50876 100644
--- a/internal/shareddefaults/shared_config_resolve_home_go1.12.go
+++ b/internal/shareddefaults/shared_config_resolve_home_go1.12.go
@@ -5,20 +5,9 @@ package shareddefaults
 
 import (
 	"os"
-	"os/user"
 )
 
 func userHomeDir() string {
 	home, _ := os.UserHomeDir()
-
-	if len(home) > 0 {
-		return home
-	}
-
-	currUser, _ := user.Current()
-	if currUser != nil {
-		home = currUser.HomeDir
-	}
-
 	return home
 }