private/dbutil: use dbutil and tagsql from storj.io/private

Initially we duplicated the code to avoid large scale changes to
the packages. Now we are past metainfo refactor we can remove the
duplication.

Change-Id: I9d0b2756cc6e2a2f4d576afa408a15273a7e1cef

certificate/authorization/db.go

@@ -12,7 +12,7 @@ import (
 
 	"storj.io/common/identity"
 	"storj.io/common/peertls/extensions"
-	"storj.io/storj/private/dbutil"
+	"storj.io/private/dbutil"
 	"storj.io/storj/storage"
 	"storj.io/storj/storage/boltdb"
 	"storj.io/storj/storage/redis"

cmd/metabase-createdat-migration/main_test.go

@@ -16,9 +16,9 @@ import (
 	"storj.io/common/testcontext"
 	"storj.io/common/testrand"
 	"storj.io/common/uuid"
+	"storj.io/private/dbutil"
+	"storj.io/private/dbutil/tempdb"
 	migrator "storj.io/storj/cmd/metabase-createdat-migration"
-	"storj.io/storj/private/dbutil"
-	"storj.io/storj/private/dbutil/tempdb"
 	"storj.io/storj/satellite/metabase"
 	"storj.io/storj/satellite/metainfo"
 	"storj.io/storj/satellite/satellitedb/satellitedbtest"

cmd/satellite/billing.go

@@ -14,7 +14,7 @@ import (
 
 	"storj.io/common/storj"
 	"storj.io/common/uuid"
-	"storj.io/storj/private/dbutil"
+	"storj.io/private/dbutil"
 	"storj.io/storj/satellite"
 	"storj.io/storj/satellite/payments/stripecoinpayments"
 	"storj.io/storj/satellite/satellitedb"

cmd/storj-sim/network.go

@@ -30,8 +30,8 @@ import (
 	"storj.io/common/pb"
 	"storj.io/common/processgroup"
 	"storj.io/common/storj"
-	"storj.io/storj/private/dbutil"
-	"storj.io/storj/private/dbutil/pgutil"
+	"storj.io/private/dbutil"
+	"storj.io/private/dbutil/pgutil"
 	"storj.io/uplink"
 )
 

go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
 	github.com/shopspring/decimal v1.2.0
 	github.com/spacemonkeygo/monkit/v3 v3.0.10
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.1
 	github.com/stretchr/testify v1.7.0
@@ -43,14 +43,14 @@ require (
 	go.uber.org/zap v1.16.0
 	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c
+	golang.org/x/sys v0.0.0-20210415045647-66c3f260301c
 	golang.org/x/term v0.0.0-20201117132131-f5c789dd3221
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
 	google.golang.org/api v0.20.0 // indirect
 	gopkg.in/segmentio/analytics-go.v3 v3.1.0
 	storj.io/common v0.0.0-20210419115916-eabb53ea1332
 	storj.io/drpc v0.0.20
 	storj.io/monkit-jaeger v0.0.0-20210225162224-66fb37637bf6
-	storj.io/private v0.0.0-20210403210935-5fd57695864c
+	storj.io/private v0.0.0-20210423085237-5af81f2a2b21
 	storj.io/uplink v1.4.7-0.20210421171443-53fab7d9387c
 )

multinode/multinodedb/database.go

@@ -11,12 +11,12 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
+	"storj.io/private/dbutil"
+	"storj.io/private/dbutil/pgutil"
 	"storj.io/storj/multinode"
 	"storj.io/storj/multinode/console"
 	"storj.io/storj/multinode/multinodedb/dbx"
 	"storj.io/storj/multinode/nodes"
-	"storj.io/storj/private/dbutil"
-	"storj.io/storj/private/dbutil/pgutil"
 )
 
 var (

multinode/multinodedb/dbx/gen.sh

@@ -11,7 +11,7 @@ perl -0777 -pi \
   -e 's,\t"fmt"\n,\t"fmt"\n\t"math/rand"\n,' \
   multinodedb.dbx.go
 perl -0777 -pi \
-  -e 's,\t"math/rand"\n\),\n\t"storj.io/storj/private/tagsql"\n\),' \
+  -e 's,\t"math/rand"\n\),\n\t"storj.io/private/tagsql"\n\),' \
   multinodedb.dbx.go
 perl -0777 -pi \
   -e 's/type DB struct \{\n\t\*sql\.DB/type DB struct \{\n\ttagsql.DB/' \

multinode/multinodedb/dbx/multinodedb.dbx.go

@@ -22,7 +22,7 @@ import (
 	_ "github.com/jackc/pgx/v4/stdlib"
 	"github.com/mattn/go-sqlite3"
 
-	"storj.io/storj/private/tagsql"
+	"storj.io/private/tagsql"
 )
 
 // Prevent conditional imports from causing build failures

multinode/multinodedb/multinodedbtest/run.go

@@ -15,13 +15,13 @@ import (
 	"go.uber.org/zap/zaptest"
 
 	"storj.io/common/testcontext"
+	"storj.io/private/dbutil"
+	"storj.io/private/dbutil/pgtest"
+	"storj.io/private/dbutil/pgutil"
+	"storj.io/private/dbutil/tempdb"
 	"storj.io/storj/multinode"
 	"storj.io/storj/multinode/multinodedb"
 	"storj.io/storj/multinode/multinodedb/dbx"
-	"storj.io/storj/private/dbutil"
-	"storj.io/storj/private/dbutil/pgtest"
-	"storj.io/storj/private/dbutil/pgutil"
-	"storj.io/storj/private/dbutil/tempdb"
 )
 
 // Database describes a test database.

pkg/revocation/common.go

@@ -8,7 +8,7 @@ import (
 
 	"storj.io/common/peertls/extensions"
 	"storj.io/common/peertls/tlsopts"
-	"storj.io/storj/private/dbutil"
+	"storj.io/private/dbutil"
 	"storj.io/storj/storage/boltdb"
 	"storj.io/storj/storage/redis"
 )