refactor: apiclient package name

.github/workflows/lint_pr.yaml

@@ -35,7 +35,7 @@ jobs:
           go install github.com/swaggo/swag/cmd/[email protected]
           ./hack/swagger.sh
           go fmt ./...
-          git diff --exit-code pkg/serverapiclient/* || (echo "API clients are out of sync! Please generate with './hack/swagger.sh' and commit" && exit 1)
+          git diff --exit-code pkg/apiclient/* || (echo "API clients are out of sync! Please generate with './hack/swagger.sh' and commit" && exit 1)
           git diff --exit-code '**/*.go' || (echo "Code is not formatted! Please run 'go fmt ./...' and commit" && exit 1)
   test:
     name: Unit tests

.licenserc.yaml

@@ -10,7 +10,7 @@ header:
     - "**/*.sh"
 
   paths-ignore:
-    - "**/serverapiclient/**"
+    - "**/apiclient/**"
     - "**/pkg/api/docs/docs.go"
     - ".devcontainer/postcreate.sh"
 

hack/swagger.sh

@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 (cd pkg && swag fmt && swag init --parseDependency --parseInternal --parseDepth 1 -o api/docs -g api/server.go)
-GO_POST_PROCESS_FILE="/usr/local/bin/gofmt -w" GIT_USER_ID=daytonaio GIT_REPO_ID=daytona npx --yes @openapitools/openapi-generator-cli generate -i pkg/api/docs/swagger.json -g go --package-name=serverapiclient --additional-properties=isGoSubmodule=true -o pkg/serverapiclient && rm -rf pkg/serverapiclient/.openapi-generator/FILES
+GO_POST_PROCESS_FILE="/usr/local/bin/gofmt -w" GIT_USER_ID=daytonaio GIT_REPO_ID=daytona npx --yes @openapitools/openapi-generator-cli generate -i pkg/api/docs/swagger.json -g go --package-name=apiclient --additional-properties=isGoSubmodule=true -o pkg/apiclient && rm -rf pkg/apiclient/.openapi-generator/FILES

internal/cmd/tailscale/connection.go

@@ -9,16 +9,15 @@ import (
 
 	"github.com/daytonaio/daytona/cmd/daytona/config"
 	"github.com/daytonaio/daytona/internal/util"
-	"github.com/daytonaio/daytona/internal/util/apiclient"
-	"github.com/daytonaio/daytona/internal/util/apiclient/server"
-	"github.com/daytonaio/daytona/pkg/serverapiclient"
+	apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient"
+	"github.com/daytonaio/daytona/pkg/apiclient"
 	"github.com/daytonaio/daytona/pkg/tailscale"
 	"github.com/google/uuid"
 	"tailscale.com/tsnet"
 )
 
 func GetConnection(profile *config.Profile) (*tsnet.Server, error) {
-	apiClient, err := server.GetApiClient(profile)
+	apiClient, err := apiclient_util.GetApiClient(profile)
 	if err != nil {
 		return nil, err
 	}
@@ -28,14 +27,14 @@ func GetConnection(profile *config.Profile) (*tsnet.Server, error) {
 		return nil, err
 	}
 
-	serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(serverapiclient.ApiGetConfigRequest{})
+	serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(apiclient.ApiGetConfigRequest{})
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, apiclient_util.HandleErrorResponse(res, err)
 	}
 
-	networkKey, res, err := apiClient.ServerAPI.GenerateNetworkKeyExecute(serverapiclient.ApiGenerateNetworkKeyRequest{})
+	networkKey, res, err := apiClient.ServerAPI.GenerateNetworkKeyExecute(apiclient.ApiGenerateNetworkKeyRequest{})
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, apiclient_util.HandleErrorResponse(res, err)
 	}
 
 	cliId := uuid.New().String()

