Fix username function

pete-woods · pete-woods · commit 58f019ba7ef1 · 2021-03-10T14:28:21.000Z
Signed-off-by: Pete Woods &lt;pete.woods@circleci.com&gt;
diff --git a/libmachine/mcnutils/utils.go b/libmachine/mcnutils/utils.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/user"
 	"runtime"
 	"strconv"
 	"time"
@@ -35,17 +36,10 @@ func GetHomeDir() string {
 
 func GetUsername() string {
 	u := "unknown"
-	osUser := ""
 
-	switch runtime.GOOS {
-	case "darwin", "linux":
-		osUser = os.Getenv("USER")
-	case "windows":
-		osUser = os.Getenv("USERNAME")
-	}
-
-	if osUser != "" {
-		u = osUser
+	user, err := user.Current()
+	if err == nil {
+		u = user.Username
 	}
 
 	return u
diff --git a/libmachine/mcnutils/utils_test.go b/libmachine/mcnutils/utils_test.go
@@ -3,8 +3,8 @@ package mcnutils
 import (
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
-	"runtime"
 	"testing"
 )
 
@@ -54,17 +54,14 @@ func TestCopyFile(t *testing.T) {
 }
 
 func TestGetUsername(t *testing.T) {
-	currentUser := "unknown"
-	switch runtime.GOOS {
-	case "darwin", "linux":
-		currentUser = os.Getenv("USER")
-	case "windows":
-		currentUser = os.Getenv("USERNAME")
+	u, err := user.Current()
+	if err != nil {
+		t.Fatalf(err.Error())
 	}
 
 	username := GetUsername()
-	if username != currentUser {
-		t.Fatalf("expected username %s; received %s", currentUser, username)
+	if username != u.Username {
+		t.Fatalf("expected username %s; received %s", u.Username, username)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package mcnutils`
`3`	`3`	`import (`
`4`	`4`	`"io/ioutil"`
`5`	`5`	`"os"`
	`6`	`+ "os/user"`
`6`	`7`	`"path/filepath"`
`7`		`- "runtime"`
`8`	`8`	`"testing"`
`9`	`9`	`)`
`10`	`10`
`@@ -54,17 +54,14 @@ func TestCopyFile(t *testing.T) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func TestGetUsername(t *testing.T) {`
`57`		`- currentUser := "unknown"`
`58`		`- switch runtime.GOOS {`
`59`		`- case "darwin", "linux":`
`60`		`- currentUser = os.Getenv("USER")`
`61`		`- case "windows":`
`62`		`- currentUser = os.Getenv("USERNAME")`
	`57`	`+ u, err := user.Current()`
	`58`	`+ if err != nil {`
	`59`	`+ t.Fatalf(err.Error())`
`63`	`60`	`}`
`64`	`61`
`65`	`62`	`username := GetUsername()`
`66`		`- if username != currentUser {`
`67`		`- t.Fatalf("expected username %s; received %s", currentUser, username)`
	`63`	`+ if username != u.Username {`
	`64`	`+ t.Fatalf("expected username %s; received %s", u.Username, username)`
`68`	`65`	`}`
`69`	`66`	`}`
`70`	`67`