use freshly merged random.AlphaNum instead of our own random

This commit is contained in:
Adrien Delorme 2018-09-06 15:55:19 +02:00
parent 23762a1810
commit d89e1133c3
1 changed files with 3 additions and 12 deletions

View File

@ -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})