Skip to content

Commit 8f9c384

Browse files
Replace deprecated github.com/satori/go.uuid lib (#1354)
Signed-off-by: Tim Vaillancourt <[email protected]>
1 parent 462930f commit 8f9c384

23 files changed

+1206
-3
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ require (
66
github.com/go-ini/ini v1.62.0
77
github.com/go-mysql-org/go-mysql v1.3.0
88
github.com/go-sql-driver/mysql v1.6.0
9+
github.com/google/uuid v1.4.0
910
github.com/openark/golib v0.0.0-20210531070646-355f37940af8
10-
github.com/satori/go.uuid v1.2.0
1111
golang.org/x/net v0.17.0
1212
golang.org/x/term v0.13.0
1313
golang.org/x/text v0.13.0
1414
)
1515

1616
require (
1717
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3 // indirect
18+
github.com/satori/go.uuid v1.2.0 // indirect
1819
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
1920
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect
2021
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 // indirect

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
1717
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
1818
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
1919
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
20+
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
21+
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2022
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
2123
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
2224
github.com/jmoiron/sqlx v1.3.3/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=

go/base/context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"sync/atomic"
1616
"time"
1717

18-
uuid "github.com/satori/go.uuid"
18+
uuid "github.com/google/uuid"
1919

2020
"github.com/github/gh-ost/go/mysql"
2121
"github.com/github/gh-ost/go/sql"
@@ -269,7 +269,7 @@ type ContextConfig struct {
269269

270270
func NewMigrationContext() *MigrationContext {
271271
return &MigrationContext{
272-
Uuid: uuid.NewV4().String(),
272+
Uuid: uuid.NewString(),
273273
defaultNumRetries: 60,
274274
ChunkSize: 1000,
275275
InspectorConnectionConfig: mysql.NewConnectionConfig(),

vendor/github.com/google/uuid/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/CONTRIBUTORS

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/LICENSE

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/README.md

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/dce.go

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/google/uuid/doc.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)