@@ -6,36 +6,30 @@ import (
6
6
)
7
7
8
8
type Options struct {
9
- JiraHost string
10
- JiraUserEmail string
11
- JiraAPIKey string
12
- JiraPrivateKeyFile string
13
- JiraAccountID string
14
- JiraUserName string
15
- JiraProjectName string
16
- JQLTextSearch string
17
- JQLRawSearch string
18
- MyJiraIssues bool
19
- RerverseIssues bool
20
- JiraClientID string
21
- JiraClientSecret string
9
+ JiraHost string
10
+ JiraUserEmail string
11
+ JiraAPIKey string
12
+ JiraAccountID string
13
+ JiraUserName string
14
+ JiraProjectName string
15
+ JQLTextSearch string
16
+ JQLRawSearch string
17
+ MyJiraIssues bool
18
+ RerverseIssues bool
22
19
}
23
20
24
21
// ConfigureCommand ...
25
22
func ConfigureCommand (cmd * cobra.Command ) {
26
23
cmd .PersistentFlags ().StringP ("jira-host" , "" , "" , "jira host url ex. https://foobar.atlassian.net" )
27
24
cmd .PersistentFlags ().StringP ("jira-user-email" , "" , "" , "jira user email address" )
28
25
cmd .PersistentFlags ().StringP ("jira-api-key" , "" , "" , "jira api key" )
29
- cmd .PersistentFlags ().StringP ("jira-private-key-file" , "" , "" , "jira private key file" )
30
26
cmd .PersistentFlags ().StringP ("jira-account-id" , "" , "" , "jira account id of api key user" )
31
27
cmd .PersistentFlags ().StringP ("jira-username" , "" , "" , "jira username" )
32
28
cmd .PersistentFlags ().StringP ("jira-project-name" , "" , "" , "a project name in jira you want to search" )
33
29
cmd .PersistentFlags ().StringP ("jql-text-search" , "" , "" , "a string of text that you want to search all issues for" )
34
30
cmd .PersistentFlags ().StringP ("jql-raw-search" , "" , "" , "a string of text that you want to search all issues for" )
35
31
cmd .PersistentFlags ().BoolP ("my-jira-issues" , "" , false , "find all issues assigned and in progress assigned to JIRA_ACCOUNT_ID from config.yaml" )
36
32
cmd .PersistentFlags ().BoolP ("reverse-issues" , "" , false , "reverse found issues in table" )
37
- cmd .PersistentFlags ().StringP ("jira-client-id" , "" , "" , "jira client id for oauth2" )
38
- cmd .PersistentFlags ().StringP ("jira-client-secret" , "" , "" , "jira client secret for oauth2" )
39
33
}
40
34
41
35
// LoadFromCommand loads all the command flag opts from cli and config file into Options struct
@@ -52,24 +46,6 @@ func (opts *Options) LoadFromCommand(cmd *cobra.Command) error {
52
46
}
53
47
opts .RerverseIssues = reverseIssues
54
48
55
- jiraClientID , err := utils .ConfigureFlagOpts (cmd , & utils.LoadFromCommandOpts {
56
- Flag : "jira-client-id" ,
57
- Opts : opts .JiraClientID ,
58
- })
59
- if err != nil {
60
- return err
61
- }
62
- opts .JiraClientID = jiraClientID .(string )
63
-
64
- jiraClientSecret , err := utils .ConfigureFlagOpts (cmd , & utils.LoadFromCommandOpts {
65
- Flag : "jira-client-secret" ,
66
- Opts : opts .JiraClientSecret ,
67
- })
68
- if err != nil {
69
- return err
70
- }
71
- opts .JiraClientSecret = jiraClientSecret .(string )
72
-
73
49
jiraHost , err := utils .ConfigureFlagOpts (cmd , & utils.LoadFromCommandOpts {
74
50
Flag : "jira-host" ,
75
51
Opts : opts .JiraHost ,
@@ -79,16 +55,6 @@ func (opts *Options) LoadFromCommand(cmd *cobra.Command) error {
79
55
}
80
56
opts .JiraHost = jiraHost .(string )
81
57
82
- jiraPrivateKeyFile , err := utils .ConfigureFlagOpts (cmd , & utils.LoadFromCommandOpts {
83
- Flag : "jira-private-key-file" ,
84
- IsFilePath : true ,
85
- Opts : opts .JiraPrivateKeyFile ,
86
- })
87
- if err != nil {
88
- return err
89
- }
90
- opts .JiraPrivateKeyFile = jiraPrivateKeyFile .(string )
91
-
92
58
jiraUserEmail , err := utils .ConfigureFlagOpts (cmd , & utils.LoadFromCommandOpts {
93
59
Flag : "jira-user-email" ,
94
60
Opts : opts .JiraUserEmail ,
0 commit comments