Switch from satori/go.uuid to gofrs/uuid

satori/go.uuid has a known issue with random uuid generation.
gofrs/uuid is still maintained and has fixed the random uuid generation
issue present in satori/go.uuid

Signed-off-by: John Naulty <johnnaulty@bitgo.com>
This commit is contained in:
John Naulty
2019-12-14 10:27:00 -08:00
parent 96ca41ca9a
commit ff889283b8
10 changed files with 528 additions and 344 deletions
+6 -2
View File
@@ -27,8 +27,8 @@ import (
"strings"
"time"
uuid "github.com/gofrs/uuid"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
"github.com/sirupsen/logrus"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
@@ -167,6 +167,10 @@ func NewKubernetesRestorer(
resourceTerminatingTimeout time.Duration,
logger logrus.FieldLogger,
) (Restorer, error) {
veleroCloneUuid, err := uuid.NewV4()
if err != nil {
return nil, errors.WithStack(err)
}
return &kubernetesRestorer{
discoveryHelper: discoveryHelper,
dynamicFactory: dynamicFactory,
@@ -176,7 +180,7 @@ func NewKubernetesRestorer(
resourceTerminatingTimeout: resourceTerminatingTimeout,
resourcePriorities: resourcePriorities,
logger: logger,
pvRenamer: func(string) string { return "velero-clone-" + uuid.NewV4().String() },
pvRenamer: func(string) string { return "velero-clone-" + veleroCloneUuid.String() },
fileSystem: filesystem.NewFileSystem(),
}, nil
}