diff options
author | Sascha <GlancingMind@outlook.com> | 2021-05-09 11:14:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-09 11:14:45 +0200 |
commit | 1939949fcdd5d540fd20ead79b9c5d27e85e8f9d (patch) | |
tree | a7c6889584d3a74b3aa99c05e23b05a5b1c9b7f3 /bridge/jira/config.go | |
parent | bdb832639d9d3ddf2f7e817252eaef48c9d59d4e (diff) | |
download | git-bug-1939949fcdd5d540fd20ead79b9c5d27e85e8f9d.tar.gz |
CLI: Add non-interactive option to interactive commands (#651)
* Add option to skip the AvatarURL input request
Using an empty string for the avatar cli flag e.g. `git-bug user create
-a ""` will still result in a prompt. As the avatar URL is an optional
option, it should be possible to skip asking for it entirely.
Otherwise automated user creation via a script must make use of pipe hacks.
* Add global --non-interactive cmdline option
* Replace --skipAvatar for --non-interactive option
* Cmd BugAdd: respect non-interactive option
* Cmd bridge configure: respect non-interactive opt
* Cmd CommentAdd: respect non-interactive option
* Cmd CommentEdit: respect non-interactive option
* Cmd TermUI: respect non-interactive option
* Cmd TitleEdit: respect non-interactive option
* Remove global non-interactive option
* Cmd UserCreate: Use local non-interactive option
* Cmd BugAdd: Use local non-interactive option
* Cmd BridgeConfigure: Use local non-interactive option
* Cmd CommentAdd: Use local non-interactive option
* Cmd CommentEdit: Use local non-interactive option
* Cmd TermUI: Drop non-interactive option
It should be obviouse that the termui is an interactive command.
* Cmd TitleEdit: Use local non-interactive option
* Update docs
* Bridge GitHub: respect non-interactive option
* Bridge GitLab: respect non-interactive option
* Bridge Jira: respect non-interactive and token opt
* Fix failing compilation
* Bridge launchpad: respect non-interactive option
* bridge: isNonInteractive --> interactive
Co-authored-by: Michael Muré <batolettre@gmail.com>
Diffstat (limited to 'bridge/jira/config.go')
-rw-r--r-- | bridge/jira/config.go | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/bridge/jira/config.go b/bridge/jira/config.go index 717046e2..3ce6ad9a 100644 --- a/bridge/jira/config.go +++ b/bridge/jira/config.go @@ -33,15 +33,19 @@ func (*Jira) ValidParams() map[string]interface{} { "Login": nil, "CredPrefix": nil, "Project": nil, + "TokenRaw": nil, } } // Configure sets up the bridge configuration -func (j *Jira) Configure(repo *cache.RepoCache, params core.BridgeParams) (core.Configuration, error) { +func (j *Jira) Configure(repo *cache.RepoCache, params core.BridgeParams, interactive bool) (core.Configuration, error) { var err error baseURL := params.BaseURL if baseURL == "" { + if !interactive { + return nil, fmt.Errorf("Non-interactive-mode is active. Please specify the JIRA server URL via the --base-url option.") + } // terminal prompt baseURL, err = input.Prompt("JIRA server URL", "URL", input.Required, input.IsURL) if err != nil { @@ -51,20 +55,17 @@ func (j *Jira) Configure(repo *cache.RepoCache, params core.BridgeParams) (core. project := params.Project if project == "" { + if !interactive { + return nil, fmt.Errorf("Non-interactive-mode is active. Please specify the JIRA project key via the --project option.") + } project, err = input.Prompt("JIRA project key", "project", input.Required) if err != nil { return nil, err } } - fmt.Println(credTypeText) - credTypeInput, err := input.PromptChoice("Authentication mechanism", []string{"SESSION", "TOKEN"}) - if err != nil { - return nil, err - } - credType := []string{"SESSION", "TOKEN"}[credTypeInput] - var login string + var credType string var cred auth.Credential switch { @@ -80,18 +81,34 @@ func (j *Jira) Configure(repo *cache.RepoCache, params core.BridgeParams) (core. login = l default: if params.Login == "" { - // TODO: validate username + if !interactive { + return nil, fmt.Errorf("Non-interactive-mode is active. Please specify the login name via the --login option.") + } login, err = input.Prompt("JIRA login", "login", input.Required) + if err != nil { + return nil, err + } } else { - // TODO: validate username login = params.Login } - if err != nil { - return nil, err - } - cred, err = promptCredOptions(repo, login, baseURL) - if err != nil { - return nil, err + // TODO: validate username + + if params.TokenRaw == "" { + if !interactive { + return nil, fmt.Errorf("Non-interactive-mode is active. Please specify the access token via the --token option.") + } + fmt.Println(credTypeText) + credTypeInput, err := input.PromptChoice("Authentication mechanism", []string{"SESSION", "TOKEN"}) + if err != nil { + return nil, err + } + credType = []string{"SESSION", "TOKEN"}[credTypeInput] + cred, err = promptCredOptions(repo, login, baseURL) + if err != nil { + return nil, err + } + } else { + credType = "TOKEN" } } |