Browse Source

switch the whole codebase over to the new uuid lib

sungo 11 months ago
parent
commit
588125d977

+ 0 - 9
Gopkg.lock

@@ -2,7 +2,6 @@
 
 
 [[projects]]
-  branch = "master"
   digest = "1:739c9ec359b9f06cf0fd0cd40dfb609340225956935595625419ed5e414f345a"
   name = "github.com/Bowery/prompt"
   packages = ["."]
@@ -285,13 +284,6 @@
   revision = "a6029d17e101ac1594adafea9e63fd8c988a8701"
   version = "v1.0.12"
 
-[[projects]]
-  digest = "1:274f67cb6fed9588ea2521ecdac05a6d62a8c51c074c1fccc6a49a40ba80e925"
-  name = "gopkg.in/satori/go.uuid.v1"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-  version = "v1.2.0"
 
 [[projects]]
   digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96"
@@ -321,7 +313,6 @@
     "github.com/spf13/pflag",
     "github.com/spf13/viper",
     "gopkg.in/h2non/gock.v1",
-    "gopkg.in/satori/go.uuid.v1",
   ]
   solver-name = "gps-cdcl"
   solver-version = 1

+ 0 - 4
Gopkg.toml

@@ -53,10 +53,6 @@
   name = "github.com/jawher/mow.cli"
   version = "1.0.4"
 
-[[constraint]]
-  name = "gopkg.in/satori/go.uuid.v1"
-  version = "1.1.0"
-
 [[constraint]]
   name = "github.com/gofrs/uuid"
   version = "3.2.0"

+ 1 - 1
pkg/cmd/corpus/main.go

@@ -12,12 +12,12 @@ import (
 	"io/ioutil"
 	"time"
 
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	_ "github.com/lib/pq"
 	homedir "github.com/mitchellh/go-homedir"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 var FailedCount = 0

+ 1 - 1
pkg/cmd/corpus/root.go

@@ -10,12 +10,12 @@ import (
 	"fmt"
 
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 var (

+ 1 - 1
pkg/cmd/tester/root.go

@@ -10,12 +10,12 @@ import (
 	"fmt"
 
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 const (

+ 1 - 1
pkg/cmd/tester/tester.go

@@ -17,12 +17,12 @@ import (
 	"time"
 
 	"github.com/dghubble/sling"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	_ "github.com/lib/pq"
 	homedir "github.com/mitchellh/go-homedir"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 var FailedCount = 0

+ 1 - 1
pkg/commands/admin/main.go

@@ -15,8 +15,8 @@ import (
 	gotree "github.com/DiSiqueira/GoTree"
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 func listAllUsers(app *cli.Cmd) {

+ 1 - 1
pkg/commands/devices/devices.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 const extendedDeviceTemplate = `

+ 1 - 1
pkg/commands/global/init.go

@@ -11,8 +11,8 @@ package global
 
 import (
 	"github.com/jawher/mow.cli"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 // GdcUUID is the UUID of the global datacenter provided by the user

+ 5 - 4
pkg/commands/global/rack.go

@@ -13,14 +13,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/jawher/mow.cli"
-	"github.com/joyent/conch-shell/pkg/conch"
-	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 	"io/ioutil"
 	"os"
 	"sort"
 	"strconv"
+
+	"github.com/jawher/mow.cli"
+	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
+	"github.com/joyent/conch-shell/pkg/util"
 )
 
 func displayOneGlobalRack(r conch.GlobalRack) {

+ 1 - 1
pkg/commands/global/room.go

@@ -13,8 +13,8 @@ import (
 	"fmt"
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 func roomGetAll(app *cli.Cmd) {

+ 1 - 1
pkg/commands/hardware/hardware.go

@@ -16,8 +16,8 @@ import (
 
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 const singleHWPTemplate = `

+ 1 - 1
pkg/commands/hardware/init.go

@@ -12,8 +12,8 @@ import (
 	"errors"
 
 	"github.com/jawher/mow.cli"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 // ProductUUID is the UUID of the hardware product we're looking at, as

+ 1 - 1
pkg/commands/profile/profile.go

@@ -15,9 +15,9 @@ import (
 	"github.com/Bowery/prompt"
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/config"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 func newProfile(app *cli.Cmd) {

+ 1 - 1
pkg/commands/validation/init.go

@@ -9,8 +9,8 @@ package validation
 
 import (
 	"github.com/jawher/mow.cli"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 var validationUUID uuid.UUID

+ 1 - 1
pkg/commands/validation/state.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 type validationStates []conch.ValidationState

+ 1 - 1
pkg/commands/workspaces/init.go

@@ -13,8 +13,8 @@ import (
 	"fmt"
 
 	"github.com/jawher/mow.cli"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 // WorkspaceUUID is the UUID of the workspace we're looking at, as gathered by

+ 1 - 1
pkg/commands/workspaces/user.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 func addUser(app *cli.Cmd) {

+ 1 - 1
pkg/commands/workspaces/workspaces.go

@@ -19,8 +19,8 @@ import (
 	gotree "github.com/DiSiqueira/GoTree"
 	"github.com/jawher/mow.cli"
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/util"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 type rackAssignedSlot struct {

+ 1 - 1
pkg/config/main.go

@@ -18,8 +18,8 @@ import (
 	"time"
 
 	"github.com/joyent/conch-shell/pkg/conch"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 	"github.com/joyent/conch-shell/pkg/config/obfuscate"
-	uuid "gopkg.in/satori/go.uuid.v1"
 )
 
 const (

+ 1 - 1
pkg/util/magic_ids.go

@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"regexp"
 
-	uuid "gopkg.in/satori/go.uuid.v1"
+	"github.com/joyent/conch-shell/pkg/conch/uuid"
 )
 
 // MagicWorkspaceID takes a string and tries to find a valid UUID. If the