Trim new lines from strings.

Refactor all trimming into single trim func.

Author: denisbrodbeck

helper.go

@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
+	"strings"
 )
 
 // run wraps `exec.Command` with easy access to stdout and stderr.
@@ -29,3 +30,7 @@ func protect(appID, id string) string {
 func readFile(filename string) ([]byte, error) {
 	return ioutil.ReadFile(filename)
 }
+
+func trim(s string) string {
+	return strings.TrimSpace(strings.Trim(s, "\n"))
+}

helper_test.go

@@ -67,3 +67,42 @@ func Test_run_unknown(t *testing.T) {
 		t.Error("unexpected error, expected exec not found")
 	}
 }
+
+func Test_trim(t *testing.T) {
+	type args struct {
+		s string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "nil",
+			args: args{s: ""},
+			want: "",
+		},
+		{
+			name: "space",
+			args: args{s: " space "},
+			want: "space",
+		},
+		{
+			name: "nl",
+			args: args{s: "data\n"},
+			want: "data",
+		},
+		{
+			name: "combined",
+			args: args{s: " some data \n"},
+			want: "some data",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := trim(tt.args.s); got != tt.want {
+				t.Errorf("trim() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

id_bsd.go

@@ -5,7 +5,6 @@ package machineid
 import (
 	"bytes"
 	"os"
-	"strings"
 )
 
 const hostidPath = "/etc/hostid"
@@ -30,7 +29,7 @@ func readHostid() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(string(buf)), nil
+	return trim(string(buf)), nil
 }
 
 func readKenv() (string, error) {
@@ -39,5 +38,5 @@ func readKenv() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(buf.String()), nil
+	return trim(buf.String()), nil
 }

id_darwin.go

@@ -21,7 +21,7 @@ func machineID() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(id), nil
+	return trim(id), nil
 }
 
 func extractID(lines string) (string, error) {

id_linux.go

@@ -2,10 +2,6 @@
 
 package machineid
 
-import (
-	"strings"
-)
-
 const (
 	// dbusPath is the default path for dbus machine id.
 	dbusPath = "/var/lib/dbus/machine-id"
@@ -27,5 +23,5 @@ func machineID() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(string(id)), nil
+	return trim(string(id)), nil
 }