Allow standalone commands to read from the config
This commit is contained in:
parent
0efefd02c6
commit
e3e22e071a
1 changed files with 29 additions and 4 deletions
|
@ -6,6 +6,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"text/template"
|
"text/template"
|
||||||
|
|
||||||
|
"git.ctrlz.es/mgdelacroix/campaigner/config"
|
||||||
"git.ctrlz.es/mgdelacroix/campaigner/jira"
|
"git.ctrlz.es/mgdelacroix/campaigner/jira"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
@ -38,9 +39,7 @@ func CreateJiraTicketStandaloneCmd() *cobra.Command {
|
||||||
cmd.Flags().String("team", "", "the team for the new ticket")
|
cmd.Flags().String("team", "", "the team for the new ticket")
|
||||||
_ = cmd.MarkFlagRequired("epic")
|
_ = cmd.MarkFlagRequired("epic")
|
||||||
cmd.Flags().String("username", "", "the jira username")
|
cmd.Flags().String("username", "", "the jira username")
|
||||||
_ = cmd.MarkFlagRequired("username")
|
|
||||||
cmd.Flags().String("token", "", "the jira token")
|
cmd.Flags().String("token", "", "the jira token")
|
||||||
_ = cmd.MarkFlagRequired("token")
|
|
||||||
cmd.Flags().String("summary", "", "the summary of the ticket")
|
cmd.Flags().String("summary", "", "the summary of the ticket")
|
||||||
_ = cmd.MarkFlagRequired("summary")
|
_ = cmd.MarkFlagRequired("summary")
|
||||||
cmd.Flags().String("template", "", "the template to render the description of the ticket")
|
cmd.Flags().String("template", "", "the template to render the description of the ticket")
|
||||||
|
@ -59,9 +58,7 @@ func GetJiraTicketStandaloneCmd() *cobra.Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd.Flags().String("username", "", "the jira username")
|
cmd.Flags().String("username", "", "the jira username")
|
||||||
_ = cmd.MarkFlagRequired("username")
|
|
||||||
cmd.Flags().String("token", "", "the jira token")
|
cmd.Flags().String("token", "", "the jira token")
|
||||||
_ = cmd.MarkFlagRequired("token")
|
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
@ -87,6 +84,20 @@ func createJiraTicketStandaloneCmdF(cmd *cobra.Command, _ []string) error {
|
||||||
templatePath, _ := cmd.Flags().GetString("template")
|
templatePath, _ := cmd.Flags().GetString("template")
|
||||||
vars, _ := cmd.Flags().GetStringSlice("vars")
|
vars, _ := cmd.Flags().GetStringSlice("vars")
|
||||||
|
|
||||||
|
if username == "" || token == "" {
|
||||||
|
cfg, err := config.ReadConfig()
|
||||||
|
if err != nil {
|
||||||
|
ErrorAndExit(cmd, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if username == "" {
|
||||||
|
username = cfg.JiraUsername
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
token = cfg.JiraToken
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
varMap, err := getVarMap(vars)
|
varMap, err := getVarMap(vars)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("error processing vars: %w", err)
|
return fmt.Errorf("error processing vars: %w", err)
|
||||||
|
@ -132,6 +143,20 @@ func getJiraTicketStandaloneCmdF(cmd *cobra.Command, args []string) {
|
||||||
username, _ := cmd.Flags().GetString("username")
|
username, _ := cmd.Flags().GetString("username")
|
||||||
token, _ := cmd.Flags().GetString("token")
|
token, _ := cmd.Flags().GetString("token")
|
||||||
|
|
||||||
|
if username == "" || token == "" {
|
||||||
|
cfg, err := config.ReadConfig()
|
||||||
|
if err != nil {
|
||||||
|
ErrorAndExit(cmd, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if username == "" {
|
||||||
|
username = cfg.JiraUsername
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
token = cfg.JiraToken
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
jiraClient, err := jira.NewClient(username, token)
|
jiraClient, err := jira.NewClient(username, token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ErrorAndExit(cmd, err)
|
ErrorAndExit(cmd, err)
|
||||||
|
|
Loading…
Reference in a new issue