Clean template commands

Author: lighttiger2505

commands/issue_template.go

@@ -21,8 +21,9 @@ func newIssueTemplateCommandParser(opt *IssueTemplateCommnadOption) *flags.Parse
 }
 
 type IssueTemplateCommand struct {
-	UI       ui.Ui
-	Provider lab.Provider
+	UI            ui.Ui
+	Provider      lab.Provider
+	ClientFactory lab.APIClientFactory
 }
 
 func (c *IssueTemplateCommand) Synopsis() string {
@@ -38,7 +39,6 @@ func (c *IssueTemplateCommand) Help() string {
 }
 
 func (c *IssueTemplateCommand) Run(args []string) int {
-	// Parse flags
 	var projectCommandOption IssueTemplateCommnadOption
 	projectCommandParser := newIssueTemplateCommandParser(&projectCommandOption)
 	parceArgs, err := projectCommandParser.ParseArgs(args)
@@ -47,25 +47,29 @@ func (c *IssueTemplateCommand) Run(args []string) int {
 		return ExitCodeError
 	}
 
-	// Initialize provider
 	if err := c.Provider.Init(); err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	// Getting git remote info
 	gitlabRemote, err := c.Provider.GetCurrentRemote()
 	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	client, err := c.Provider.GetRepositoryClient(gitlabRemote)
+	token, err := c.Provider.GetAPIToken(gitlabRemote)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
+	if err := c.ClientFactory.Init(gitlabRemote.ApiUrl(), token); err != nil {
+		c.UI.Error(err.Error())
+		return ExitCodeError
+	}
+	client := c.ClientFactory.GetRepositoryClient()
+
 	if len(parceArgs) > 0 {
 		filename := IssueTemplateDir + "/" + parceArgs[0]
 		res, err := client.GetFile(

commands/merge-request-template.go

@@ -21,8 +21,9 @@ func newMergeRequestTemplateCommandParser(opt *MergeRequestTemplateCommnadOption
 }
 
 type MergeRequestTemplateCommand struct {
-	UI       ui.Ui
-	Provider lab.Provider
+	UI            ui.Ui
+	Provider      lab.Provider
+	ClientFactory lab.APIClientFactory
 }
 
 func (c *MergeRequestTemplateCommand) Synopsis() string {
@@ -38,7 +39,6 @@ func (c *MergeRequestTemplateCommand) Help() string {
 }
 
 func (c *MergeRequestTemplateCommand) Run(args []string) int {
-	// Parse flags
 	var projectCommandOption MergeRequestTemplateCommnadOption
 	projectCommandParser := newMergeRequestTemplateCommandParser(&projectCommandOption)
 	parceArgs, err := projectCommandParser.ParseArgs(args)
@@ -47,25 +47,29 @@ func (c *MergeRequestTemplateCommand) Run(args []string) int {
 		return ExitCodeError
 	}
 
-	// Initialize provider
 	if err := c.Provider.Init(); err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	// Getting git remote info
 	gitlabRemote, err := c.Provider.GetCurrentRemote()
 	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	client, err := c.Provider.GetRepositoryClient(gitlabRemote)
+	token, err := c.Provider.GetAPIToken(gitlabRemote)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
+	if err := c.ClientFactory.Init(gitlabRemote.ApiUrl(), token); err != nil {
+		c.UI.Error(err.Error())
+		return ExitCodeError
+	}
+	client := c.ClientFactory.GetRepositoryClient()
+
 	if len(parceArgs) > 0 {
 		filename := MergeRequestTemplateDir + "/" + parceArgs[0]
 		res, err := client.GetFile(

gitlab/gitlab.go

@@ -16,8 +16,6 @@ type Provider interface {
 	GetCurrentRemote() (*git.RemoteInfo, error)
 	GetAPIToken(remote *git.RemoteInfo) (string, error)
 	GetProjectVariableClient(remote *git.RemoteInfo) (ProjectVariable, error)
-	GetRepositoryClient(remote *git.RemoteInfo) (Repository, error)
-	GetNoteClient(remote *git.RemoteInfo) (Note, error)
 }
 
 type GitlabProvider struct {
@@ -151,22 +149,6 @@ func (p *GitlabProvider) GetProjectVariableClient(remote *git.RemoteInfo) (Proje
 	return NewProjectVariableClient(gitlabClient), nil
 }
 
-func (p *GitlabProvider) GetRepositoryClient(remote *git.RemoteInfo) (Repository, error) {
-	gitlabClient, err := p.makeGitLabClient(remote)
-	if err != nil {
-		return nil, err
-	}
-	return NewRepositoryClient(gitlabClient), nil
-}
-
-func (p *GitlabProvider) GetNoteClient(remote *git.RemoteInfo) (Note, error) {
-	gitlabClient, err := p.makeGitLabClient(remote)
-	if err != nil {
-		return nil, err
-	}
-	return NewNoteClient(gitlabClient), nil
-}
-
 func (p *GitlabProvider) selectTargetRemote(remoteInfos []*git.RemoteInfo) (*git.RemoteInfo, error) {
 	// Receive number of the domain of the remote repository to be searched from stdin
 	p.UI.Message("That repository existing multi gitlab remote repository.")
@@ -234,8 +216,6 @@ type MockProvider struct {
 	MockGetSpecificRemote        func(namespace, project string) *git.RemoteInfo
 	MockGetCurrentRemote         func() (*git.RemoteInfo, error)
 	MockGetProjectVariableClient func(remote *git.RemoteInfo) (ProjectVariable, error)
-	MockGetRepositoryClient      func(remote *git.RemoteInfo) (Repository, error)
-	MockGetNoteClient            func(remote *git.RemoteInfo) (Note, error)
 }
 
 func (m *MockProvider) Init() error {
@@ -254,14 +234,6 @@ func (m *MockProvider) GetProjectVariableClient(remote *git.RemoteInfo) (Project
 	return m.MockGetProjectVariableClient(remote)
 }
 
-func (m *MockProvider) GetRepositoryClient(remote *git.RemoteInfo) (Repository, error) {
-	return m.MockGetRepositoryClient(remote)
-}
-
-func (m *MockProvider) GetNoteClient(remote *git.RemoteInfo) (Note, error) {
-	return m.MockGetNoteClient(remote)
-}
-
 func getGitlabClient(url, token string) (*gitlab.Client, error) {
 	client := gitlab.NewClient(nil, token)
 	if err := client.SetBaseURL(url); err != nil {

main.go

@@ -128,14 +128,16 @@ func realMain(writer io.Writer, ver, rev string) int {
 		},
 		"issue-template": func() (cli.Command, error) {
 			return &commands.IssueTemplateCommand{
-				UI:       ui,
-				Provider: provider,
+				UI:            ui,
+				Provider:      provider,
+				ClientFactory: &lab.GitlabClientFactory{},
 			}, nil
 		},
 		"merge-request-template": func() (cli.Command, error) {
 			return &commands.MergeRequestTemplateCommand{
-				UI:       ui,
-				Provider: provider,
+				UI:            ui,
+				Provider:      provider,
+				ClientFactory: &lab.GitlabClientFactory{},
 			}, nil
 		},
 	}