More logging options

1 files changed, 19 insertions, 33 deletions

diff --git a/internal/util/util.go b/internal/util/util.go
index 555297a..d88ec28 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -1,55 +1,41 @@
 package util
 
 import (
-  "github.com/google/uuid"
-  "math/rand" // not crypto secure
-  "regexp"
-  "strings"
+	"github.com/google/uuid"
+	"math/rand" // not crypto secure
+	"regexp"
+	"strings"
 )
 
 const randHostnameCharset = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
 const randStringCharset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
 var (
-  // Up to 15 characters; only letters, digits, and hyphens (with hyphens not at the start or end).
-  randHostnameRegex = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9-]{0,14}[a-zA-Z0-9]$`)
+	// Up to 15 characters; only letters, digits, and hyphens (with hyphens not at the start or end).
+	randHostnameRegex = regexp.MustCompile(`^[a-zA-Z][a-zA-Z0-9-]{0,14}[a-zA-Z0-9]$`)
 )
 
 func RandomHostname() (hostname string) {
-  for {
-    // between 2 and 10 characters
-    if hostname = RandomStringFromCharset(randHostnameCharset, rand.Intn(8)+2); randHostnameRegex.MatchString(hostname) {
-      return
-    }
-  }
+	for {
+		// between 2 and 10 characters
+		if hostname = RandomStringFromCharset(randHostnameCharset, rand.Intn(8)+2); randHostnameRegex.MatchString(hostname) {
+			return
+		}
+	}
 }
 
 func RandomWindowsTempFile() string {
-  return `\Windows\Temp\` + strings.ToUpper(uuid.New().String())
+	return `\Windows\Temp\` + strings.ToUpper(uuid.New().String())
 }
 
 func RandomString() string {
-  return RandomStringFromCharset(randStringCharset, rand.Intn(10)+6)
+	return RandomStringFromCharset(randStringCharset, rand.Intn(10)+6)
 }
 
 func RandomStringFromCharset(charset string, length int) string {
-  b := make([]byte, length)
-  for i := range length {
-    b[i] = charset[rand.Intn(len(charset))]
-  }
-  return string(b)
-}
-
-func RandomStringIfBlank(s string) string {
-  if s == "" {
-    return RandomString()
-  }
-  return s
-}
-
-func CheckNullString(s string) string {
-  if !strings.HasSuffix(s, "\x00") {
-    return s + "\x00"
-  }
-  return s
+	b := make([]byte, length)
+	for i := range length {
+		b[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(b)
 }