private: rename internal to private (#3573)

Jenkinsfile.public

@@ -57,7 +57,7 @@ pipeline {
                 stage('Tests') {
                     environment {
                         STORJ_POSTGRES_TEST = 'postgres://postgres@localhost/teststorj?sslmode=disable'
-                        COVERFLAGS = "${ env.BRANCH_NAME != 'master' ? '' : '-coverprofile=.build/coverprofile -coverpkg=-coverpkg=storj.io/storj/internal/...,storj.io/storj/lib/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/uplink/...,storj.io/storj/versioncontrol/...'}"
+                        COVERFLAGS = "${ env.BRANCH_NAME != 'master' ? '' : '-coverprofile=.build/coverprofile -coverpkg=-coverpkg=storj.io/storj/private/...,storj.io/storj/lib/...,storj.io/storj/pkg/...,storj.io/storj/satellite/...,storj.io/storj/storage/...,storj.io/storj/storagenode/...,storj.io/storj/uplink/...,storj.io/storj/versioncontrol/...'}"
                     }
                     steps {
                         sh 'psql -U postgres -c \'create database teststorj;\''

certificate/authorization/authorizations_test.go

@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"storj.io/storj/certificate/certificateclient"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/rpc"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
 )
 
 var (

certificate/authorization/db.go

@@ -10,9 +10,9 @@ import (
 
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/dbutil"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/extensions"
+	"storj.io/storj/private/dbutil"
 	"storj.io/storj/storage"
 	"storj.io/storj/storage/boltdb"
 	"storj.io/storj/storage/redis"

certificate/authorization/db_test.go

@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/rpc/rpcpeer"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
 	"storj.io/storj/storage"
 )
 

certificate/authorization/endpoint_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/errs2"
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/errs2"
+	"storj.io/storj/private/testcontext"
 )
 
 func TestEndpoint_Run_httpSuccess(t *testing.T) {

certificate/authorization/service_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/testcontext"
 )
 
 func TestService_GetOrCreate(t *testing.T) {

certificate/endpoint.go

@@ -9,11 +9,11 @@ import (
 	"go.uber.org/zap"
 
 	"storj.io/storj/certificate/authorization"
-	"storj.io/storj/internal/errs2"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/rpc/rpcpeer"
 	"storj.io/storj/pkg/rpc/rpcstatus"
+	"storj.io/storj/private/errs2"
 )
 
 // Endpoint implements pb.CertificatesServer.

certificate/peer.go

@@ -13,12 +13,12 @@ import (
 	"gopkg.in/spacemonkeygo/monkit.v2"
 
 	"storj.io/storj/certificate/authorization"
-	"storj.io/storj/internal/errs2"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/revocation"
 	"storj.io/storj/pkg/server"
+	"storj.io/storj/private/errs2"
 )
 
 var (

certificate/peer_test.go

@@ -17,8 +17,6 @@ import (
 	"storj.io/storj/certificate"
 	"storj.io/storj/certificate/authorization"
 	"storj.io/storj/certificate/certificateclient"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
@@ -27,6 +25,8 @@ import (
 	"storj.io/storj/pkg/rpc/rpcpeer"
 	"storj.io/storj/pkg/server"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
 )
 
 // TODO: test sad path

cmd/certificates/main.go

@@ -10,10 +10,10 @@ import (
 
 	"storj.io/storj/certificate"
 	"storj.io/storj/certificate/authorization"
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
+	"storj.io/storj/private/fpath"
 )
 
 var (

cmd/certificates/setup.go

@@ -11,8 +11,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"storj.io/storj/certificate/authorization"
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 var (

cmd/gateway/main.go

@@ -19,14 +19,14 @@ import (
 	"go.uber.org/zap"
 
 	"storj.io/storj/cmd/internal/wizard"
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/version"
-	"storj.io/storj/internal/version/checker"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/miniogw"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/version"
+	"storj.io/storj/private/version/checker"
 	"storj.io/storj/uplink"
 )
 

cmd/identity/batch.go

@@ -19,13 +19,13 @@ import (
 	"github.com/zeebo/errs"
 	"golang.org/x/sync/errgroup"
 
-	"storj.io/storj/internal/cui"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/pkcrypto"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/cui"
 )
 
 var (

cmd/identity/main.go

@@ -15,9 +15,6 @@ import (
 	"go.uber.org/zap"
 
 	"storj.io/storj/certificate/certificateclient"
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/version"
-	"storj.io/storj/internal/version/checker"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/extensions"
@@ -26,6 +23,9 @@ import (
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
 	"storj.io/storj/pkg/rpc"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/version"
+	"storj.io/storj/private/version/checker"
 )
 
 const (

cmd/internal/asset/asset.go

@@ -5,7 +5,7 @@
 //
 // To use the package you would define:
 //
-//     //go:generate go run ../internal/asset/generate/main.go -pkg main -dir ../../web/bootstrap -var embeddedAssets -out console.resource.go
+//     //go:generate go run ../private/asset/generate/main.go -pkg main -dir ../../web/bootstrap -var embeddedAssets -out console.resource.go
 //     var embeddedAssets http.FileSystem
 //
 // This will generate a new "console.resource.go" which contains the content of "../../web/bootstrap".

cmd/internal/asset/asset_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"storj.io/storj/cmd/internal/asset"
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/testcontext"
 )
 
 func TestAssets(t *testing.T) {

cmd/internal/asset/generate/main.go

@@ -33,7 +33,7 @@ func main() {
 	fmt.Fprintf(&code, "package %s\n\n", *packageName)
 
 	fmt.Fprintf(&code, "import (\n")
-	fmt.Fprintf(&code, "\t\t\"storj.io/cmd/internal/asset\"\n")
+	fmt.Fprintf(&code, "\t\t\"storj.io/cmd/private/asset\"\n")
 	fmt.Fprintf(&code, ")\n\n")
 
 	fmt.Fprintf(&code, "func init() {\n")

cmd/linksharing/main.go

@@ -13,12 +13,12 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/linksharing"
 	"storj.io/storj/linksharing/httpserver"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 // LinkSharing defines link sharing configuration

cmd/s3-benchmark/main.go

@@ -16,8 +16,8 @@ import (
 
 	"github.com/loov/hrtime"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/s3client"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/s3client"
 )
 
 func main() {

cmd/satellite/api.go

@@ -8,9 +8,9 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
+	"storj.io/storj/private/version"
 	"storj.io/storj/satellite"
 	"storj.io/storj/satellite/accounting/live"
 	"storj.io/storj/satellite/metainfo"

cmd/satellite/main.go

@@ -17,11 +17,11 @@ import (
 	"go.uber.org/zap"
 
 	"storj.io/storj/cmd/satellite/reports"
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/version"
 	"storj.io/storj/satellite"
 	"storj.io/storj/satellite/accounting/live"
 	"storj.io/storj/satellite/metainfo"

cmd/satellite/repairer.go

@@ -8,9 +8,9 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
+	"storj.io/storj/private/version"
 	"storj.io/storj/satellite"
 	"storj.io/storj/satellite/metainfo"
 	"storj.io/storj/satellite/satellitedb"

cmd/satellite/reports/attribution.go

@@ -16,7 +16,7 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/memory"
+	"storj.io/storj/private/memory"
 	"storj.io/storj/satellite/attribution"
 	"storj.io/storj/satellite/satellitedb"
 )

cmd/statreceiver/filter.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/zeebo/admission/admproto"
 
-	"storj.io/storj/internal/memory"
+	"storj.io/storj/private/memory"
 )
 
 // PacketFilter inspects a packet header to determine if it should be passed

cmd/statreceiver/main.go

@@ -14,9 +14,9 @@ import (
 	"github.com/zeebo/errs"
 
 	"storj.io/storj/cmd/statreceiver/luacfg"
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 // Config is the set of configuration values we care about

cmd/statreceiver/parser.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/zeebo/admission/admproto"
 
-	"storj.io/storj/internal/memory"
+	"storj.io/storj/private/memory"
 )
 
 // Parser is a PacketDest that sends data to a MetricDest

cmd/storagenode-updater/main.go

@@ -26,15 +26,15 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/errs2"
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/sync2"
-	"storj.io/storj/internal/version"
-	"storj.io/storj/internal/version/checker"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/errs2"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/sync2"
+	"storj.io/storj/private/version"
+	"storj.io/storj/private/version/checker"
 )
 
 const (

cmd/storagenode-updater/main_test.go

@@ -20,12 +20,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testrand"
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testrand"
+	"storj.io/storj/private/version"
 	"storj.io/storj/versioncontrol"
 )
 

cmd/storagenode/dashboard.go

@@ -18,11 +18,11 @@ import (
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/rpc"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/version"
 )
 
 const contactWindow = time.Hour * 2

cmd/storagenode/gracefulexit.go

@@ -17,11 +17,11 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/rpc"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 type gracefulExitClient struct {

cmd/storagenode/main.go

@@ -15,13 +15,13 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/revocation"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/version"
 	"storj.io/storj/storagenode"
 	"storj.io/storj/storagenode/storagenodedb"
 )

cmd/storj-sim/main.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
+	"storj.io/storj/private/fpath"
 )
 
 // Flags contains different flags for commands

cmd/storj-sim/network.go

@@ -22,12 +22,12 @@ import (
 	"github.com/zeebo/errs"
 	"golang.org/x/sync/errgroup"
 
-	"storj.io/storj/internal/dbutil/pgutil"
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/processgroup"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/dbutil/pgutil"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/processgroup"
 )
 
 const (

cmd/storj-sim/process.go

@@ -19,8 +19,8 @@ import (
 	"github.com/zeebo/errs"
 	"golang.org/x/sync/errgroup"
 
-	"storj.io/storj/internal/processgroup"
-	"storj.io/storj/internal/sync2"
+	"storj.io/storj/private/processgroup"
+	"storj.io/storj/private/sync2"
 )
 
 // Processes contains list of processes

cmd/uplink/cmd/cat.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 func init() {

cmd/uplink/cmd/common.go

@@ -4,8 +4,8 @@
 package cmd
 
 import (
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/cfgstruct"
+	"storj.io/storj/private/fpath"
 )
 
 func getConfDir() string {

cmd/uplink/cmd/cp.go

@@ -17,9 +17,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/fpath"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 var (

cmd/uplink/cmd/cp_test.go

@@ -11,9 +11,9 @@ import (
 	"sync"
 	"testing"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/s3client"
-	"storj.io/storj/internal/testrand"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/s3client"
+	"storj.io/storj/private/testrand"
 )
 
 var benchmarkCases = []struct {

cmd/uplink/cmd/ls.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
 )
 
 var (

cmd/uplink/cmd/mb.go

@@ -9,11 +9,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/memory"
 )
 
 func init() {

cmd/uplink/cmd/meta_get.go

@@ -10,8 +10,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 func init() {

cmd/uplink/cmd/meta_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
-	"storj.io/storj/internal/testrand"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
+	"storj.io/storj/private/testrand"
 )
 
 func min(x, y int) int {

cmd/uplink/cmd/put.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 func init() {

cmd/uplink/cmd/rb.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
 )
 
 func init() {

cmd/uplink/cmd/rm.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 func init() {

cmd/uplink/cmd/root.go

@@ -15,13 +15,13 @@ import (
 	"github.com/zeebo/errs"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/fpath"
-	"storj.io/storj/internal/version"
-	"storj.io/storj/internal/version/checker"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/fpath"
+	"storj.io/storj/private/version"
+	"storj.io/storj/private/version/checker"
 	"storj.io/storj/uplink"
 )
 

cmd/uplink/cmd/setup.go

@@ -14,10 +14,10 @@ import (
 	"github.com/zeebo/errs"
 
 	"storj.io/storj/cmd/internal/wizard"
-	"storj.io/storj/internal/fpath"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 )
 
 var (

cmd/uplink/cmd/share.go

@@ -13,11 +13,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/fpath"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/macaroon"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 	"storj.io/storj/uplink"
 )
 

cmd/versioncontrol/main.go

@@ -11,9 +11,9 @@ import (
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/fpath"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/process"
+	"storj.io/storj/private/fpath"
 	"storj.io/storj/versioncontrol"
 )
 

lib/uplink-gomobile/scope.go

@@ -6,7 +6,7 @@ package mobile
 import (
 	"context"
 
-	"storj.io/storj/internal/fpath"
+	"storj.io/storj/private/fpath"
 )
 
 type scope struct {

lib/uplink-gomobile/uplink.go

@@ -6,9 +6,9 @@ package mobile
 import (
 	"fmt"
 
-	"storj.io/storj/internal/memory"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 // Config represents configuration options for an Uplink

lib/uplink/bucket_attrs_test.go

@@ -13,12 +13,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
+	"storj.io/storj/private/testrand"
 )
 
 type testConfig struct {

lib/uplink/encryption_test.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
+	"storj.io/storj/private/testrand"
 )
 
 func TestAllowedPathPrefixListing(t *testing.T) {

lib/uplink/examples_test.go

@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
 	"storj.io/storj/lib/uplink"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 )
 
 func TestBucketExamples(t *testing.T) {

lib/uplink/list_test.go

@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 )
 
 type expectedResult struct {

lib/uplink/project.go

@@ -9,10 +9,10 @@ import (
 	"github.com/skyrings/skyring-common/tools/uuid"
 	"github.com/vivint/infectious"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/encryption"
 	"storj.io/storj/pkg/rpc"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 	"storj.io/storj/uplink/ecclient"
 	"storj.io/storj/uplink/eestream"
 	"storj.io/storj/uplink/metainfo"

lib/uplink/project_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 )
 
 func TestProjectListBuckets(t *testing.T) {

lib/uplink/uplink.go

@@ -9,10 +9,10 @@ import (
 
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/rpc"
+	"storj.io/storj/private/memory"
 	"storj.io/storj/uplink/metainfo"
 	"storj.io/storj/uplink/metainfo/kvmetainfo"
 )

lib/uplink/uplink_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/testcontext"
 )
 
 // TestUplinkConfigDefaults tests that the uplink configuration gets the correct defaults applied

lib/uplinkc/object.go

@@ -12,9 +12,9 @@ import (
 	"time"
 	"unsafe"
 
-	"storj.io/storj/internal/errs2"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/errs2"
 )
 
 // Object is a scoped uplink.Object

lib/uplinkc/scope.go

@@ -6,7 +6,7 @@ package main
 import (
 	"context"
 
-	"storj.io/storj/internal/fpath"
+	"storj.io/storj/private/fpath"
 )
 
 // scope implements nesting context for foreign api.

lib/uplinkc/testdata_test.go

@@ -14,8 +14,8 @@ import (
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 )
 
 func RunPlanet(t *testing.T, run func(ctx *testcontext.Context, planet *testplanet.Planet)) {

lib/uplinkc/uplink.go

@@ -9,9 +9,10 @@ import "C"
 import (
 	"fmt"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/lib/uplink"
 	"time"
+
+	"storj.io/storj/lib/uplink"
+	"storj.io/storj/private/memory"
 )
 
 var universe = newHandles()

linksharing/handler_test.go

@@ -14,10 +14,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 )
 
 func TestNewHandler(t *testing.T) {

linksharing/httpserver/server.go

@@ -14,7 +14,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
-	"storj.io/storj/internal/errs2"
+	"storj.io/storj/private/errs2"
 )
 
 const (

linksharing/httpserver/server_test.go

@@ -21,8 +21,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/testcontext"
 	"storj.io/storj/pkg/pkcrypto"
+	"storj.io/storj/private/testcontext"
 )
 
 var (

pkg/auth/grpcauth/apikey_test.go

@@ -14,10 +14,10 @@ import (
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 	"google.golang.org/grpc/status"
 
-	"storj.io/storj/internal/errs2"
-	"storj.io/storj/internal/testcontext"
 	"storj.io/storj/pkg/auth"
 	"storj.io/storj/pkg/auth/grpcauth"
+	"storj.io/storj/private/errs2"
+	"storj.io/storj/private/testcontext"
 )
 
 func TestAPIKey(t *testing.T) {

pkg/bloomfilter/filter.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 const (

pkg/bloomfilter/filter_test.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/bloomfilter"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/testrand"
 )
 
 func TestNoFalsePositive(t *testing.T) {

pkg/cfgstruct/bind.go

@@ -16,7 +16,7 @@ import (
 	"github.com/spf13/pflag"
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/version"
+	"storj.io/storj/private/version"
 )
 
 const (

pkg/cfgstruct/bind_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 func assertEqual(actual, expected interface{}) {

pkg/encryption/aesgcm_test.go

@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"storj.io/storj/internal/testrand"
+	"storj.io/storj/private/testrand"
 )
 
 func TestAesGcm(t *testing.T) {

pkg/encryption/encryption_test.go

@@ -12,11 +12,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/encryption"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testrand"
 	"storj.io/storj/uplink/eestream"
 )
 

pkg/encryption/password.go

@@ -11,8 +11,8 @@ import (
 	"github.com/zeebo/errs"
 	"golang.org/x/crypto/argon2"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 func sha256hmac(key, data []byte) ([]byte, error) {

pkg/encryption/path_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/paths"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testrand"
 )
 
 func newStore(key storj.Key) *Store {

pkg/encryption/secretbox_test.go

@@ -8,7 +8,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"storj.io/storj/internal/testrand"
+	"storj.io/storj/private/testrand"
 )
 
 func TestSecretbox(t *testing.T) {

pkg/encryption/transform.go

@@ -11,8 +11,8 @@ import (
 
 	monkit "gopkg.in/spacemonkeygo/monkit.v2"
 
-	"storj.io/storj/internal/readcloser"
 	"storj.io/storj/pkg/ranger"
+	"storj.io/storj/private/readcloser"
 )
 
 var mon = monkit.Package()

pkg/encryption/transform_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"storj.io/storj/internal/testrand"
+	"storj.io/storj/private/testrand"
 )
 
 func TestCalcEncompassingBlocks(t *testing.T) {

pkg/identity/certificate_authority_test.go

@@ -13,13 +13,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testrand"
 )
 
 func TestNewCA(t *testing.T) {

pkg/identity/identity_test.go

@@ -18,16 +18,16 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testpeertls"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/pkcrypto"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testpeertls"
+	"storj.io/storj/private/testrand"
 )
 
 func TestPeerIdentityFromCertChain(t *testing.T) {

pkg/identity/utils.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/fpath"
+	"storj.io/storj/private/fpath"
 )
 
 // TLSFilesStatus is the status of keys

pkg/miniogw/gateway.go

@@ -15,9 +15,9 @@ import (
 	"github.com/zeebo/errs"
 	monkit "gopkg.in/spacemonkeygo/monkit.v2"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 	"storj.io/storj/uplink/storage/streams"
 	"storj.io/storj/uplink/stream"
 )

pkg/miniogw/gateway_test.go

@@ -19,13 +19,13 @@ import (
 	"github.com/vivint/infectious"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/memory"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testplanet"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/macaroon"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testplanet"
 	"storj.io/storj/satellite/console"
 	"storj.io/storj/uplink/ecclient"
 	"storj.io/storj/uplink/eestream"

pkg/miniogw/integration_test.go

@@ -17,14 +17,14 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 
-	"storj.io/storj/internal/s3client"
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testplanet"
 	libuplink "storj.io/storj/lib/uplink"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/miniogw"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/s3client"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testplanet"
 	"storj.io/storj/satellite/console"
 	"storj.io/storj/uplink"
 )

pkg/peertls/extensions/extensions_test.go

@@ -13,10 +13,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/testpeertls"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testpeertls"
 )
 
 func TestHandlers_Register(t *testing.T) {

pkg/peertls/extensions/revocations_test.go

@@ -12,13 +12,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testpeertls"
-	"storj.io/storj/internal/testrevocation"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testpeertls"
+	"storj.io/storj/private/testrevocation"
 	"storj.io/storj/storage"
 )
 

pkg/peertls/peertls_test.go

@@ -16,12 +16,12 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/zeebo/errs"
 
-	"storj.io/storj/internal/testpeertls"
-	"storj.io/storj/internal/testrand"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/pkcrypto"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testpeertls"
+	"storj.io/storj/private/testrand"
 )
 
 func TestNewCert_CA(t *testing.T) {

pkg/peertls/tlsopts/options_test.go

@@ -11,9 +11,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testplanet"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
@@ -21,6 +18,9 @@ import (
 	"storj.io/storj/pkg/revocation"
 	"storj.io/storj/pkg/rpc"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testplanet"
 )
 
 func TestNewOptions(t *testing.T) {

pkg/peertls/tlsopts/tls_test.go

@@ -11,15 +11,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testidentity"
-	"storj.io/storj/internal/testpeertls"
-	"storj.io/storj/internal/testrevocation"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testidentity"
+	"storj.io/storj/private/testpeertls"
+	"storj.io/storj/private/testrevocation"
 	"storj.io/storj/storage"
 )
 

pkg/process/debug.go

@@ -15,7 +15,7 @@ import (
 	"gopkg.in/spacemonkeygo/monkit.v2"
 	"gopkg.in/spacemonkeygo/monkit.v2/present"
 
-	"storj.io/storj/internal/version/checker"
+	"storj.io/storj/private/version/checker"
 )
 
 var (

pkg/process/exec.go

@@ -11,7 +11,7 @@ import (
 	"github.com/spf13/cobra"
 
 	// We use a blank import here to get the side effects from the init function in version
-	_ "storj.io/storj/internal/version"
+	_ "storj.io/storj/private/version"
 )
 
 func init() {

pkg/process/exec_conf.go

@@ -27,8 +27,8 @@ import (
 	"gopkg.in/spacemonkeygo/monkit.v2/collect"
 	"gopkg.in/spacemonkeygo/monkit.v2/present"
 
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/cfgstruct"
+	"storj.io/storj/private/version"
 )
 
 // DefaultCfgFilename is the default filename used for storing a configuration.

pkg/process/exec_conf_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/testcontext"
 )
 
 func setenv(key, value string) func() {

pkg/process/metrics.go

@@ -15,10 +15,10 @@ import (
 	monkit "gopkg.in/spacemonkeygo/monkit.v2"
 	"gopkg.in/spacemonkeygo/monkit.v2/environment"
 
-	"storj.io/storj/internal/version"
 	"storj.io/storj/pkg/cfgstruct"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/telemetry"
+	"storj.io/storj/private/version"
 )
 
 var (

pkg/ranger/file_test.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"testing"
 
-	"storj.io/storj/internal/testcontext"
+	"storj.io/storj/private/testcontext"
 )
 
 func TestFileRanger(t *testing.T) {

pkg/ranger/reader.go

@@ -11,7 +11,7 @@ import (
 
 	monkit "gopkg.in/spacemonkeygo/monkit.v2"
 
-	"storj.io/storj/internal/readcloser"
+	"storj.io/storj/private/readcloser"
 )
 
 var mon = monkit.Package()

pkg/revocation/common.go

@@ -4,9 +4,9 @@
 package revocation
 
 import (
-	"storj.io/storj/internal/dbutil"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/peertls/tlsopts"
+	"storj.io/storj/private/dbutil"
 	"storj.io/storj/storage/boltdb"
 	"storj.io/storj/storage/redis"
 )

pkg/revocation/db_test.go

@@ -12,13 +12,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"storj.io/storj/internal/testcontext"
-	"storj.io/storj/internal/testpeertls"
-	"storj.io/storj/internal/testrevocation"
 	"storj.io/storj/pkg/identity"
 	"storj.io/storj/pkg/peertls"
 	"storj.io/storj/pkg/peertls/extensions"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/testcontext"
+	"storj.io/storj/private/testpeertls"
+	"storj.io/storj/private/testrevocation"
 	"storj.io/storj/storage"
 )
 

pkg/rpc/common.go

@@ -10,7 +10,7 @@ import (
 	"github.com/zeebo/errs"
 	"gopkg.in/spacemonkeygo/monkit.v2"
 
-	"storj.io/storj/internal/memory"
+	"storj.io/storj/private/memory"
 )
 
 //go:generate go run gen.go ../pb drpc compat_drpc.go

pkg/rpc/dial.go

@@ -11,10 +11,10 @@ import (
 
 	"go.uber.org/zap"
 
-	"storj.io/storj/internal/memory"
 	"storj.io/storj/pkg/pb"
 	"storj.io/storj/pkg/peertls/tlsopts"
 	"storj.io/storj/pkg/storj"
+	"storj.io/storj/private/memory"
 )
 
 // Dialer holds configuration for dialing.