Replace UUID package, resolves upstream issue.

Resolves mh-cbon#31
cloudradar · Mar 20, 2019 · 3ca34d8 · 3ca34d8
1 parent 23f9c55
commit 3ca34d8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -8,5 +8,5 @@ import:
   version: ^1.1.1
 - package: github.com/mh-cbon/stringexec
   version: ~0.0.1
-- package: github.com/satori/go.uuid
-  version: ^1.1.0
+- package: github.com/google/uuid
+  version: ^1.1.1
diff --git a/manifest/index.go b/manifest/index.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver"
-	"github.com/satori/go.uuid"
+	"github.com/google/uuid"
 )
 
 // WixManifest is the struct to decode a wix.json file.
@@ -149,19 +149,19 @@ func (wixFile *WixManifest) Load(p string) error {
 func (wixFile *WixManifest) SetGuids(force bool) (bool, error) {
 	updated := false
 	if wixFile.UpgradeCode == "" || force {
-		wixFile.UpgradeCode = uuid.NewV4().String()
+		wixFile.UpgradeCode = uuid.Must(uuid.NewRandom()).String()
 		updated = true
 	}
 	if wixFile.Files.GUID == "" || force {
-		wixFile.Files.GUID = uuid.NewV4().String()
+		wixFile.Files.GUID = uuid.Must(uuid.NewRandom()).String()
 		updated = true
 	}
 	if (wixFile.Env.GUID == "" || force) && len(wixFile.Env.Vars) > 0 {
-		wixFile.Env.GUID = uuid.NewV4().String()
+		wixFile.Env.GUID = uuid.Must(uuid.NewRandom()).String()
 		updated = true
 	}
 	if (wixFile.Shortcuts.GUID == "" || force) && len(wixFile.Shortcuts.Items) > 0 {
-		wixFile.Shortcuts.GUID = uuid.NewV4().String()
+		wixFile.Shortcuts.GUID = uuid.Must(uuid.NewRandom()).String()
 		updated = true
 	}
 	return updated, nil