From d89e1133c3304ee22ad30bd09d4aa7131e57d281 Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Thu, 6 Sep 2018 15:55:19 +0200 Subject: [PATCH] use freshly merged random.AlphaNum instead of our own random --- packer/rpc/ui.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/packer/rpc/ui.go b/packer/rpc/ui.go index afd73fd38..8678726ad 100644 --- a/packer/rpc/ui.go +++ b/packer/rpc/ui.go @@ -3,9 +3,10 @@ package rpc import ( "io" "log" - "math/rand" "net/rpc" + "github.com/hashicorp/packer/common/random" + "github.com/hashicorp/packer/packer" ) @@ -133,20 +134,10 @@ func (u *UiServer) Say(message *string, reply *interface{}) error { return nil } -func RandStringBytes(n int) string { // TODO(azr): remove before merging - const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" - - b := make([]byte, n) - for i := range b { - b[i] = letterBytes[rand.Intn(len(letterBytes))] - } - return string(b) -} - func (u *UiServer) ProgressBar(_ *string, reply *interface{}) error { bar := u.ui.ProgressBar() - callbackName := RandStringBytes(6) + callbackName := random.AlphaNum(6) log.Printf("registering progressbar %s", callbackName) err := u.register(callbackName, &RemoteProgressBarServer{bar})