internal/util/apiclient/server/api_client.go → internal/util/apiclient/api_client.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Daytona Platforms Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package server
+package apiclient
 
 import (
 	"context"
@@ -11,15 +11,14 @@ import (
 	"net/url"
 
 	"github.com/daytonaio/daytona/cmd/daytona/config"
-	"github.com/daytonaio/daytona/internal/util/apiclient"
 	"github.com/daytonaio/daytona/pkg/api"
+	"github.com/daytonaio/daytona/pkg/apiclient"
 	"github.com/daytonaio/daytona/pkg/server"
-	"github.com/daytonaio/daytona/pkg/serverapiclient"
 )
 
-var apiClient *serverapiclient.APIClient
+var apiClient *apiclient.APIClient
 
-func GetApiClient(profile *config.Profile) (*serverapiclient.APIClient, error) {
+func GetApiClient(profile *config.Profile) (*apiclient.APIClient, error) {
 	if apiClient != nil {
 		return apiClient, nil
 	}
@@ -53,16 +52,16 @@ func GetApiClient(profile *config.Profile) (*serverapiclient.APIClient, error) {
 		return nil, fmt.Errorf("failed to check server health at: %s. Make sure Daytona is running on the appropriate port", healthUrl)
 	}
 
-	clientConfig := serverapiclient.NewConfiguration()
-	clientConfig.Servers = serverapiclient.ServerConfigurations{
+	clientConfig := apiclient.NewConfiguration()
+	clientConfig.Servers = apiclient.ServerConfigurations{
 		{
 			URL: serverUrl,
 		},
 	}
 
 	clientConfig.AddDefaultHeader("Authorization", fmt.Sprintf("Bearer %s", apiKey))
 
-	apiClient = serverapiclient.NewAPIClient(clientConfig)
+	apiClient = apiclient.NewAPIClient(clientConfig)
 
 	apiClient.GetConfig().HTTPClient = &http.Client{
 		Transport: http.DefaultTransport,
@@ -71,17 +70,17 @@ func GetApiClient(profile *config.Profile) (*serverapiclient.APIClient, error) {
 	return apiClient, nil
 }
 
-func GetAgentApiClient(apiUrl, apiKey string) (*serverapiclient.APIClient, error) {
-	clientConfig := serverapiclient.NewConfiguration()
-	clientConfig.Servers = serverapiclient.ServerConfigurations{
+func GetAgentApiClient(apiUrl, apiKey string) (*apiclient.APIClient, error) {
+	clientConfig := apiclient.NewConfiguration()
+	clientConfig.Servers = apiclient.ServerConfigurations{
 		{
 			URL: apiUrl,
 		},
 	}
 
 	clientConfig.AddDefaultHeader("Authorization", fmt.Sprintf("Bearer %s", apiKey))
 
-	apiClient = serverapiclient.NewAPIClient(clientConfig)
+	apiClient = apiclient.NewAPIClient(clientConfig)
 
 	apiClient.GetConfig().HTTPClient = &http.Client{
 		Transport: http.DefaultTransport,
@@ -90,7 +89,7 @@ func GetAgentApiClient(apiUrl, apiKey string) (*serverapiclient.APIClient, error
 	return apiClient, nil
 }
 
-func ToServerConfig(config serverapiclient.ServerConfig) server.Config {
+func ToServerConfig(config apiclient.ServerConfig) server.Config {
 	return server.Config{
 		ProvidersDir:      *config.ProvidersDir,
 		RegistryUrl:       *config.RegistryUrl,
@@ -106,7 +105,7 @@ func ToServerConfig(config serverapiclient.ServerConfig) server.Config {
 	}
 }
 
-func GetProviderList() ([]serverapiclient.Provider, error) {
+func GetProviderList() ([]apiclient.Provider, error) {
 	apiClient, err := GetApiClient(nil)
 	if err != nil {
 		return nil, err
@@ -116,27 +115,27 @@ func GetProviderList() ([]serverapiclient.Provider, error) {
 
 	providersList, res, err := apiClient.ProviderAPI.ListProviders(ctx).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, HandleErrorResponse(res, err)
 	}
 
 	return providersList, nil
 }
 
-func GetTargetList() ([]serverapiclient.ProviderTarget, error) {
+func GetTargetList() ([]apiclient.ProviderTarget, error) {
 	apiClient, err := GetApiClient(nil)
 	if err != nil {
 		return nil, err
 	}
 
 	targets, resp, err := apiClient.TargetAPI.ListTargets(context.Background()).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(resp, err)
+		return nil, HandleErrorResponse(resp, err)
 	}
 
 	return targets, nil
 }
 
-func GetWorkspace(workspaceNameOrId string) (*serverapiclient.WorkspaceDTO, error) {
+func GetWorkspace(workspaceNameOrId string) (*apiclient.WorkspaceDTO, error) {
 	ctx := context.Background()
 
 	apiClient, err := GetApiClient(nil)
@@ -146,7 +145,7 @@ func GetWorkspace(workspaceNameOrId string) (*serverapiclient.WorkspaceDTO, erro
 
 	workspace, res, err := apiClient.WorkspaceAPI.GetWorkspace(ctx, workspaceNameOrId).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, HandleErrorResponse(res, err)
 	}
 
 	return workspace, nil
@@ -162,7 +161,7 @@ func GetFirstWorkspaceProjectName(workspaceId string, projectName string, profil
 
 	wsInfo, res, err := apiClient.WorkspaceAPI.GetWorkspace(ctx, workspaceId).Execute()
 	if err != nil {
-		return "", apiclient.HandleErrorResponse(res, err)
+		return "", HandleErrorResponse(res, err)
 	}
 
 	if projectName == "" {

internal/util/apiclient/server/conversion/project.go → internal/util/apiclient/conversion/project.go

@@ -4,12 +4,12 @@
 package conversion
 
 import (
+	"github.com/daytonaio/daytona/pkg/apiclient"
 	"github.com/daytonaio/daytona/pkg/gitprovider"
-	"github.com/daytonaio/daytona/pkg/serverapiclient"
 	"github.com/daytonaio/daytona/pkg/workspace"
 )
 
-func ToProject(projectDTO *serverapiclient.Project) *workspace.Project {
+func ToProject(projectDTO *apiclient.Project) *workspace.Project {
 	if projectDTO == nil {
 		return nil
 	}
@@ -54,7 +54,7 @@ func ToProject(projectDTO *serverapiclient.Project) *workspace.Project {
 	return project
 }
 
-func ToGitStatus(gitStatusDTO *serverapiclient.GitStatus) *workspace.GitStatus {
+func ToGitStatus(gitStatusDTO *apiclient.GitStatus) *workspace.GitStatus {
 	if gitStatusDTO == nil {
 		return nil
 	}
@@ -78,16 +78,16 @@ func ToGitStatus(gitStatusDTO *serverapiclient.GitStatus) *workspace.GitStatus {
 	}
 }
 
-func ToGitStatusDTO(gitStatus *workspace.GitStatus) *serverapiclient.GitStatus {
+func ToGitStatusDTO(gitStatus *workspace.GitStatus) *apiclient.GitStatus {
 	if gitStatus == nil {
 		return nil
 	}
 
-	fileStatusDTO := []serverapiclient.FileStatus{}
+	fileStatusDTO := []apiclient.FileStatus{}
 	for _, file := range gitStatus.Files {
-		staging := serverapiclient.Status(string(file.Staging))
-		worktree := serverapiclient.Status(string(file.Worktree))
-		fileDTO := serverapiclient.FileStatus{
+		staging := apiclient.Status(string(file.Staging))
+		worktree := apiclient.Status(string(file.Worktree))
+		fileDTO := apiclient.FileStatus{
 			Name:     &file.Name,
 			Extra:    &file.Extra,
 			Staging:  &staging,
@@ -96,7 +96,7 @@ func ToGitStatusDTO(gitStatus *workspace.GitStatus) *serverapiclient.GitStatus {
 		fileStatusDTO = append(fileStatusDTO, fileDTO)
 	}
 
-	return &serverapiclient.GitStatus{
+	return &apiclient.GitStatus{
 		CurrentBranch: &gitStatus.CurrentBranch,
 		FileStatus:    fileStatusDTO,
 	}

internal/util/apiclient/server/websocket_conn.go → internal/util/apiclient/websocket_conn.go

@@ -1,7 +1,7 @@
 // Copyright 2024 Daytona Platforms Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-package server
+package apiclient
 
 import (
 	"errors"

pkg/agent/agent.go

@@ -12,12 +12,11 @@ import (
 	"time"
 
 	"github.com/daytonaio/daytona/cmd/daytona/config"
-	"github.com/daytonaio/daytona/internal/util/apiclient"
-	"github.com/daytonaio/daytona/internal/util/apiclient/server"
-	"github.com/daytonaio/daytona/internal/util/apiclient/server/conversion"
+	apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient"
+	"github.com/daytonaio/daytona/internal/util/apiclient/conversion"
 	agent_config "github.com/daytonaio/daytona/pkg/agent/config"
+	"github.com/daytonaio/daytona/pkg/apiclient"
 	"github.com/daytonaio/daytona/pkg/gitprovider"
-	"github.com/daytonaio/daytona/pkg/serverapiclient"
 	"github.com/daytonaio/daytona/pkg/workspace"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	log "github.com/sirupsen/logrus"
@@ -127,14 +126,14 @@ func (a *Agent) startProjectMode() error {
 func (a *Agent) getProject() (*workspace.Project, error) {
 	ctx := context.Background()
 
-	apiClient, err := server.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
+	apiClient, err := apiclient_util.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
 	if err != nil {
 		return nil, err
 	}
 
 	workspace, res, err := apiClient.WorkspaceAPI.GetWorkspace(ctx, a.Config.WorkspaceId).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, apiclient_util.HandleErrorResponse(res, err)
 	}
 
 	for _, project := range workspace.Projects {
@@ -146,18 +145,18 @@ func (a *Agent) getProject() (*workspace.Project, error) {
 	return nil, errors.New("project not found")
 }
 
-func (a *Agent) getGitProvider(repoUrl string) (*serverapiclient.GitProvider, error) {
+func (a *Agent) getGitProvider(repoUrl string) (*apiclient.GitProvider, error) {
 	ctx := context.Background()
 
-	apiClient, err := server.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
+	apiClient, err := apiclient_util.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
 	if err != nil {
 		return nil, err
 	}
 
 	encodedUrl := url.QueryEscape(repoUrl)
 	gitProvider, res, err := apiClient.GitProviderAPI.GetGitProviderForUrl(ctx, encodedUrl).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, apiclient_util.HandleErrorResponse(res, err)
 	}
 
 	if gitProvider != nil {
@@ -167,15 +166,15 @@ func (a *Agent) getGitProvider(repoUrl string) (*serverapiclient.GitProvider, er
 	return nil, nil
 }
 
-func (a *Agent) getGitUser(gitProviderId string) (*serverapiclient.GitUser, error) {
-	apiClient, err := server.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
+func (a *Agent) getGitUser(gitProviderId string) (*apiclient.GitUser, error) {
+	apiClient, err := apiclient_util.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
 	if err != nil {
 		return nil, err
 	}
 
 	userData, res, err := apiClient.GitProviderAPI.GetGitUser(context.Background(), gitProviderId).Execute()
 	if err != nil {
-		return nil, apiclient.HandleErrorResponse(res, err)
+		return nil, apiclient_util.HandleErrorResponse(res, err)
 	}
 
 	return userData, nil
@@ -238,7 +237,7 @@ func (a *Agent) uptime() int32 {
 }
 
 func (a *Agent) updateProjectState() error {
-	apiClient, err := server.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
+	apiClient, err := apiclient_util.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey)
 	if err != nil {
 		return err
 	}
@@ -249,12 +248,12 @@ func (a *Agent) updateProjectState() error {
 	}
 
 	uptime := a.uptime()
-	res, err := apiClient.WorkspaceAPI.SetProjectState(context.Background(), a.Config.WorkspaceId, a.Config.ProjectName).SetState(serverapiclient.SetProjectState{
+	res, err := apiClient.WorkspaceAPI.SetProjectState(context.Background(), a.Config.WorkspaceId, a.Config.ProjectName).SetState(apiclient.SetProjectState{
 		Uptime:    &uptime,
 		GitStatus: conversion.ToGitStatusDTO(gitStatus),
 	}).Execute()
 	if err != nil {
-		return apiclient.HandleErrorResponse(res, err)
+		return apiclient_util.HandleErrorResponse(res, err)
 	}
 
 	return nil

pkg/agent/tailscale/server.go

@@ -11,10 +11,10 @@ import (
 	"net/netip"
 	"time"
 
-	"github.com/daytonaio/daytona/internal/util/apiclient/server"
+	apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient"
 	"github.com/daytonaio/daytona/pkg/agent/config"
 	"github.com/daytonaio/daytona/pkg/api"
-	"github.com/daytonaio/daytona/pkg/serverapiclient"
+	"github.com/daytonaio/daytona/pkg/apiclient"
 	"tailscale.com/tsnet"
 
 	log "github.com/sirupsen/logrus"
@@ -63,12 +63,12 @@ func (s *Server) Start() error {
 }
 
 func (s *Server) getNetworkKey() (string, error) {
-	apiClient, err := server.GetAgentApiClient(s.Server.ApiUrl, s.Server.ApiKey)
+	apiClient, err := apiclient_util.GetAgentApiClient(s.Server.ApiUrl, s.Server.ApiKey)
 	if err != nil {
 		return "", err
 	}
 
-	networkKey, _, err := apiClient.ServerAPI.GenerateNetworkKeyExecute(serverapiclient.ApiGenerateNetworkKeyRequest{})
+	networkKey, _, err := apiClient.ServerAPI.GenerateNetworkKeyExecute(apiclient.ApiGenerateNetworkKeyRequest{})
 	// Retry indefinitely. Used to reconnect to the Daytona Server
 	if err != nil {
 		log.Tracef("Failed to get network key: %v", err)