diff options
| -rw-r--r-- | bridge/launchpad/config.go | 12 | ||||
| -rw-r--r-- | bridge/launchpad/launchpad_api.go | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/bridge/launchpad/config.go b/bridge/launchpad/config.go index 8469dbd3..11a465be 100644 --- a/bridge/launchpad/config.go +++ b/bridge/launchpad/config.go @@ -25,6 +25,14 @@ func (*Launchpad) Configure(repo repository.RepoCommon) (core.Configuration, err return conf, nil } +func (*Launchpad) ValidateConfig(conf core.Configuration) error { + if _, ok := conf[keyProject]; !ok { + return fmt.Errorf("missing %s key", keyProject) + } + + return nil +} + func promptProjectName() (string, error) { for { fmt.Print("Launchpad project name: ") @@ -44,7 +52,3 @@ func promptProjectName() (string, error) { return line, nil } } - -func (*Launchpad) ValidateConfig(conf core.Configuration) error { - return nil -} diff --git a/bridge/launchpad/launchpad_api.go b/bridge/launchpad/launchpad_api.go index 09e02bc5..849ef925 100644 --- a/bridge/launchpad/launchpad_api.go +++ b/bridge/launchpad/launchpad_api.go @@ -129,11 +129,12 @@ func (lapi *launchpadAPI) SearchTasks(project string) ([]LPBug, error) { return nil, err } - defer resp.Body.Close() - var result launchpadAnswer - if err := json.NewDecoder(resp.Body).Decode(&result); err != nil { + err = json.NewDecoder(resp.Body).Decode(&result) + _ = resp.Body.Close() + + if err != nil { return nil, err } |