diff options
Diffstat (limited to 'bridge')
-rw-r--r-- | bridge/core/bridge.go | 9 | ||||
-rw-r--r-- | bridge/github/config.go | 9 | ||||
-rw-r--r-- | bridge/gitlab/config.go | 9 |
3 files changed, 21 insertions, 6 deletions
diff --git a/bridge/core/bridge.go b/bridge/core/bridge.go index 9161b418..6fd28b03 100644 --- a/bridge/core/bridge.go +++ b/bridge/core/bridge.go @@ -31,10 +31,11 @@ var bridgeImpl map[string]reflect.Type // BridgeParams holds parameters to simplify the bridge configuration without // having to make terminal prompts. type BridgeParams struct { - Owner string - Project string - URL string - Token string + Owner string + Project string + URL string + Token string + TokenStdin bool } // Bridge is a wrapper around a BridgeImpl that will bind low-level diff --git a/bridge/github/config.go b/bridge/github/config.go index bc4911e0..16abfa09 100644 --- a/bridge/github/config.go +++ b/bridge/github/config.go @@ -45,7 +45,7 @@ func (g *Github) Configure(repo repository.RepoCommon, params core.BridgeParams) var owner string var project string - if params.Token != "" && + if (params.Token != "" || params.TokenStdin) && (params.URL == "" && (params.Project == "" || params.Owner == "")) { return nil, fmt.Errorf("you must provide a project URL or Owner/Name to configure this bridge with a token") } @@ -91,6 +91,13 @@ func (g *Github) Configure(repo repository.RepoCommon, params core.BridgeParams) if params.Token != "" { token = params.Token + } else if params.TokenStdin { + reader := bufio.NewReader(os.Stdin) + token, err = reader.ReadString('\n') + if err != nil { + return nil, fmt.Errorf("reading from stdin: %v", err) + } + token = strings.TrimSuffix(token, "\n") } else { token, err = promptTokenOptions(owner, project) if err != nil { diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go index d1d85030..a673af8c 100644 --- a/bridge/gitlab/config.go +++ b/bridge/gitlab/config.go @@ -33,7 +33,7 @@ func (g *Gitlab) Configure(repo repository.RepoCommon, params core.BridgeParams) var url string var token string - if params.Token != "" && params.URL == "" { + if (params.Token != "" || params.TokenStdin) && params.URL == "" { return nil, fmt.Errorf("you must provide a project URL to configure this bridge with a token") } @@ -58,6 +58,13 @@ func (g *Gitlab) Configure(repo repository.RepoCommon, params core.BridgeParams) // get user token if params.Token != "" { token = params.Token + } else if params.TokenStdin { + reader := bufio.NewReader(os.Stdin) + token, err = reader.ReadString('\n') + if err != nil { + return nil, fmt.Errorf("reading from stdin: %v", err) + } + token = strings.TrimSuffix(token, "\n") } else { token, err = promptToken() if err != nil { |