Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: fix overwriting remotes in dvc remote add #1808

Merged
merged 3 commits into from
Mar 31, 2019
Merged

cli: fix overwriting remotes in dvc remote add #1808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06052a8
cli: fix overwriting remotes in `dvc remote add`
puhoshville Mar 30, 2019
180b844
Update tests/test_remote.py
efiop Mar 30, 2019
67f4c93
Fix unnecessary raise, ConfirmRemoveError recover
puhoshville Mar 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions dvc/command/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import re

import dvc.logger as logger
from dvc.command.base import fix_subparsers, append_doc_link
from dvc.config import Config
from dvc.command.base import append_doc_link, fix_subparsers
from dvc.command.config import CmdConfig
from dvc.config import Config


class CmdRemoteAdd(CmdConfig):
Expand Down Expand Up @@ -39,6 +39,14 @@ def run(self):
)

section = Config.SECTION_REMOTE_FMT.format(self.args.name)
if (section in self.configobj.keys()) and not self.args.force:
logger.error(
"Remote with name {} already exists. "
"Use -f (--force) to overwrite remote "
"with new value".format(self.args.name)
)
return 1

ret = self._set(section, Config.SECTION_REMOTE_URL, self.args.url)
if ret != 0:
return ret
Expand Down Expand Up @@ -156,6 +164,13 @@ def add_parser(subparsers, parent_parser):
default=False,
help="Set as default remote.",
)
remote_add_parser.add_argument(
"-f",
"--force",
action="store_true",
default=False,
help="Force overwriting existing configs",
)
remote_add_parser.set_defaults(func=CmdRemoteAdd)

REMOTE_DEFAULT_HELP = "Set/unset default remote."
Expand Down
9 changes: 9 additions & 0 deletions tests/test_remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ def test_relative_path(self):
config = configobj.ConfigObj(self.dvc.config.config_file)
self.assertEqual(config['remote "mylocal"']["url"], rel)

def test_overwrite(self):
remote_name = "a"
remote_url = "s3://bucket/name"
self.assertEqual(main(["remote", "add", remote_name, remote_url]), 0)
self.assertEqual(main(["remote", "add", remote_name, remote_url]), 1)
self.assertEqual(
main(["remote", "add", "-f", remote_name, remote_url]), 0
)


class TestRemoteRemoveDefault(TestDvc):
def test(self):
Expand Down