fix: pass GlobalOptions as pointer (#195)

Author: NautiluX

cli/cmd/create.go

@@ -11,7 +11,7 @@ type CreateCmd struct {
 	cmd *cobra.Command
 }
 
-func AddCreateCmd(rootCmd *cobra.Command, opts GlobalOptions) {
+func AddCreateCmd(rootCmd *cobra.Command, opts *GlobalOptions) {
 	create := CreateCmd{
 		cmd: &cobra.Command{
 			Use:   "create",

cli/cmd/create_workspace.go

@@ -24,7 +24,7 @@ type CreateWorkspaceCmd struct {
 }
 
 type CreateWorkspaceOpts struct {
-	GlobalOptions
+	*GlobalOptions
 	Repo            *string
 	Vpn             *string
 	Env             *[]string
@@ -37,7 +37,7 @@ type CreateWorkspaceOpts struct {
 }
 
 func (c *CreateWorkspaceCmd) RunE(_ *cobra.Command, args []string) error {
-	client, err := NewClient(c.Opts.GlobalOptions)
+	client, err := NewClient(*c.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %w", err)
 	}
@@ -77,7 +77,7 @@ func (c *CreateWorkspaceCmd) RunE(_ *cobra.Command, args []string) error {
 	return nil
 }
 
-func AddCreateWorkspaceCmd(create *cobra.Command, opts GlobalOptions) {
+func AddCreateWorkspaceCmd(create *cobra.Command, opts *GlobalOptions) {
 	workspace := CreateWorkspaceCmd{
 		cmd: &cobra.Command{
 			Use:   "workspace",

cli/cmd/create_workspace_test.go

@@ -54,7 +54,7 @@ var _ = Describe("CreateWorkspace", func() {
 		teamId = 21
 		c = &cmd.CreateWorkspaceCmd{
 			Opts: cmd.CreateWorkspaceOpts{
-				GlobalOptions: cmd.GlobalOptions{
+				GlobalOptions: &cmd.GlobalOptions{
 					Env:    mockEnv,
 					TeamId: teamId,
 				},
@@ -98,7 +98,7 @@ var _ = Describe("CreateWorkspace", func() {
 			createCmd := &cobra.Command{Use: "create"}
 			opts := &cmd.GlobalOptions{Env: cs.NewEnv()}
 
-			cmd.AddCreateWorkspaceCmd(createCmd, *opts)
+			cmd.AddCreateWorkspaceCmd(createCmd, opts)
 
 			createCmd.SetArgs([]string{
 				"workspace",

cli/cmd/curl.go

@@ -27,7 +27,7 @@ func (e *DefaultCommandExecutor) Execute(ctx context.Context, name string, args
 }
 
 type CurlOptions struct {
-	GlobalOptions
+	*GlobalOptions
 	Timeout  time.Duration
 	Executor CommandExecutor // Injectable for testing
 }
@@ -38,7 +38,7 @@ type CurlCmd struct {
 }
 
 func (c *CurlCmd) RunE(_ *cobra.Command, args []string) error {
-	client, err := NewClient(c.Opts.GlobalOptions)
+	client, err := NewClient(*c.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %w", err)
 	}
@@ -59,7 +59,7 @@ func (c *CurlCmd) RunE(_ *cobra.Command, args []string) error {
 	return c.CurlWorkspace(client, wsId, token, path, curlArgs)
 }
 
-func AddCurlCmd(rootCmd *cobra.Command, opts GlobalOptions) {
+func AddCurlCmd(rootCmd *cobra.Command, opts *GlobalOptions) {
 	curl := CurlCmd{
 		cmd: &cobra.Command{
 			Use:   "curl [path] [-- curl-args...]",

cli/cmd/curl_test.go

@@ -44,7 +44,7 @@ var _ = Describe("Curl", func() {
 		}
 		c = &cmd.CurlCmd{
 			Opts: cmd.CurlOptions{
-				GlobalOptions: cmd.GlobalOptions{
+				GlobalOptions: &cmd.GlobalOptions{
 					Env:         mockEnv,
 					WorkspaceId: wsId,
 				},

cli/cmd/delete.go

@@ -11,7 +11,7 @@ type DeleteCmd struct {
 	cmd *cobra.Command
 }
 
-func AddDeleteCmd(rootCmd *cobra.Command, opt GlobalOptions) {
+func AddDeleteCmd(rootCmd *cobra.Command, opt *GlobalOptions) {
 	delete := DeleteCmd{
 		cmd: &cobra.Command{
 			Use:   "delete",

cli/cmd/delete_workspace.go

@@ -23,7 +23,7 @@ type DeleteWorkspaceCmd struct {
 }
 
 type DeleteWorkspaceOpts struct {
-	GlobalOptions
+	*GlobalOptions
 	Confirmed *bool
 }
 
@@ -33,15 +33,15 @@ func (c *DeleteWorkspaceCmd) RunE(_ *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to get workspace ID: %w", err)
 	}
 
-	client, err := NewClient(c.Opts.GlobalOptions)
+	client, err := NewClient(*c.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %w", err)
 	}
 
 	return c.DeleteWorkspace(client, wsId)
 }
 
-func AddDeleteWorkspaceCmd(delete *cobra.Command, opts GlobalOptions) {
+func AddDeleteWorkspaceCmd(delete *cobra.Command, opts *GlobalOptions) {
 	workspace := DeleteWorkspaceCmd{
 		cmd: &cobra.Command{
 			Use:   "workspace",

cli/cmd/delete_workspace_test.go

@@ -31,7 +31,7 @@ var _ = Describe("DeleteWorkspace", func() {
 		mockPrompt = cmd.NewMockPrompt(GinkgoT())
 		c = &cmd.DeleteWorkspaceCmd{
 			Opts: cmd.DeleteWorkspaceOpts{
-				GlobalOptions: cmd.GlobalOptions{
+				GlobalOptions: &cmd.GlobalOptions{
 					Env:         mockEnv,
 					WorkspaceId: wsId,
 				},

cli/cmd/exec.go

@@ -21,7 +21,7 @@ type ExecCmd struct {
 }
 
 type ExecOptions struct {
-	GlobalOptions
+	*GlobalOptions
 	EnvVar  *[]string
 	WorkDir *string
 }
@@ -30,15 +30,15 @@ func (c *ExecCmd) RunE(_ *cobra.Command, args []string) error {
 	command := strings.Join(args, " ")
 	log.Printf("running command %s\n", command)
 
-	client, err := NewClient(c.Opts.GlobalOptions)
+	client, err := NewClient(*c.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %w", err)
 	}
 
 	return c.ExecCommand(client, command)
 }
 
-func AddExecCmd(rootCmd *cobra.Command, opts GlobalOptions) {
+func AddExecCmd(rootCmd *cobra.Command, opts *GlobalOptions) {
 	exec := ExecCmd{
 		cmd: &cobra.Command{
 			Use:   "exec",

cli/cmd/exec_test.go

@@ -32,7 +32,7 @@ var _ = Describe("Exec", func() {
 	JustBeforeEach(func() {
 		e = &cmd.ExecCmd{
 			Opts: cmd.ExecOptions{
-				GlobalOptions: cmd.GlobalOptions{
+				GlobalOptions: &cmd.GlobalOptions{
 					Env:         mockEnv,
 					WorkspaceId: wsId,
 				},