Refac(api, workspaces) Moving api to separate folder

.gitignore

@@ -25,6 +25,7 @@ go.work.sum
 .env
 .envrc
 cs
+!**/cs/
 
 # openapi generator
 openapitools.json

.mockery.yml

@@ -0,0 +1,15 @@
+all: false
+dir: '{{.InterfaceDir}}'
+force-file-write: true
+formatter: gofmt
+log-level: info
+structname: '{{.Mock}}{{.InterfaceName}}'
+pkgname: '{{.SrcPackageName}}_test'
+recursive: false
+require-template-schema-exists: true
+template: testify
+template-schema: '{{.Template}}.schema.json'
+packages:
+  github.com/codesphere-cloud/cs-go/cmd:
+    interfaces:
+      Client:

Makefile

@@ -1,5 +1,5 @@
 
-OPENAPI_DIR = ./pkg/api/openapi_client
+OPENAPI_DIR = ./api/openapi_client
 
 all: format build
 
@@ -12,6 +12,9 @@ lint:
 test:
 	go test ./...
 
+generate:
+	go generate ./...
+
 build:
 	cd cmd/cs && go build
 	mv cmd/cs/cs .
@@ -37,4 +40,4 @@ generate-client:
 		${OPENAPI_DIR}/test
 
 
-generate: generate-client format
+generate-api: generate-client format

pkg/api/client.go → api/client.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"net/url"
 
-	"github.com/codesphere-cloud/cs-go/pkg/api/openapi_client"
+	"github.com/codesphere-cloud/cs-go/api/openapi_client"
 )
 
 type Client struct {

pkg/api/types.go → api/types.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	openapi "github.com/codesphere-cloud/cs-go/pkg/api/openapi_client"
+	openapi "github.com/codesphere-cloud/cs-go/api/openapi_client"
 )
 
 type DataCenter = openapi.MetadataGetDatacenters200ResponseInner

cmd/client.go

@@ -0,0 +1,33 @@
+package cmd
+
+//go:generate mockery
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+
+	"github.com/codesphere-cloud/cs-go/api"
+	"github.com/codesphere-cloud/cs-go/pkg/cs"
+)
+
+type Client interface {
+	ListTeams() ([]api.Team, error)
+	ListWorkspaces(teamId int) ([]api.Workspace, error)
+}
+
+func NewClient(opts GlobalOptions) (Client, error) {
+	token, err := cs.GetApiToken()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get API token: %e", err)
+	}
+	apiUrl, err := url.Parse(opts.GetApiUrl())
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse URL '%s': %e", opts.GetApiUrl(), err)
+	}
+	client := api.NewClient(context.Background(), api.Configuration{
+		BaseUrl: apiUrl,
+		Token:   token,
+	})
+	return client, nil
+}

cmd/list-teams.go

