From 0381400bfda16f910ca87b0258ddda1c1732fbc7 Mon Sep 17 00:00:00 2001 From: Amine Hilaly Date: Wed, 21 Aug 2019 14:24:48 +0200 Subject: commands: read token from stdin in bridge configuration bridge: improve bridge config validation --- bridge/launchpad/config.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bridge/launchpad/config.go') diff --git a/bridge/launchpad/config.go b/bridge/launchpad/config.go index 1d6c8aba..6669d0fa 100644 --- a/bridge/launchpad/config.go +++ b/bridge/launchpad/config.go @@ -22,7 +22,7 @@ const ( defaultTimeout = 60 * time.Second ) -func (*Launchpad) Configure(repo repository.RepoCommon, params core.BridgeParams) (core.Configuration, error) { +func (l *Launchpad) Configure(repo repository.RepoCommon, params core.BridgeParams) (core.Configuration, error) { if params.Token != "" { fmt.Println("warning: --token is ineffective for a Launchpad bridge") } @@ -63,6 +63,12 @@ func (*Launchpad) Configure(repo repository.RepoCommon, params core.BridgeParams conf[keyProject] = project conf[core.KeyTarget] = target + + err = l.ValidateConfig(conf) + if err != nil { + return nil, err + } + return conf, nil } -- cgit