JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/,private/: merge with private package

Browse Source 
Initially there were pkg and private packages, however for all practical
purposes there's no significant difference between them. It's clearer to
have a single private package - and when we do get a specific
abstraction that needs to be reused, we can move it to storj.io/common
or storj.io/private.

Change-Id: Ibc2036e67f312f5d63cb4a97f5a92e38ae413aa5
This commit is contained in:
Egon Elbre 2021-04-23 16:13:51 +03:00
parent c641ddcb54
commit 7802ab714f
48 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile.public
View File

@ -72,7 +72,7 @@ pipeline {
STORJ_TEST_COCKROACH_ALT = 'cockroach://root@localhost:26260/testcockroach?sslmode=disable'
STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/teststorj?sslmode=disable'
STORJ_TEST_DATABASES = 'crdb|pgx|cockroach://root@localhost:26259/testmetabase?sslmode=disable;pg|pgx|postgres://postgres@localhost/testmetabase?sslmode=disable'
COVERFLAGS = "${ env.BRANCH_NAME == 'main' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}"
COVERFLAGS = "${ env.BRANCH_NAME == 'main' ? '-coverprofile=.build/coverprofile -coverpkg=storj.io/storj/private/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/versioncontrol/...' : ''}"
}
steps {
sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testcockroach;\''

4
certificate/peer.go
View File

@ -17,8 +17,8 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/storj/certificate/authorization"
"storj.io/storj/certificate/certificatepb"
"storj.io/storj/pkg/revocation"
"storj.io/storj/pkg/server"
"storj.io/storj/private/revocation"
"storj.io/storj/private/server"
)
var (

2
certificate/peer_test.go
View File

@ -26,7 +26,7 @@ import (
"storj.io/storj/certificate/authorization"
"storj.io/storj/certificate/certificateclient"
"storj.io/storj/certificate/certificatepb"
"storj.io/storj/pkg/server"
"storj.io/storj/private/server"
)
// TODO: test sad path.

2
cmd/certificates/main.go
View File

@ -13,7 +13,7 @@ import (
"storj.io/private/process"
"storj.io/storj/certificate"
"storj.io/storj/certificate/authorization"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
_ "storj.io/storj/private/version" // This attaches version information during release builds.
)

2
cmd/connect-test/connecttest.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/common/rpc"
"storj.io/common/storj"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
)
func main() {

2
cmd/identity/certificate_authority.go
View File

@ -15,7 +15,7 @@ import (
"storj.io/common/peertls/extensions"
"storj.io/private/cfgstruct"
"storj.io/private/process"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
)
var (

2
cmd/identity/main.go
View File

@ -24,7 +24,7 @@ import (
"storj.io/private/process"
"storj.io/private/version"
"storj.io/storj/certificate/certificateclient"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
_ "storj.io/storj/private/version" // This attaches version information during release builds.
"storj.io/storj/private/version/checker"
)

2
cmd/identity/revocations.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/private/cfgstruct"
"storj.io/private/process"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
)
var (

2
cmd/satellite/api.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/context2"
"storj.io/private/process"
"storj.io/private/version"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
"storj.io/storj/satellite"
"storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/accounting/live"

2
cmd/satellite/gc.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/private/process"
"storj.io/private/version"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
"storj.io/storj/satellite"
"storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/satellitedb"

4
cmd/satellite/main.go
View File

@ -30,8 +30,8 @@ import (
_ "storj.io/private/process/googleprofiler" // This attaches google cloud profiler.
"storj.io/private/version"
"storj.io/storj/cmd/satellite/reports"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/lrucache"
"storj.io/storj/private/revocation"
_ "storj.io/storj/private/version" // This attaches version information during release builds.
"storj.io/storj/satellite"
"storj.io/storj/satellite/accounting"

2
cmd/satellite/repairer.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/errs2"
"storj.io/private/process"
"storj.io/private/version"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
"storj.io/storj/satellite"
"storj.io/storj/satellite/metainfo"
"storj.io/storj/satellite/orders"

2
cmd/storagenode/main.go
View File

@ -21,7 +21,7 @@ import (
"storj.io/private/cfgstruct"
"storj.io/private/process"
"storj.io/private/version"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
_ "storj.io/storj/private/version" // This attaches version information during release builds.
"storj.io/storj/storagenode"
"storj.io/storj/storagenode/apikeys"

2
cmd/uplink/cmd/root.go
View File

@ -24,7 +24,7 @@ import (
"storj.io/common/storj"
"storj.io/private/cfgstruct"
"storj.io/private/process"
"storj.io/storj/pkg/server"
"storj.io/storj/private/server"
"storj.io/storj/private/version/checker"
"storj.io/uplink"
privateAccess "storj.io/uplink/private/access"

0
pkg/lrucache/cache.go → private/lrucache/cache.go
View File

0
pkg/lrucache/cache_test.go → private/lrucache/cache_test.go
View File

0
pkg/quic/common.go → private/quic/common.go
View File

2
pkg/quic/conn.go → private/quic/conn.go
View File

@ -17,7 +17,7 @@ import (
"storj.io/common/memory"
"storj.io/common/rpc"
"storj.io/storj/pkg/quic/qtls"
"storj.io/storj/private/quic/qtls"
)
// Conn is a wrapper around a quic connection and fulfills net.Conn interface.

0
pkg/quic/connector.go → private/quic/connector.go
View File

0
pkg/quic/listener.go → private/quic/listener.go
View File

0
pkg/quic/qtls/go114.go → private/quic/qtls/go114.go
View File

0
pkg/quic/qtls/go115.go → private/quic/qtls/go115.go
View File

0
pkg/revocation/common.go → private/revocation/common.go
View File

0
pkg/revocation/db.go → private/revocation/db.go
View File

0
pkg/revocation/db_test.go → private/revocation/db_test.go
View File

0
pkg/revocation/extensions_test.go → private/revocation/extensions_test.go
View File

2
pkg/revocation/tlsopts_test.go → private/revocation/tlsopts_test.go
View File

@ -21,7 +21,7 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/common/storj"
"storj.io/common/testcontext"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
"storj.io/storj/private/testrevocation"
"storj.io/storj/storage"
)

0
pkg/server/common.go → private/server/common.go
View File

2
pkg/server/connector.go → private/server/connector.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/memory"
"storj.io/common/rpc"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
)
// HybridConnector implements a dialer that creates a connection using either

2
pkg/server/connector_test.go → private/server/connector_test.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/common/storj"
"storj.io/common/testcontext"
"storj.io/storj/pkg/server"
"storj.io/storj/private/server"
"storj.io/storj/private/testplanet"
)

2
pkg/server/listener.go → private/server/listener.go
View File

@ -12,7 +12,7 @@ import (
"storj.io/common/netutil"
"storj.io/common/rpc"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
)
// defaultUserTimeout is the value we use for the TCP_USER_TIMEOUT setting.

2
pkg/server/server.go → private/server/server.go
View File

@ -25,7 +25,7 @@ import (
"storj.io/drpc/drpcmux"
"storj.io/drpc/drpcserver"
jaeger "storj.io/monkit-jaeger"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
)
// Config holds server specific configuration parameters.

2
private/testplanet/rpc_test.go
View File

@ -18,7 +18,7 @@ import (
"storj.io/common/rpc"
"storj.io/common/storj"
"storj.io/common/testcontext"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
"storj.io/storj/private/testplanet"
"storj.io/storj/satellite"
"storj.io/storj/storagenode"

4
private/testplanet/satellite.go
View File

@ -26,8 +26,8 @@ import (
"storj.io/common/uuid"
"storj.io/private/debug"
"storj.io/private/version"
"storj.io/storj/pkg/revocation"
"storj.io/storj/pkg/server"
"storj.io/storj/private/revocation"
"storj.io/storj/private/server"
"storj.io/storj/private/testredis"
versionchecker "storj.io/storj/private/version/checker"
"storj.io/storj/private/web"

4
private/testplanet/storagenode.go
View File

@ -21,8 +21,8 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/common/storj"
"storj.io/private/debug"
"storj.io/storj/pkg/revocation"
"storj.io/storj/pkg/server"
"storj.io/storj/private/revocation"
"storj.io/storj/private/server"
"storj.io/storj/storage/filestore"
"storj.io/storj/storagenode"
"storj.io/storj/storagenode/bandwidth"

4
private/testplanet/uplink_test.go
View File

@ -23,8 +23,8 @@ import (
"storj.io/common/storj"
"storj.io/common/testcontext"
"storj.io/common/testrand"
"storj.io/storj/pkg/revocation"
"storj.io/storj/pkg/server"
"storj.io/storj/private/revocation"
"storj.io/storj/private/server"
"storj.io/storj/private/testplanet"
"storj.io/uplink"
"storj.io/uplink/private/metainfo"

2
private/testrevocation/db.go
View File

@ -10,7 +10,7 @@ import (
"storj.io/common/peertls/extensions"
"storj.io/common/testcontext"
"storj.io/storj/pkg/revocation"
"storj.io/storj/private/revocation"
"storj.io/storj/private/testredis"
"storj.io/storj/storage"
)

2
satellite/accounting/projectlimitcache.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/memory"
"storj.io/common/uuid"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
)
var (

2
satellite/api.go
View File

@ -25,10 +25,10 @@ import (
"storj.io/common/storj"
"storj.io/private/debug"
"storj.io/private/version"
"storj.io/storj/pkg/server"
"storj.io/storj/private/lifecycle"
"storj.io/storj/private/post"
"storj.io/storj/private/post/oauth2"
"storj.io/storj/private/server"
"storj.io/storj/private/version/checker"
"storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/analytics"

2
satellite/contact/service.go
View File

@ -16,7 +16,7 @@ import (
"storj.io/common/rpc"
"storj.io/common/rpc/rpcstatus"
"storj.io/common/storj"
"storj.io/storj/pkg/quic"
"storj.io/storj/private/quic"
"storj.io/storj/satellite/overlay"
)

2
satellite/metainfo/metainfo.go
View File

@ -22,7 +22,7 @@ import (
"storj.io/common/signing"
"storj.io/common/storj"
"storj.io/common/uuid"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
"storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/attribution"
"storj.io/storj/satellite/console"

2
satellite/peer.go
View File

@ -11,7 +11,7 @@ import (
"storj.io/common/identity"
"storj.io/private/debug"
"storj.io/storj/pkg/server"
"storj.io/storj/private/server"
version_checker "storj.io/storj/private/version/checker"
"storj.io/storj/satellite/accounting"
"storj.io/storj/satellite/accounting/live"

2
satellite/satellitedb/apikeys.go
View File

@ -10,7 +10,7 @@ import (
"github.com/zeebo/errs"
"storj.io/common/uuid"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
"storj.io/storj/satellite/console"
"storj.io/storj/satellite/satellitedb/dbx"
)

2
satellite/satellitedb/consoledb.go
View File

@ -9,7 +9,7 @@ import (
"github.com/zeebo/errs"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
"storj.io/storj/satellite/console"
"storj.io/storj/satellite/satellitedb/dbx"
)

2
satellite/satellitedb/database.go
View File

@ -14,7 +14,7 @@ import (
"storj.io/private/dbutil"
"storj.io/private/dbutil/pgutil"
"storj.io/private/tagsql"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
"storj.io/storj/private/migrate"
"storj.io/storj/satellite"
"storj.io/storj/satellite/accounting"

2
satellite/satellitedb/revocation.go
View File

@ -9,7 +9,7 @@ import (
"github.com/zeebo/errs"
"storj.io/storj/pkg/lrucache"
"storj.io/storj/private/lrucache"
"storj.io/storj/satellite/satellitedb/dbx"
)

2
storagenode/peer.go
View File

@ -26,9 +26,9 @@ import (
"storj.io/common/storj"
"storj.io/private/debug"
"storj.io/private/version"
"storj.io/storj/pkg/server"
"storj.io/storj/private/lifecycle"
"storj.io/storj/private/multinodepb"
"storj.io/storj/private/server"
"storj.io/storj/private/version/checker"
"storj.io/storj/storage"
"storj.io/storj/storage/filestore"

2
storagenode/preflight/localtime_test.go
View File

@ -20,7 +20,7 @@ import (
"storj.io/common/peertls/tlsopts"
"storj.io/common/rpc"
"storj.io/common/testcontext"
"storj.io/storj/pkg/server"
"storj.io/storj/private/server"
"storj.io/storj/private/testplanet"
"storj.io/storj/storagenode"
"storj.io/storj/storagenode/preflight"