From f44b3a428ff45d2d95ee9dfc058a52ef77551da7 Mon Sep 17 00:00:00 2001
From: Gabriel Handford <gabrielh@gmail.com>
Date: Thu, 19 May 2016 12:51:58 -0700
Subject: [PATCH] Fix string padding removal from prefix

---
 util/rand.go      | 3 ++-
 util/rand_test.go | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/rand.go b/util/rand.go
index 333394ee..336b4024 100644
--- a/util/rand.go
+++ b/util/rand.go
@@ -18,8 +18,9 @@ func RandomID(prefix string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	str := prefix + base32.StdEncoding.EncodeToString(buf)
+	str := base32.StdEncoding.EncodeToString(buf)
 	str = strings.Replace(str, "=", "", -1)
+	str = prefix + str
 	return str, nil
 }
 
diff --git a/util/rand_test.go b/util/rand_test.go
index fbde5e84..54a70e00 100644
--- a/util/rand_test.go
+++ b/util/rand_test.go
@@ -9,12 +9,12 @@ import (
 )
 
 func TestRandString(t *testing.T) {
-	s, err := RandomID("prefix.")
+	s, err := RandomID("prefix=")
 	t.Logf("Rand string: %s", s)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !strings.HasPrefix(s, "prefix.") {
+	if !strings.HasPrefix(s, "prefix=") {
 		t.Errorf("Invalid prefix: %s", s)
 	}
 	if len(s)-len("prefix.") != 52 {