Skip to content

Commit fdcc6f8

Browse files
committed
Migrate from github.com/gofrs/uuid to github.com/google/uuid
github.com/google/uuid is used by github.com/go-openapi. We don't have to have 2 UUID implementations in our transitive dependencies. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent c4370a9 commit fdcc6f8

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/go-openapi/strfmt v0.20.3
1212
github.com/go-openapi/swag v0.19.15
1313
github.com/go-openapi/validate v0.20.3
14-
github.com/gofrs/uuid v3.3.0+incompatible
14+
github.com/google/uuid v1.3.0
1515
github.com/hashicorp/go-multierror v1.1.1
1616
github.com/pkg/errors v0.9.1
1717
github.com/sirupsen/logrus v1.8.1

go.sum

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGt
161161
github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
162162
github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
163163
github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
164-
github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
165-
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
166164
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
167165
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
168166
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -179,8 +177,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
179177
github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
180178
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
181179
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
182-
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
183180
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
181+
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
182+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
184183
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
185184
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
186185
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=

machine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
"github.com/containerd/fifo"
3333
"github.com/containernetworking/plugins/pkg/ns"
34-
"github.com/gofrs/uuid"
34+
"github.com/google/uuid"
3535
"github.com/hashicorp/go-multierror"
3636
"github.com/pkg/errors"
3737
log "github.com/sirupsen/logrus"
@@ -323,11 +323,11 @@ func NewMachine(ctx context.Context, cfg Config, opts ...Opt) (*Machine, error)
323323
}
324324

325325
if cfg.VMID == "" {
326-
randomID, err := uuid.NewV4()
326+
id, err := uuid.NewRandom()
327327
if err != nil {
328328
return nil, errors.Wrap(err, "failed to create random ID for VMID")
329329
}
330-
cfg.VMID = randomID.String()
330+
cfg.VMID = id.String()
331331
}
332332

333333
m.Handlers = defaultHandlers

0 commit comments

Comments
 (0)