From 72dcbc0a9e4017ab6ab40c0d274576c9ad330e29 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 3 Jun 2020 02:09:08 +0300 Subject: [PATCH] remote: modify: fix --unset (#3939) https://discordapp.com/channels/485586884165107732/563406153334128681/717474697721413686 Fixes https://github.com/iterative/dvc/issues/3938 --- dvc/command/remote.py | 6 +++++- tests/func/test_remote.py | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dvc/command/remote.py b/dvc/command/remote.py index 5a0506c34..db622a378 100644 --- a/dvc/command/remote.py +++ b/dvc/command/remote.py @@ -62,7 +62,11 @@ class CmdRemoteModify(CmdRemote): def run(self): with self.config.edit(self.args.level) as conf: self._check_exists(conf) - conf["remote"][self.args.name][self.args.option] = self.args.value + section = conf["remote"][self.args.name] + if self.args.unset: + section.pop(self.args.option, None) + else: + section[self.args.option] = self.args.value return 0 diff --git a/tests/func/test_remote.py b/tests/func/test_remote.py index 5f4a56678..990d07d73 100644 --- a/tests/func/test_remote.py +++ b/tests/func/test_remote.py @@ -273,6 +273,29 @@ def test_remote_modify_validation(dvc): assert unsupported_config not in config[f'remote "{remote_name}"'] +def test_remote_modify_unset(dvc): + assert main(["remote", "add", "-d", "myremote", "gdrive://test/test"]) == 0 + config = configobj.ConfigObj(dvc.config.files["repo"]) + assert config['remote "myremote"'] == {"url": "gdrive://test/test"} + + assert ( + main(["remote", "modify", "myremote", "gdrive_client_id", "something"]) + == 0 + ) + config = configobj.ConfigObj(dvc.config.files["repo"]) + assert config['remote "myremote"'] == { + "url": "gdrive://test/test", + "gdrive_client_id": "something", + } + + assert ( + main(["remote", "modify", "myremote", "gdrive_client_id", "--unset"]) + == 0 + ) + config = configobj.ConfigObj(dvc.config.files["repo"]) + assert config['remote "myremote"'] == {"url": "gdrive://test/test"} + + def test_remote_modify_default(dvc): remote_repo = "repo_level" remote_local = "local_level"