From 81d430a15def11cc85845950b495e157115201a1 Mon Sep 17 00:00:00 2001
From: Lang Martin <lang@hashicorp.com>
Date: Wed, 1 Jul 2020 10:39:32 -0400
Subject: [PATCH] command/agent/host: uname returns an error string, windows

---
 command/agent/host/host.go    |  7 +------
 command/agent/host/unix.go    |  5 ++---
 command/agent/host/windows.go | 10 +++++-----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/command/agent/host/host.go b/command/agent/host/host.go
index c75e45a5d010..f3755e25deaa 100644
--- a/command/agent/host/host.go
+++ b/command/agent/host/host.go
@@ -1,7 +1,6 @@
 package host
 
 import (
-	"fmt"
 	"os"
 	"strings"
 )
@@ -21,10 +20,6 @@ type DiskUsage struct {
 }
 
 func MakeHostData() (*HostData, error) {
-	uname, err := uname()
-	if err != nil {
-		return nil, fmt.Errorf("error uname: %s", err.Error())
-	}
 	du := make(map[string]DiskUsage)
 	for _, path := range mountedPaths() {
 		u, err := diskUsage(path)
@@ -35,7 +30,7 @@ func MakeHostData() (*HostData, error) {
 	}
 
 	return &HostData{
-		OS:          uname,
+		OS:          uname(),
 		Network:     network(),
 		ResolvConf:  resolvConf(),
 		Hosts:       etcHosts(),
diff --git a/command/agent/host/unix.go b/command/agent/host/unix.go
index 41b6fdb2e5a9..33294f283a7a 100644
--- a/command/agent/host/unix.go
+++ b/command/agent/host/unix.go
@@ -3,7 +3,6 @@
 package host
 
 import (
-	"fmt"
 	"strings"
 	"syscall"
 
@@ -11,11 +10,11 @@ import (
 )
 
 // uname returns the syscall like `uname -a`
-func uname() (string, error) {
+func uname() string {
 	u := &unix.Utsname{}
 	err := unix.Uname(u)
 	if err != nil {
-		return "", fmt.Errorf("error uname: %s", err.Error())
+		return err.Error()
 	}
 
 	uname := strings.Join([]string{
diff --git a/command/agent/host/windows.go b/command/agent/host/windows.go
index cff6a0dacbad..3f32eb032b0d 100644
--- a/command/agent/host/windows.go
+++ b/command/agent/host/windows.go
@@ -26,10 +26,10 @@ func etcHosts() string {
 
 func mountedPaths() (disks []string) {
 	for _, c := range "ABCDEFGHIJKLMNOPQRSTUVWXYZ" {
-		_, err := os.Stat(string(c) + ":\\")
+		d := string(c) + ":\\"
+		_, err := os.Stat(d)
 		if err == nil {
-
-			disks = append(disks, c)
+			disks = append(disks, d)
 		}
 	}
 }
@@ -39,7 +39,7 @@ type df struct {
 	avail int64
 }
 
-func makeDf(path string) *df {
+func makeDf(path string) (*df, error) {
 	h := syscall.MustLoadDLL("kernel32.dll")
 	c := h.MustFindProc("GetDiskFreeSpaceExW")
 
@@ -49,7 +49,7 @@ func makeDf(path string) *df {
 		uintptr(unsafe.Pointer(&df.total)),
 		uintptr(unsafe.Pointer(&df.avail)))
 
-	return df
+	return df, nil
 }
 
 func (d *df) total() uint64 {