Switch to Scope Handling

README.md

@@ -100,10 +100,8 @@ s3-endpoint | Custom S3 endpoint. | |
 s3-region | region of the s3 bucket | eu-west-1 | S3_REGION
 s3-no-multipart | disables s3 multipart upload | false | |
 s3-path-style | Forces path style URLs, required for Minio. | false | |
-storj-endpoint | Satellite Address including Port | | STORJ_ENDPOINT
-storj-apikey | API Key to interact with the project | | STORJ_API_KEY
-storj-bucket | Bucket in which to store the data | | STORJ_BUCKET
-storj-enckey | Encryption Key for local file encryption | | STORJ_ENC_KEY
+storj-scope | Scope to use to access the project | | STORJ_SCOPE
+storj-apikey | API Key to interact with the project | | STORJ_BUCKET
 storj-skip-peer-ca | Skip's CA Peer Check for local environments | false | STORJ_SKIP_PEER_CA
 basedir | path storage for local/gdrive provider| |
 gdrive-client-json-filepath | path to oauth client json config for gdrive provider| |

cmd/cmd.go

@@ -392,15 +392,11 @@ func New() *Cmd {
 				options = append(options, server.UseStorage(storage))
 			}
 		case "storj":
-			if endpoint := c.String("storj-endpoint"); endpoint == "" {
-				panic("storj-endpoint not set.")
-			} else if apiKey := c.String("storj-apikey"); apiKey == "" {
-				panic("storj-apikey not set.")
+			if scope := c.String("storj-scope"); scope == "" {
+				panic("storj-scope not set.")
 			} else if bucket := c.String("storj-bucket"); bucket == "" {
-				panic("storj-enckey not set.")
-			} else if encKey := c.String("storj-enckey"); encKey == "" {
 				panic("storj-bucket not set.")
-			} else if storage, err := server.NewStorjStorage(endpoint, apiKey, bucket, encKey, c.Bool("storj-skip-peer-ca"), logger); err != nil {
+			} else if storage, err := server.NewStorjStorage(scope, bucket, c.Bool("storj-skip-peer-ca"), logger); err != nil {
 				panic(err)
 			} else {
 				options = append(options, server.UseStorage(storage))

go.mod

@@ -37,5 +37,5 @@ require (
 	google.golang.org/genproto v0.0.0-20191007162740-aa923e3a3354 // indirect
 	google.golang.org/grpc v1.24.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
-	storj.io/storj v0.24.5
+	storj.io/storj v0.26.0
 )