mirror of
https://github.com/rclone/rclone.git
synced 2025-12-06 00:03:32 +00:00
rc: config/unlock: rename parameter to configPassword accept old as well
We accidentally added a non `camelCase` parameter to the rc (`config_password`)- this fixes it (to `configPassword`) but accepts the old name too as it has been in a release.
This commit is contained in:
@@ -20,7 +20,7 @@ Unlocks the config file if it is locked.
|
|||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
|
|
||||||
- 'config_password' - password to unlock the config file
|
- 'configPassword' - password to unlock the config file
|
||||||
|
|
||||||
A good idea is to disable AskPassword before making this call
|
A good idea is to disable AskPassword before making this call
|
||||||
`,
|
`,
|
||||||
@@ -30,9 +30,13 @@ A good idea is to disable AskPassword before making this call
|
|||||||
// Unlock the config file
|
// Unlock the config file
|
||||||
// A good idea is to disable AskPassword before making this call
|
// A good idea is to disable AskPassword before making this call
|
||||||
func rcConfigPassword(ctx context.Context, in rc.Params) (out rc.Params, err error) {
|
func rcConfigPassword(ctx context.Context, in rc.Params) (out rc.Params, err error) {
|
||||||
configPass, err := in.GetString("config_password")
|
configPass, err := in.GetString("configPassword")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
var err2 error
|
||||||
|
configPass, err2 = in.GetString("config_password") // backwards compat
|
||||||
|
if err2 != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if SetConfigPassword(configPass) != nil {
|
if SetConfigPassword(configPass) != nil {
|
||||||
return nil, errors.New("failed to set config password")
|
return nil, errors.New("failed to set config password")
|
||||||
|
|||||||
@@ -215,13 +215,26 @@ func TestRcPaths(t *testing.T) {
|
|||||||
func TestRcConfigUnlock(t *testing.T) {
|
func TestRcConfigUnlock(t *testing.T) {
|
||||||
call := rc.Calls.Get("config/unlock")
|
call := rc.Calls.Get("config/unlock")
|
||||||
assert.NotNil(t, call)
|
assert.NotNil(t, call)
|
||||||
|
|
||||||
in := rc.Params{
|
in := rc.Params{
|
||||||
"config_password": "test",
|
"configPassword": "test",
|
||||||
}
|
}
|
||||||
out, err := call.Fn(context.Background(), in)
|
out, err := call.Fn(context.Background(), in)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Nil(t, err)
|
|
||||||
assert.Nil(t, out)
|
assert.Nil(t, out)
|
||||||
|
|
||||||
|
in = rc.Params{
|
||||||
|
"config_password": "test",
|
||||||
|
}
|
||||||
|
out, err = call.Fn(context.Background(), in)
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Nil(t, out)
|
||||||
|
|
||||||
|
in = rc.Params{
|
||||||
|
"bad_config_password": "test",
|
||||||
|
}
|
||||||
|
out, err = call.Fn(context.Background(), in)
|
||||||
|
require.Error(t, err)
|
||||||
|
assert.ErrorContains(t, err, `Didn't find key "configPassword" in input`)
|
||||||
|
assert.Nil(t, out)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user