cli: instantiate viper instead of using a singleton

closes reanahub#76
BrunoRosendo · Sep 1, 2022 · f1baa0f · f1baa0f
1 parent 6c1147e
commit f1baa0f
Show file tree

Hide file tree

Showing 22 changed files with 114 additions and 173 deletions.
diff --git a/client/client.go b/client/client.go
@@ -14,8 +14,8 @@ import (
 	httptransport "github.com/go-openapi/runtime/client"
 )
 
-// ApiClient provides a new API client used to communicate with the REANA server.
-func ApiClient() (*API, error) {
+// NewApiClient provides a new API client used to communicate with the REANA server.
+func NewApiClient(viper *viper.Viper) (*API, error) {
 	// disable certificate security checks
 	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
 		InsecureSkipVerify: true,

diff --git a/cmd/close/close.go b/cmd/close/close.go
@@ -38,7 +38,7 @@ type options struct {
 }
 
 // NewCmd creates a command to close an interactive session.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -47,7 +47,7 @@ func NewCmd() *cobra.Command {
 		Long:  description,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -63,17 +63,13 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	closeParams := operations.NewCloseInteractiveSessionParams()
 	closeParams.SetAccessToken(&o.token)
 	closeParams.SetWorkflowIDOrName(o.workflow)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	log.Infof("Closing an interactive session on %s", o.workflow)
-	_, err = api.Operations.CloseInteractiveSession(closeParams)
+	_, err := api.Operations.CloseInteractiveSession(closeParams)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/delete/delete.go b/cmd/delete/delete.go
@@ -11,6 +11,7 @@ package delete
 
 import (
 	"fmt"
+	"reanahub/reana-client-go/client"
 	"reanahub/reana-client-go/pkg/displayer"
 	"reanahub/reana-client-go/pkg/workflows"
 
@@ -40,7 +41,7 @@ type options struct {
 }
 
 // NewCmd creates a command to delete a workflow.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -49,7 +50,7 @@ func NewCmd() *cobra.Command {
 		Long:  description,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -73,8 +74,9 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	err := workflows.UpdateStatus(
+		api,
 		o.token,
 		o.workflow,
 		"deleted",

diff --git a/cmd/diff/diff.go b/cmd/diff/diff.go
@@ -49,7 +49,7 @@ type options struct {
 }
 
 // NewCmd creates a command to show diff between two workflows.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -60,7 +60,7 @@ func NewCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.workflowA = args[0]
 			o.workflowB = args[1]
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -75,7 +75,7 @@ files in the two workspaces are shown.`)
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	diffParams := operations.NewGetWorkflowDiffParams()
 	diffParams.SetAccessToken(&o.token)
 	diffParams.SetWorkflowIDOrNamea(o.workflowA)
@@ -84,10 +84,6 @@ func (o *options) run(cmd *cobra.Command) error {
 	contextLines := fmt.Sprintf("%d", o.unified)
 	diffParams.SetContextLines(&contextLines)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	diffResp, err := api.Operations.GetWorkflowDiff(diffParams)
 	if err != nil {
 		return err

diff --git a/cmd/du/du.go b/cmd/du/du.go
@@ -49,7 +49,7 @@ type options struct {
 }
 
 // NewCmd creates a command to get workspace disk usage.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -58,7 +58,7 @@ func NewCmd() *cobra.Command {
 		Long:  description,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -85,7 +85,7 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	filters, err := filterer.NewFilters(nil, config.DuMultiFilters, o.filter)
 	if err != nil {
 		return err
@@ -104,10 +104,6 @@ func (o *options) run(cmd *cobra.Command) error {
 	}
 	duParams.SetParameters(additionalParams)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	duResp, err := api.Operations.GetWorkflowDiskUsage(duParams)
 	if err != nil {
 		return err

diff --git a/cmd/info/info.go b/cmd/info/info.go
@@ -33,7 +33,7 @@ type options struct {
 }
 
 // NewCmd creates a command to list cluster general information.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -42,7 +42,7 @@ func NewCmd() *cobra.Command {
 		Long:  description,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -53,14 +53,10 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	infoParams := operations.NewInfoParams()
 	infoParams.SetAccessToken(o.token)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	infoResp, err := api.Operations.Info(infoParams)
 	if err != nil {
 		return err

diff --git a/cmd/list/list.go b/cmd/list/list.go
@@ -75,7 +75,7 @@ type options struct {
 }
 
 // NewCmd creates a new command for listing workflows and sessions.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API, viper *viper.Viper) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -85,7 +85,7 @@ func NewCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.serverURL = viper.GetString("server-url")
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -150,7 +150,7 @@ In case a workflow is in progress, its duration as of now will be shown.`,
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	var runType string
 	if o.listSessions {
 		runType = "interactive"
@@ -182,10 +182,6 @@ func (o *options) run(cmd *cobra.Command) error {
 		listParams.SetIncludeWorkspaceSize(&o.includeWorkspaceSize)
 	}
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	listResp, err := api.Operations.GetWorkflows(listParams)
 	if err != nil {
 		return err

diff --git a/cmd/logs/logs.go b/cmd/logs/logs.go
@@ -76,7 +76,7 @@ type options struct {
 }
 
 // NewCmd creates a command to get workflow logs.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -85,7 +85,7 @@ func NewCmd() *cobra.Command {
 		Long:  description,
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -106,7 +106,7 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	filters, err := parseFilters(o.filters)
 	if err != nil {
 		return err
@@ -125,10 +125,6 @@ func (o *options) run(cmd *cobra.Command) error {
 		logsParams.SetSize(&o.size)
 	}
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	logsResp, err := api.Operations.GetWorkflowLogs(logsParams)
 	if err != nil {
 		return err

diff --git a/cmd/ls/ls.go b/cmd/ls/ls.go
@@ -73,7 +73,7 @@ type Options struct {
 }
 
 // NewCmd creates a command to list workspace files.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API, viper *viper.Viper) *cobra.Command {
 	o := &Options{}
 
 	cmd := &cobra.Command{
@@ -86,7 +86,7 @@ func NewCmd() *cobra.Command {
 			if len(args) > 0 {
 				o.FileName = args[0]
 			}
-			return o.Run(cmd)
+			return o.Run(cmd, api)
 		},
 	}
 
@@ -119,7 +119,7 @@ func NewCmd() *cobra.Command {
 }
 
 // Run runs the ls command with the options provided by o.
-func (o *Options) Run(cmd *cobra.Command) error {
+func (o *Options) Run(cmd *cobra.Command, api *client.API) error {
 	header := []string{"name", "size", "last-modified"}
 
 	filters, err := filterer.NewFilters(nil, header, o.Filters)
@@ -143,10 +143,6 @@ func (o *Options) Run(cmd *cobra.Command) error {
 		lsParams.SetSize(&o.Size)
 	}
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	lsResp, err := api.Operations.GetFiles(lsParams)
 	if err != nil {
 		return err

diff --git a/cmd/mv/mv.go b/cmd/mv/mv.go
@@ -36,7 +36,7 @@ type options struct {
 }
 
 // NewCmd creates a command to move files within workspace.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -47,7 +47,7 @@ func NewCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			o.source = args[0]
 			o.target = args[1]
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -63,18 +63,14 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	mvParams := operations.NewMoveFilesParams()
 	mvParams.SetAccessToken(&o.token)
 	mvParams.SetWorkflowIDOrName(o.workflow)
 	mvParams.SetSource(o.source)
 	mvParams.SetTarget(o.target)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
-	_, err = api.Operations.MoveFiles(mvParams)
+	_, err := api.Operations.MoveFiles(mvParams)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/open/open.go b/cmd/open/open.go
@@ -49,7 +49,7 @@ type options struct {
 }
 
 // NewCmd creates a command to open an interactive session inside the workspace.
-func NewCmd() *cobra.Command {
+func NewCmd(api *client.API, viper *viper.Viper) *cobra.Command {
 	o := &options{}
 
 	cmd := &cobra.Command{
@@ -70,7 +70,7 @@ func NewCmd() *cobra.Command {
 			); err != nil {
 				return err
 			}
-			return o.run(cmd)
+			return o.run(cmd, api)
 		},
 	}
 
@@ -87,7 +87,7 @@ func NewCmd() *cobra.Command {
 	return cmd
 }
 
-func (o *options) run(cmd *cobra.Command) error {
+func (o *options) run(cmd *cobra.Command, api *client.API) error {
 	openParams := operations.NewOpenInteractiveSessionParams()
 	openParams.SetAccessToken(&o.token)
 	openParams.SetWorkflowIDOrName(o.workflow)
@@ -96,10 +96,6 @@ func (o *options) run(cmd *cobra.Command) error {
 		operations.OpenInteractiveSessionBody{Image: o.image},
 	)
 
-	api, err := client.ApiClient()
-	if err != nil {
-		return err
-	}
 	log.Infof("Opening an interactive session on %s", o.workflow)
 	openResp, err := api.Operations.OpenInteractiveSession(openParams)
 	if err != nil {