Clean project variable command

Author: lighttiger2505

commands/project_variable.go

@@ -72,8 +72,9 @@ func newAddProjectVaribleOption() *CreateUpdateProjectVaribleOption {
 }
 
 type ProjectVariableCommand struct {
-	UI       ui.Ui
-	Provider lab.Provider
+	UI            ui.Ui
+	Provider      lab.Provider
+	ClientFactory lab.APIClientFactory
 }
 
 func (c *ProjectVariableCommand) Synopsis() string {
@@ -97,32 +98,31 @@ func (c *ProjectVariableCommand) Run(args []string) int {
 		return ExitCodeError
 	}
 
-	op := projectVaribaleOperation(opt, parseArgs)
-	if err := validProjectVariableArgs(op, parseArgs); err != nil {
+	if err := c.Provider.Init(); err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	// Initialize provider
-	if err := c.Provider.Init(); err != nil {
+	gitlabRemote, err := c.Provider.GetCurrentRemote()
+	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	// Getting git remote info
-	gitlabRemote, err := c.Provider.GetCurrentRemote()
+	token, err := c.Provider.GetAPIToken(gitlabRemote)
 	if err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
 
-	client, err := c.Provider.GetProjectVariableClient(gitlabRemote)
-	if err != nil {
+	if err := c.ClientFactory.Init(gitlabRemote.ApiUrl(), token); err != nil {
 		c.UI.Error(err.Error())
 		return ExitCodeError
 	}
+	client := c.ClientFactory.GetProjectVariableClient()
 
 	// Do issue operation
+	op := projectVaribaleOperation(opt, parseArgs)
 	switch op {
 	case CreateProjectVariable:
 		_, err := client.CreateVariable(

commands/project_variable_test.go

@@ -34,14 +34,17 @@ func TestProjectVariableCommand_Run_List(t *testing.T) {
 	}
 	mockProvider := &lab.MockProvider{
 		MockGetCurrentRemote: mockCurrentRemote,
-		MockGetProjectVariableClient: func(remote *git.RemoteInfo) (lab.ProjectVariable, error) {
-			return mockClient, nil
+	}
+	mockClientFactory := &lab.MockAPIClientFactory{
+		MockGetProjectVariableClient: func() lab.ProjectVariable {
+			return mockClient
 		},
 	}
 	mockUI := ui.NewMockUi()
 	c := ProjectVariableCommand{
-		UI:       mockUI,
-		Provider: mockProvider,
+		UI:            mockUI,
+		Provider:      mockProvider,
+		ClientFactory: mockClientFactory,
 	}
 
 	// Do command
@@ -69,14 +72,17 @@ func TestProjectVariableCommand_Run_Create(t *testing.T) {
 	}
 	mockProvider := &lab.MockProvider{
 		MockGetCurrentRemote: mockCurrentRemote,
-		MockGetProjectVariableClient: func(remote *git.RemoteInfo) (lab.ProjectVariable, error) {
-			return mockClient, nil
+	}
+	mockClientFactory := &lab.MockAPIClientFactory{
+		MockGetProjectVariableClient: func() lab.ProjectVariable {
+			return mockClient
 		},
 	}
 	mockUI := ui.NewMockUi()
 	c := ProjectVariableCommand{
-		UI:       mockUI,
-		Provider: mockProvider,
+		UI:            mockUI,
+		Provider:      mockProvider,
+		ClientFactory: mockClientFactory,
 	}
 
 	// Do command
@@ -104,14 +110,17 @@ func TestProjectVariableCommand_Run_Update(t *testing.T) {
 	}
 	mockProvider := &lab.MockProvider{
 		MockGetCurrentRemote: mockCurrentRemote,
-		MockGetProjectVariableClient: func(remote *git.RemoteInfo) (lab.ProjectVariable, error) {
-			return mockClient, nil
+	}
+	mockClientFactory := &lab.MockAPIClientFactory{
+		MockGetProjectVariableClient: func() lab.ProjectVariable {
+			return mockClient
 		},
 	}
 	mockUI := ui.NewMockUi()
 	c := ProjectVariableCommand{
-		UI:       mockUI,
-		Provider: mockProvider,
+		UI:            mockUI,
+		Provider:      mockProvider,
+		ClientFactory: mockClientFactory,
 	}
 
 	// Do command
@@ -138,14 +147,17 @@ func TestProjectVariableCommand_Run_Remove(t *testing.T) {
 	}
 	mockProvider := &lab.MockProvider{
 		MockGetCurrentRemote: mockCurrentRemote,
-		MockGetProjectVariableClient: func(remote *git.RemoteInfo) (lab.ProjectVariable, error) {
-			return mockClient, nil
+	}
+	mockClientFactory := &lab.MockAPIClientFactory{
+		MockGetProjectVariableClient: func() lab.ProjectVariable {
+			return mockClient
 		},
 	}
 	mockUI := ui.NewMockUi()
 	c := ProjectVariableCommand{
-		UI:       mockUI,
-		Provider: mockProvider,
+		UI:            mockUI,
+		Provider:      mockProvider,
+		ClientFactory: mockClientFactory,
 	}
 
 	// Do command

gitlab/gitlab.go

@@ -15,7 +15,6 @@ type Provider interface {
 	Init() error
 	GetCurrentRemote() (*git.RemoteInfo, error)
 	GetAPIToken(remote *git.RemoteInfo) (string, error)
-	GetProjectVariableClient(remote *git.RemoteInfo) (ProjectVariable, error)
 }
 
 type GitlabProvider struct {
@@ -141,14 +140,6 @@ func (p *GitlabProvider) GetAPIToken(remote *git.RemoteInfo) (string, error) {
 	return token, nil
 }
 
-func (p *GitlabProvider) GetProjectVariableClient(remote *git.RemoteInfo) (ProjectVariable, error) {
-	gitlabClient, err := p.makeGitLabClient(remote)
-	if err != nil {
-		return nil, err
-	}
-	return NewProjectVariableClient(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.")
@@ -230,10 +221,6 @@ func (m *MockProvider) GetAPIToken(remote *git.RemoteInfo) (string, error) {
 	return "", nil
 }
 
-func (m *MockProvider) GetProjectVariableClient(remote *git.RemoteInfo) (ProjectVariable, error) {
-	return m.MockGetProjectVariableClient(remote)
-}
-
 func getGitlabClient(url, token string) (*gitlab.Client, error) {
 	client := gitlab.NewClient(nil, token)
 	if err := client.SetBaseURL(url); err != nil {