grim/convey

the uuid library changed their signature, so this fixes that

2018-01-06, Gary Kramlich
9850991e6f0a
Parents b70f2a116800
Children 2b2135d540db
the uuid library changed their signature, so this fixes that
3 files changed, 10 insertions(+), 5 deletions(-)
  • +2 -2
    docker/network.go
  • +2 -2
    docker/workspace.go
  • +6 -1
    util/id.go
    • --- a/docker/network.go Sat Dec 30 02:49:57 2017 -0600
    +++ b/docker/network.go Sat Jan 06 23:31:44 2018 -0600
    @@ -19,10 +19,10 @@
    import (
    "github.com/aphistic/gomol"
    - "github.com/satori/go.uuid"
    "bitbucket.org/rw_grim/convey/logging"
    "bitbucket.org/rw_grim/convey/state"
    + "bitbucket.org/rw_grim/convey/util"
    )
    type Network struct {
    @@ -40,7 +40,7 @@
    func NewNetwork(st *state.State) (*Network, error) {
    network := &Network{
    - name: uuid.NewV4().String(),
    + name: util.ID(),
    logger: logging.NewAdapter("network"),
    state: st,
    }
    --- a/docker/workspace.go Sat Dec 30 02:49:57 2017 -0600
    +++ b/docker/workspace.go Sat Jan 06 23:31:44 2018 -0600
    @@ -21,10 +21,10 @@
    "strings"
    "github.com/aphistic/gomol"
    - "github.com/satori/go.uuid"
    "bitbucket.org/rw_grim/convey/logging"
    "bitbucket.org/rw_grim/convey/state"
    + "bitbucket.org/rw_grim/convey/util"
    )
    type Workspace struct {
    @@ -63,7 +63,7 @@
    func NewWorkspace(st *state.State) (*Workspace, error) {
    ws := &Workspace{
    - name: uuid.NewV4().String(),
    + name: util.ID(),
    logger: logging.NewAdapter("workspace"),
    state: st,
    }
    --- a/util/id.go Sat Dec 30 02:49:57 2017 -0600
    +++ b/util/id.go Sat Jan 06 23:31:44 2018 -0600
    @@ -21,5 +21,10 @@
    // ShortID create short, unique identifier.
    func ShortID() string {
    - return uuid.NewV4().String()[0:6]
    + return ID()[0:6]
    }
    +
    +// ID returns a uuid4
    +func ID() string {
    + return uuid.Must(uuid.NewV4()).String()
    +}