chore: Refactor jira client (#543)

ankitpokhrel · Jan 2, 2023 · ed84fe7 · ed84fe7
1 parent 16a8a61
commit ed84fe7
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 54 deletions.
diff --git a/api/client.go b/api/client.go
@@ -57,6 +57,11 @@ func Client(config jira.Config) *jira.Client {
 	return jiraClient
 }
 
+// DefaultClient returns default jira client.
+func DefaultClient(debug bool) *jira.Client {
+	return Client(jira.Config{Debug: debug})
+}
+
 // ProxyCreate uses either a v2 or v3 version of the Jira POST /issue
 // endpoint to create an issue based on configured installation type.
 // Defaults to v3 if installation type is not defined in the config.

diff --git a/internal/cmd/board/list/list.go b/internal/cmd/board/list/list.go
@@ -34,7 +34,7 @@ func List(cmd *cobra.Command, _ []string) {
 		s := cmdutil.Info(fmt.Sprintf("Fetching boards in project %s...", project))
 		defer s.Stop()
 
-		resp, err := api.Client(jira.Config{Debug: debug}).Boards(project, jira.BoardTypeAll)
+		resp, err := api.DefaultClient(debug).Boards(project, jira.BoardTypeAll)
 		if err != nil {
 			return nil, 0, err
 		}

diff --git a/internal/cmd/epic/add/add.go b/internal/cmd/epic/add/add.go
@@ -40,7 +40,7 @@ func add(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	projectType := viper.GetString("project.type")
 	params := parseFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 
 	qs := getQuestions(params)
 	if len(qs) > 0 {

diff --git a/internal/cmd/epic/create/create.go b/internal/cmd/epic/create/create.go
@@ -51,7 +51,7 @@ func create(cmd *cobra.Command, _ []string) {
 	installation := viper.GetString("installation")
 
 	params := parseFlags(cmd.Flags())
-	client := api.Client(jira.Config{Debug: params.Debug})
+	client := api.DefaultClient(params.Debug)
 	cc := createCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/epic/list/list.go b/internal/cmd/epic/list/list.go
@@ -77,7 +77,7 @@ func epicList(cmd *cobra.Command, args []string) {
 	debug, err := cmd.Flags().GetBool("debug")
 	cmdutil.ExitIfError(err)
 
-	client := api.Client(jira.Config{Debug: debug})
+	client := api.DefaultClient(debug)
 
 	if len(args) == 0 {
 		epicExplorerView(cmd, cmd.Flags(), project, projectType, server, client)

diff --git a/internal/cmd/epic/remove/remove.go b/internal/cmd/epic/remove/remove.go
@@ -38,7 +38,7 @@ func remove(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	projectType := viper.GetString("project.type")
 	params := parseFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 
 	qs := getQuestions(params)
 	if len(qs) > 0 {

diff --git a/internal/cmd/issue/assign/assign.go b/internal/cmd/issue/assign/assign.go
@@ -61,7 +61,7 @@ ASSIGNEE	Email or display name of the user to assign the issue to`,
 func assign(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	ac := assignCmd{
 		client: client,
 		users:  nil,

diff --git a/internal/cmd/issue/clone/clone.go b/internal/cmd/issue/clone/clone.go
@@ -51,7 +51,7 @@ func clone(cmd *cobra.Command, args []string) {
 	projectType := viper.GetString("project.type")
 
 	params := parseFlags(cmd.Flags())
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	cc := cloneCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/issue/comment/add/add.go b/internal/cmd/issue/comment/add/add.go
@@ -62,7 +62,7 @@ func NewCmdCommentAdd() *cobra.Command {
 
 func add(cmd *cobra.Command, args []string) {
 	params := parseArgsAndFlags(args, cmd.Flags())
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	ac := addCmd{
 		client:    client,
 		linkTypes: nil,

diff --git a/internal/cmd/issue/create/create.go b/internal/cmd/issue/create/create.go
@@ -66,7 +66,7 @@ func create(cmd *cobra.Command, _ []string) {
 	installation := viper.GetString("installation")
 
 	params := parseFlags(cmd.Flags())
-	client := api.Client(jira.Config{Debug: params.Debug})
+	client := api.DefaultClient(params.Debug)
 	cc := createCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/issue/delete/delete.go b/internal/cmd/issue/delete/delete.go
@@ -43,7 +43,7 @@ func NewCmdDelete() *cobra.Command {
 func del(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	mc := deleteCmd{
 		client:      client,
 		transitions: nil,

diff --git a/internal/cmd/issue/edit/edit.go b/internal/cmd/issue/edit/edit.go
@@ -57,7 +57,7 @@ func edit(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	ec := editCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/issue/link/link.go b/internal/cmd/issue/link/link.go
@@ -47,7 +47,7 @@ func NewCmdLink() *cobra.Command {
 func link(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	lc := linkCmd{
 		client:    client,
 		linkTypes: nil,

diff --git a/internal/cmd/issue/link/remote/remote.go b/internal/cmd/issue/link/remote/remote.go
@@ -40,7 +40,7 @@ func NewCmdRemoteLink() *cobra.Command {
 func remotelink(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	lc := linkCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/issue/list/list.go b/internal/cmd/issue/list/list.go
@@ -92,7 +92,7 @@ func loadList(cmd *cobra.Command) {
 			return nil, 0, err
 		}
 
-		resp, err := api.ProxySearch(api.Client(jira.Config{Debug: debug}), q.Get(), q.Params().From, q.Params().Limit)
+		resp, err := api.ProxySearch(api.DefaultClient(debug), q.Get(), q.Params().From, q.Params().Limit)
 		if err != nil {
 			return nil, 0, err
 		}

diff --git a/internal/cmd/issue/move/move.go b/internal/cmd/issue/move/move.go
@@ -52,7 +52,7 @@ func move(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	installation := viper.GetString("installation")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	mc := moveCmd{
 		client:      client,
 		transitions: nil,

diff --git a/internal/cmd/issue/unlink/unlink.go b/internal/cmd/issue/unlink/unlink.go
@@ -41,7 +41,7 @@ func NewCmdUnlink() *cobra.Command {
 func unlink(cmd *cobra.Command, args []string) {
 	project := viper.GetString("project.key")
 	params := parseArgsAndFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	uc := unlinkCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/issue/view/view.go b/internal/cmd/issue/view/view.go
@@ -52,7 +52,7 @@ func view(cmd *cobra.Command, args []string) {
 		s := cmdutil.Info("Fetching issue details...")
 		defer s.Stop()
 
-		client := api.Client(jira.Config{Debug: debug})
+		client := api.DefaultClient(debug)
 		return api.ProxyGetIssue(client, key, issue.NewNumCommentsFilter(comments))
 	}()
 	cmdutil.ExitIfError(err)

diff --git a/internal/cmd/issue/worklog/add/add.go b/internal/cmd/issue/worklog/add/add.go
@@ -61,7 +61,7 @@ func NewCmdWorklogAdd() *cobra.Command {
 
 func add(cmd *cobra.Command, args []string) {
 	params := parseArgsAndFlags(args, cmd.Flags())
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 	ac := addCmd{
 		client: client,
 		params: params,

diff --git a/internal/cmd/project/list/list.go b/internal/cmd/project/list/list.go
@@ -29,7 +29,7 @@ func List(cmd *cobra.Command, _ []string) {
 		s := cmdutil.Info("Fetching projects...")
 		defer s.Stop()
 
-		projects, err := api.Client(jira.Config{Debug: debug}).Project()
+		projects, err := api.DefaultClient(debug).Project()
 		if err != nil {
 			return nil, 0, err
 		}

diff --git a/internal/cmd/serverinfo/serverinfo.go b/internal/cmd/serverinfo/serverinfo.go
@@ -28,7 +28,7 @@ func serverInfo(cmd *cobra.Command, _ []string) {
 		s := cmdutil.Info("Fetching server info...")
 		defer s.Stop()
 
-		info, err := api.Client(jira.Config{Debug: debug}).ServerInfo()
+		info, err := api.DefaultClient(debug).ServerInfo()
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/cmd/sprint/add/add.go b/internal/cmd/sprint/add/add.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ankitpokhrel/jira-cli/api"
 	"github.com/ankitpokhrel/jira-cli/internal/cmdutil"
 	"github.com/ankitpokhrel/jira-cli/internal/query"
-	"github.com/ankitpokhrel/jira-cli/pkg/jira"
 )
 
 const (
@@ -39,7 +38,7 @@ func add(cmd *cobra.Command, args []string) {
 	server := viper.GetString("server")
 	project := viper.GetString("project.key")
 	params := parseFlags(cmd.Flags(), args, project)
-	client := api.Client(jira.Config{Debug: params.debug})
+	client := api.DefaultClient(params.debug)
 
 	qs := getQuestions(params)
 	if len(qs) > 0 {

diff --git a/internal/cmd/sprint/list/list.go b/internal/cmd/sprint/list/list.go
@@ -77,7 +77,7 @@ func sprintList(cmd *cobra.Command, args []string) {
 	debug, err := cmd.Flags().GetBool("debug")
 	cmdutil.ExitIfError(err)
 
-	client := api.Client(jira.Config{Debug: debug})
+	client := api.DefaultClient(debug)
 
 	sprintQuery, err := query.NewSprint(cmd.Flags())
 	cmdutil.ExitIfError(err)

diff --git a/internal/view/epic.go b/internal/view/epic.go
@@ -44,7 +44,7 @@ func (el *EpicList) Render() error {
 				dataFn := func() interface{} {
 					data := d.(tui.TableData)
 					ci := data.GetIndex(fieldKey)
-					iss, _ := api.ProxyGetIssue(api.Client(jira.Config{}), data.Get(r, ci), issue.NewNumCommentsFilter(1))
+					iss, _ := api.ProxyGetIssue(api.DefaultClient(false), data.Get(r, ci), issue.NewNumCommentsFilter(1))
 					return iss
 				}
 				renderFn := func(i interface{}) (string, error) {

diff --git a/internal/view/issues.go b/internal/view/issues.go
@@ -58,7 +58,7 @@ func (l *IssueList) Render() error {
 		tui.WithViewModeFunc(func(r, c int, _ interface{}) (func() interface{}, func(interface{}) (string, error)) {
 			dataFn := func() interface{} {
 				ci := data.GetIndex(fieldKey)
-				iss, _ := api.ProxyGetIssue(api.Client(jira.Config{}), data.Get(r, ci), issue.NewNumCommentsFilter(1))
+				iss, _ := api.ProxyGetIssue(api.DefaultClient(false), data.Get(r, ci), issue.NewNumCommentsFilter(1))
 				return iss
 			}
 			renderFn := func(i interface{}) (string, error) {

diff --git a/internal/view/sprint.go b/internal/view/sprint.go
@@ -54,7 +54,7 @@ func (sl *SprintList) Render() error {
 				dataFn := func() interface{} {
 					data := d.(tui.TableData)
 					ci := data.GetIndex(fieldKey)
-					iss, _ := api.ProxyGetIssue(api.Client(jira.Config{}), data.Get(r, ci), issue.NewNumCommentsFilter(1))
+					iss, _ := api.ProxyGetIssue(api.DefaultClient(false), data.Get(r, ci), issue.NewNumCommentsFilter(1))
 					return iss
 				}
 				renderFn := func(i interface{}) (string, error) {

diff --git a/pkg/jira/client.go b/pkg/jira/client.go
@@ -174,47 +174,27 @@ func (c *Client) GetV1(ctx context.Context, path string, headers Header) (*http.
 
 // Post sends POST request to v3 version of the jira api.
 func (c *Client) Post(ctx context.Context, path string, body []byte, headers Header) (*http.Response, error) {
-	res, err := c.request(ctx, http.MethodPost, c.server+baseURLv3+path, body, headers)
-	if err != nil {
-		return res, err
-	}
-	return res, err
+	return c.request(ctx, http.MethodPost, c.server+baseURLv3+path, body, headers)
 }
 
 // PostV2 sends POST request to v2 version of the jira api.
 func (c *Client) PostV2(ctx context.Context, path string, body []byte, headers Header) (*http.Response, error) {
-	res, err := c.request(ctx, http.MethodPost, c.server+baseURLv2+path, body, headers)
-	if err != nil {
-		return res, err
-	}
-	return res, err
+	return c.request(ctx, http.MethodPost, c.server+baseURLv2+path, body, headers)
 }
 
 // PostV1 sends POST request to v1 version of the jira api.
 func (c *Client) PostV1(ctx context.Context, path string, body []byte, headers Header) (*http.Response, error) {
-	res, err := c.request(ctx, http.MethodPost, c.server+baseURLv1+path, body, headers)
-	if err != nil {
-		return res, err
-	}
-	return res, err
+	return c.request(ctx, http.MethodPost, c.server+baseURLv1+path, body, headers)
 }
 
 // Put sends PUT request to v3 version of the jira api.
 func (c *Client) Put(ctx context.Context, path string, body []byte, headers Header) (*http.Response, error) {
-	res, err := c.request(ctx, http.MethodPut, c.server+baseURLv3+path, body, headers)
-	if err != nil {
-		return res, err
-	}
-	return res, err
+	return c.request(ctx, http.MethodPut, c.server+baseURLv3+path, body, headers)
 }
 
 // PutV2 sends PUT request to v2 version of the jira api.
 func (c *Client) PutV2(ctx context.Context, path string, body []byte, headers Header) (*http.Response, error) {
-	res, err := c.request(ctx, http.MethodPut, c.server+baseURLv2+path, body, headers)
-	if err != nil {
-		return res, err
-	}
-	return res, err
+	return c.request(ctx, http.MethodPut, c.server+baseURLv2+path, body, headers)
 }
 
 // DeleteV2 sends DELETE request to v2 version of the jira api.
@@ -250,9 +230,7 @@ func (c *Client) request(ctx context.Context, method, endpoint string, body []by
 		req.SetBasicAuth(c.login, c.token)
 	}
 
-	res, err = c.transport.RoundTrip(req.WithContext(ctx))
-
-	return res, err
+	return c.transport.RoundTrip(req.WithContext(ctx))
 }
 
 func dump(req *http.Request, res *http.Response) {