@@ -1,11 +1,9 @@
-/*
-Copyright © 2025 Codesphere Inc. <support@codesphere.com>
-*/
 package cmd
 
 import (
 	"fmt"
 
+	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/codesphere-cloud/cs-go/pkg/out"
 	"github.com/jedib0t/go-pretty/v6/table"
 
@@ -53,7 +51,7 @@ func (l *ListTeamsCmd) RunE(_ *cobra.Command, args []string) (err error) {
 		if team.IsFirst != nil && *team.IsFirst {
 			first = "*"
 		}
-		t.AppendRow(table.Row{first, team.Id, team.Name, GetRoleName(int(team.Role)), team.DefaultDataCenterId})
+		t.AppendRow(table.Row{first, team.Id, team.Name, cs.GetRoleName(int(team.Role)), team.DefaultDataCenterId})
 	}
 	t.Render()
 

cmd/list-workspaces.go

@@ -1,21 +1,18 @@
-/*
-Copyright © 2025 Codesphere Inc. <support@codesphere.com>
-*/
 package cmd
 
 import (
 	"fmt"
 
-	"github.com/codesphere-cloud/cs-go/pkg/api"
+	"github.com/codesphere-cloud/cs-go/api"
 	"github.com/codesphere-cloud/cs-go/pkg/out"
 	"github.com/jedib0t/go-pretty/v6/table"
 
 	"github.com/spf13/cobra"
 )
 
 type ListWorkspacesCmd struct {
+	Opts ListWorkspacesOptions
 	cmd  *cobra.Command
-	opts ListWorkspacesOptions
 }
 
 type ListWorkspacesOptions struct {
@@ -35,34 +32,26 @@ List all workspaces:
 $ cs list workspaces --team-id <team-id>
 			`,
 		},
-		opts: ListWorkspacesOptions{GlobalOptions: opts},
+		Opts: ListWorkspacesOptions{GlobalOptions: opts},
 	}
 	l.cmd.RunE = l.RunE
 	l.parseLogCmdFlags()
 	p.AddCommand(l.cmd)
 }
 
 func (l *ListWorkspacesCmd) parseLogCmdFlags() {
-	l.opts.TeamId = l.cmd.Flags().IntP("team-id", "t", -1, "ID of team to query")
+	l.Opts.TeamId = l.cmd.Flags().IntP("team-id", "t", -1, "ID of team to query")
 }
 
 func (l *ListWorkspacesCmd) RunE(_ *cobra.Command, args []string) (err error) {
-	client, err := NewClient(l.opts.GlobalOptions)
+	client, err := NewClient(l.Opts.GlobalOptions)
 	if err != nil {
 		return fmt.Errorf("failed to create Codesphere client: %e", err)
 	}
 
-	teams, err := l.getTeamIds(client)
+	workspaces, err := l.ListWorkspaces(client)
 	if err != nil {
-		return fmt.Errorf("failed to get teams: %e", err)
-	}
-	workspaces := []api.Workspace{}
-	for _, team := range teams {
-		teamWorkspaces, err := client.ListWorkspaces(team)
-		if err != nil {
-			return fmt.Errorf("failed to list workspaces: %e", err)
-		}
-		workspaces = append(workspaces, teamWorkspaces...)
+		return fmt.Errorf("failed to list workspaces: %e", err)
 	}
 
 	t := out.GetTableWriter()
@@ -79,9 +68,25 @@ func (l *ListWorkspacesCmd) RunE(_ *cobra.Command, args []string) (err error) {
 	return nil
 }
 
-func (l *ListWorkspacesCmd) getTeamIds(client *api.Client) (teams []int, err error) {
-	if l.opts.TeamId != nil && *l.opts.TeamId >= 0 {
-		teams = append(teams, *l.opts.TeamId)
+func (l *ListWorkspacesCmd) ListWorkspaces(client Client) ([]api.Workspace, error) {
+	teams, err := l.getTeamIds(client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get teams: %e", err)
+	}
+	workspaces := []api.Workspace{}
+	for _, team := range teams {
+		teamWorkspaces, err := client.ListWorkspaces(team)
+		if err != nil {
+			return nil, fmt.Errorf("failed to list workspaces: %e", err)
+		}
+		workspaces = append(workspaces, teamWorkspaces...)
+	}
+	return workspaces, nil
+}
+
+func (l *ListWorkspacesCmd) getTeamIds(client Client) (teams []int, err error) {
+	if l.Opts.TeamId != nil && *l.Opts.TeamId >= 0 {
+		teams = append(teams, *l.Opts.TeamId)
 		return
 	}
 	var allTeams []api.Team

cmd/list-workspaces_test.go

@@ -0,0 +1,48 @@
+package cmd_test
+
+import (
+	"testing"
+
+	"github.com/codesphere-cloud/cs-go/api"
+	"github.com/codesphere-cloud/cs-go/cmd"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestListWorkspaces(t *testing.T) {
+	l := newListWorkspacesCmdWithTeam(0)
+	client := NewMockClient(t)
+	client.EXPECT().ListWorkspaces(0).Return([]api.Workspace{}, nil)
+
+	w, err := l.ListWorkspaces(client)
+	assert.Equal(t, w, []api.Workspace{}, "should return empty list of workspaces")
+	assert.Nil(t, err, "should be nil")
+}
+
+func TestListWorkspacesAllTeams(t *testing.T) {
+	l := newListWorkspacesCmd()
+	client := NewMockClient(t)
+	client.EXPECT().ListTeams().Return([]api.Team{{Id: 0}, {Id: 1}}, nil)
+
+	expectedWorkspaces := []api.Workspace{
+		{Id: 0, Name: "fakeForTeam0"},
+		{Id: 1, Name: "fakeForTeam1"},
+	}
+	client.EXPECT().ListWorkspaces(0).Return([]api.Workspace{expectedWorkspaces[0]}, nil)
+	client.EXPECT().ListWorkspaces(1).Return([]api.Workspace{expectedWorkspaces[1]}, nil)
+
+	w, err := l.ListWorkspaces(client)
+	assert.Equal(t, w, expectedWorkspaces, "should return both workspaces")
+	assert.Nil(t, err, "should be nil")
+}
+
+func newListWorkspacesCmdWithTeam(teamId int) cmd.ListWorkspacesCmd {
+	return cmd.ListWorkspacesCmd{
+		Opts: cmd.ListWorkspacesOptions{
+			TeamId: &teamId,
+		},
+	}
+}
+
+func newListWorkspacesCmd() cmd.ListWorkspacesCmd {
+	return cmd.ListWorkspacesCmd{}
+}

cmd/list.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2025 Codesphere Inc. <support@codesphere.com>
-*/
 package cmd
 
 import (

cmd/log.go

@@ -1,6 +1,3 @@
-/*
-Copyright © 2025 Codesphere Inc. <support@codesphere.com>
-*/
 package cmd
 
 import (
@@ -17,6 +14,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/codesphere-cloud/cs-go/pkg/cs"
 	"github.com/spf13/cobra"
 )
 
@@ -125,7 +123,7 @@ func (l *LogCmd) RunE(_ *cobra.Command, args []string) (err error) {
 func (l *LogCmd) printAllLogs() error {
 	fmt.Println("Printing logs of all replicas")
 
-	replicas, err := GetPipelineStatus(*l.scope.workspaceId, "run")
+	replicas, err := cs.GetPipelineStatus(*l.scope.workspaceId, "run")
 	if err != nil {
 		return fmt.Errorf("failed to get pipeline status: %e", err)
 	}
@@ -186,7 +184,7 @@ func printLogsOfEndpoint(prefix string, endpoint string) error {
 
 	// Set the Accept header to indicate SSE
 	req.Header.Set("Accept", "text/event-stream")
-	err = SetAuthoriziationHeader(req)
+	err = cs.SetAuthoriziationHeader(req)
 	if err != nil {
 		return fmt.Errorf("failed to set header: %e", err)
 	}