backends: remove log.Fatal and replace with error returns #5234

This changes the Config interface so that it returns an error.

fs/config/authorize.go

@@ -60,7 +60,10 @@ func Authorize(ctx context.Context, args []string, noAutoBrowser bool) error {
 	m.AddSetter(outM)
 	m.AddGetter(outM, configmap.PriorityNormal)
 
-	ri.Config(ctx, name, m)
+	err = ri.Config(ctx, name, m)
+	if err != nil {
+		return err
+	}
 
 	// Print the code for the user to paste
 	out := outM["token"]

fs/config/config.go

@@ -455,7 +455,10 @@ func UpdateRemote(ctx context.Context, name string, keyValues rc.Params, doObscu
 		}
 		LoadedData().SetValue(name, k, vStr)
 	}
-	RemoteConfig(ctx, name)
+	err = RemoteConfig(ctx, name)
+	if err != nil {
+		return err
+	}
 	SaveConfig()
 	cache.ClearConfig(name) // remove any remotes based on this config from the cache
 	return nil

fs/config/ui.go

@@ -270,13 +270,14 @@ func OkRemote(name string) bool {
 }
 
 // RemoteConfig runs the config helper for the remote if needed
-func RemoteConfig(ctx context.Context, name string) {
+func RemoteConfig(ctx context.Context, name string) error {
 	fmt.Printf("Remote config\n")
 	f := mustFindByName(name)
 	if f.Config != nil {
 		m := fs.ConfigMap(f, name, nil)
-		f.Config(ctx, name, m)
+		return f.Config(ctx, name, m)
 	}
+	return nil
 }
 
 // matchProvider returns true if provider matches the providerConfig string.
@@ -456,7 +457,7 @@ func editOptions(ri *fs.RegInfo, name string, isNew bool) {
 }
 
 // NewRemote make a new remote from its name
-func NewRemote(ctx context.Context, name string) {
+func NewRemote(ctx context.Context, name string) error {
 	var (
 		newType string
 		ri      *fs.RegInfo
@@ -476,16 +477,19 @@ func NewRemote(ctx context.Context, name string) {
 	LoadedData().SetValue(name, "type", newType)
 
 	editOptions(ri, name, true)
-	RemoteConfig(ctx, name)
+	err = RemoteConfig(ctx, name)
+	if err != nil {
+		return err
+	}
 	if OkRemote(name) {
 		SaveConfig()
-		return
+		return nil
 	}
-	EditRemote(ctx, ri, name)
+	return EditRemote(ctx, ri, name)
 }
 
 // EditRemote gets the user to edit a remote
-func EditRemote(ctx context.Context, ri *fs.RegInfo, name string) {
+func EditRemote(ctx context.Context, ri *fs.RegInfo, name string) error {
 	ShowRemote(name)
 	fmt.Printf("Edit remote\n")
 	for {
@@ -495,7 +499,7 @@ func EditRemote(ctx context.Context, ri *fs.RegInfo, name string) {
 		}
 	}
 	SaveConfig()
-	RemoteConfig(ctx, name)
+	return RemoteConfig(ctx, name)
 }
 
 // DeleteRemote gets the user to delete a remote
@@ -560,7 +564,7 @@ func ShowConfig() {
 }
 
 // EditConfig edits the config file interactively
-func EditConfig(ctx context.Context) {
+func EditConfig(ctx context.Context) (err error) {
 	for {
 		haveRemotes := len(LoadedData().GetSectionList()) != 0
 		what := []string{"eEdit existing remote", "nNew remote", "dDelete remote", "rRename remote", "cCopy remote", "sSet configuration password", "qQuit config"}
@@ -577,9 +581,15 @@ func EditConfig(ctx context.Context) {
 		case 'e':
 			name := ChooseRemote()
 			fs := mustFindByName(name)
-			EditRemote(ctx, fs, name)
+			err = EditRemote(ctx, fs, name)
+			if err != nil {
+				return err
+			}
 		case 'n':
-			NewRemote(ctx, NewRemoteName())
+			err = NewRemote(ctx, NewRemoteName())
+			if err != nil {
+				return err
+			}
 		case 'd':
 			name := ChooseRemote()
 			DeleteRemote(name)
@@ -590,8 +600,7 @@ func EditConfig(ctx context.Context) {
 		case 's':
 			SetPassword()
 		case 'q':
-			return
-
+			return nil
 		}
 	}
 }

fs/config/ui_test.go

@@ -103,7 +103,7 @@ func TestCRUD(t *testing.T) {
 		"secret",             // repeat
 		"y",                  // looks good, save
 	})
-	config.NewRemote(ctx, "test")
+	require.NoError(t, config.NewRemote(ctx, "test"))
 
 	assert.Equal(t, []string{"test"}, config.Data().GetSectionList())
 	assert.Equal(t, "config_test_remote", config.FileGet("test", "type"))
@@ -146,7 +146,7 @@ func TestChooseOption(t *testing.T) {
 		assert.Equal(t, 1024, bits)
 		return "not very random password", nil
 	}
-	config.NewRemote(ctx, "test")
+	require.NoError(t, config.NewRemote(ctx, "test"))
 
 	assert.Equal(t, "false", config.FileGet("test", "bool"))
 	assert.Equal(t, "not very random password", obscure.MustReveal(config.FileGet("test", "pass")))
@@ -158,7 +158,7 @@ func TestChooseOption(t *testing.T) {
 		"n",                  // not required
 		"y",                  // looks good, save
 	})
-	config.NewRemote(ctx, "test")
+	require.NoError(t, config.NewRemote(ctx, "test"))
 
 	assert.Equal(t, "true", config.FileGet("test", "bool"))
 	assert.Equal(t, "", config.FileGet("test", "pass"))
@@ -175,7 +175,7 @@ func TestNewRemoteName(t *testing.T) {
 		"n",                  // not required
 		"y",                  // looks good, save
 	})
-	config.NewRemote(ctx, "test")
+	require.NoError(t, config.NewRemote(ctx, "test"))
 
 	config.ReadLine = makeReadLine([]string{
 		"test",           // already exists

fs/fs.go

@@ -89,7 +89,7 @@ type RegInfo struct {
 	// the parent of that object and ErrorIsFile.
 	NewFs func(ctx context.Context, name string, root string, config configmap.Mapper) (Fs, error) `json:"-"`
 	// Function to call to help with config
-	Config func(ctx context.Context, name string, config configmap.Mapper) `json:"-"`
+	Config func(ctx context.Context, name string, config configmap.Mapper) error `json:"-"`
 	// Options for the Fs configuration
 	Options Options
 	// The command help, if any