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

cmd/uplink/cmd/setup.go: Access Grant vs API Key error messaging

Browse Source 
Provide a clearer error message to users who confuse the API Key with
the Access Grant and suggest the right command to them.

Change-Id: If73ae8cde140b68a19f4cfc3f59bb88a3b74c9c1
This commit is contained in:
Caleb Case 2021-01-26 14:00:52 -05:00
parent 93e8413617
commit d2148edcdb
No known key found for this signature in database
GPG Key ID: BB367E399EBB2B9D
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/uplink/cmd/setup.go
View File

@ -9,12 +9,14 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/zeebo/errs"
"storj.io/private/cfgstruct" "storj.io/private/cfgstruct"
"storj.io/private/process" "storj.io/private/process"
"storj.io/storj/cmd/internal/wizard" "storj.io/storj/cmd/internal/wizard"
"storj.io/uplink" "storj.io/uplink"
"storj.io/uplink/backcomp" "storj.io/uplink/backcomp"
"storj.io/uplink/private/access2"
) )
var ( var (
@ -108,7 +110,12 @@ func cmdSetup(cmd *cobra.Command, args []string) (err error) {
access, err = backcomp.RequestAccessWithPassphraseAndConcurrency(ctx, uplinkConfig, satelliteAddress, apiKeyString, passphrase, uint8(setupCfg.PBKDFConcurrency)) access, err = backcomp.RequestAccessWithPassphraseAndConcurrency(ctx, uplinkConfig, satelliteAddress, apiKeyString, passphrase, uint8(setupCfg.PBKDFConcurrency))
} }
if err != nil { if err != nil {
return Error.Wrap(err) _, err2 := access2.ParseAccess(apiKeyString)
if err2 == nil {
err2 = Error.New("API key appears to be an access grant: try running `uplink import` instead")
}
return errs.Combine(err, err2)
} }
accessData, err := access.Serialize() accessData, err := access.Serialize()
if err != nil { if err != nil {