mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-02 03:27:54 +00:00
Use go-uuid's GenerateUUID in PutWAL and discart logical.UUID()
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/go-uuid"
|
||||
"github.com/hashicorp/vault/logical"
|
||||
)
|
||||
|
||||
@@ -43,7 +44,7 @@ func PutWAL(s logical.Storage, kind string, data interface{}) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
|
||||
id, err := logical.UUID()
|
||||
id, err := uuid.GenerateUUID()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
package logical
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"fmt"
|
||||
"time"
|
||||
)
|
||||
|
||||
// UUID returns a UUID.
|
||||
func UUID() (string, error) {
|
||||
unix := uint32(time.Now().UTC().Unix())
|
||||
|
||||
var b [12]byte
|
||||
if _, err := rand.Read(b[:]); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%08x-%04x-%04x-%04x-%04x%08x",
|
||||
unix, b[0:2], b[2:4], b[4:6], b[6:8], b[8:]),
|
||||
nil
|
||||
}
|
||||
Reference in New Issue
Block a user