Remove error return value from ConvertToOptions

ConvertToOptions can't return any error.
This commit is contained in:
akarki15 2016-11-15 22:03:32 -05:00
parent b1fdbf714b
commit fedde804e3
4 changed files with 197 additions and 277 deletions

View File

@ -30,10 +30,7 @@ func initClientUsingBookmark(bookmarkPath, bookmarkName string) (*client.Client,
if err != nil {
return nil, err
}
opt, err := bookmark.ConvertToOptions()
if err != nil {
return nil, err
}
opt := bookmark.ConvertToOptions()
var connStr string
if opt.Url != "" { // if the bookmark has url set, use it
connStr = opt.Url

View File

@ -28,7 +28,7 @@ func (b Bookmark) SSHInfoIsEmpty() bool {
return b.Ssh.User == "" && b.Ssh.Host == "" && b.Ssh.Port == ""
}
func (b Bookmark) ConvertToOptions() (command.Options, error) {
func (b Bookmark) ConvertToOptions() command.Options {
return command.Options{
Url: b.Url,
Host: b.Host,
@ -37,7 +37,7 @@ func (b Bookmark) ConvertToOptions() (command.Options, error) {
Pass: b.Password,
DbName: b.Database,
Ssl: b.Ssl,
}, nil
}
}
func readServerConfig(path string) (Bookmark, error) {

View File

@ -130,8 +130,6 @@ func Test_ConvertToOptions(t *testing.T) {
DbName: "mydatabase",
Ssl: "disable",
}
opt, err := b.ConvertToOptions()
if assert.NoError(t, err) {
assert.Equal(t, expOpt, opt)
}
opt := b.ConvertToOptions()
assert.Equal(t, expOpt, opt)
}

File diff suppressed because one or more lines are too long