refactor: http status code and error messages in api(daytona #934)

Signed-off-by: the-johnwick <[email protected]>
daytonaio · Sep 9, 2024 · 3a433e9 · 3a433e9
1 parent 480cf32
commit 3a433e9
Show file tree

Hide file tree

Showing 36 changed files with 901 additions and 800 deletions.
diff --git a/internal/testing/server/workspaces/mocks/git_provider_service.go b/internal/testing/server/workspaces/mocks/git_provider_service.go
@@ -45,29 +45,29 @@ func (m *MockGitProviderService) GetGitProviderForUrl(url string) (gitprovider.G
 	return args.Get(0).(gitprovider.GitProvider), args.String(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) GetGitUser(gitProviderId string) (*gitprovider.GitUser, error) {
+func (m *MockGitProviderService) GetGitUser(gitProviderId string) (*gitprovider.GitUser, int, error) {
 	args := m.Called(gitProviderId)
-	return args.Get(0).(*gitprovider.GitUser), args.Error(1)
+	return args.Get(0).(*gitprovider.GitUser), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) GetNamespaces(gitProviderId string) ([]*gitprovider.GitNamespace, error) {
+func (m *MockGitProviderService) GetNamespaces(gitProviderId string) ([]*gitprovider.GitNamespace, int, error) {
 	args := m.Called(gitProviderId)
-	return args.Get(0).([]*gitprovider.GitNamespace), args.Error(1)
+	return args.Get(0).([]*gitprovider.GitNamespace), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) GetRepoBranches(gitProviderId string, namespaceId string, repositoryId string) ([]*gitprovider.GitBranch, error) {
+func (m *MockGitProviderService) GetRepoBranches(gitProviderId string, namespaceId string, repositoryId string) ([]*gitprovider.GitBranch, int, error) {
 	args := m.Called(gitProviderId, namespaceId, repositoryId)
-	return args.Get(0).([]*gitprovider.GitBranch), args.Error(1)
+	return args.Get(0).([]*gitprovider.GitBranch), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) GetRepoPRs(gitProviderId string, namespaceId string, repositoryId string) ([]*gitprovider.GitPullRequest, error) {
+func (m *MockGitProviderService) GetRepoPRs(gitProviderId string, namespaceId string, repositoryId string) ([]*gitprovider.GitPullRequest, int, error) {
 	args := m.Called(gitProviderId, namespaceId, repositoryId)
-	return args.Get(0).([]*gitprovider.GitPullRequest), args.Error(1)
+	return args.Get(0).([]*gitprovider.GitPullRequest), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) GetRepositories(gitProviderId string, namespaceId string) ([]*gitprovider.GitRepository, error) {
+func (m *MockGitProviderService) GetRepositories(gitProviderId string, namespaceId string) ([]*gitprovider.GitRepository, int, error) {
 	args := m.Called(gitProviderId, namespaceId)
-	return args.Get(0).([]*gitprovider.GitRepository), args.Error(1)
+	return args.Get(0).([]*gitprovider.GitRepository), args.Int(1), args.Error(2)
 }
 
 func (m *MockGitProviderService) ListConfigs() ([]*gitprovider.GitProviderConfig, error) {
@@ -80,26 +80,26 @@ func (m *MockGitProviderService) RemoveGitProvider(gitProviderId string) error {
 	return args.Error(0)
 }
 
-func (m *MockGitProviderService) SetGitProviderConfig(providerConfig *gitprovider.GitProviderConfig) error {
+func (m *MockGitProviderService) SetGitProviderConfig(providerConfig *gitprovider.GitProviderConfig) (int, error) {
 	args := m.Called(providerConfig)
-	return args.Error(0)
+	return args.Int(0), args.Error(1)
 }
 
-func (m *MockGitProviderService) GetLastCommitSha(repo *gitprovider.GitRepository) (string, error) {
+func (m *MockGitProviderService) GetLastCommitSha(repo *gitprovider.GitRepository) (string, int, error) {
 	args := m.Called(repo)
-	return args.String(0), args.Error(1)
+	return args.String(0), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) RegisterPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, endpointUrl string) (string, error) {
+func (m *MockGitProviderService) RegisterPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, endpointUrl string) (string, int, error) {
 	args := m.Called(gitProviderId, repo, endpointUrl)
-	return args.String(0), args.Error(1)
+	return args.String(0), args.Int(1), args.Error(2)
 }
-func (m *MockGitProviderService) GetPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, endpointUrl string) (*string, error) {
+func (m *MockGitProviderService) GetPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, endpointUrl string) (*string, int, error) {
 	args := m.Called(gitProviderId, repo, endpointUrl)
-	return args.Get(0).(*string), args.Error(1)
+	return args.Get(0).(*string), args.Int(1), args.Error(2)
 }
 
-func (m *MockGitProviderService) UnregisterPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, id string) error {
+func (m *MockGitProviderService) UnregisterPrebuildWebhook(gitProviderId string, repo *gitprovider.GitRepository, id string) (int, error) {
 	args := m.Called(gitProviderId, repo, id)
-	return args.Error(0)
+	return args.Int(0), args.Error(1)
 }
diff --git a/internal/testing/server/workspaces/mocks/project_config_service.go b/internal/testing/server/workspaces/mocks/project_config_service.go
@@ -20,9 +20,9 @@ func NewMockProjectConfigService() *mockProjectConfigService {
 	return &mockProjectConfigService{}
 }
 
-func (m *mockProjectConfigService) Delete(name string, force bool) []error {
+func (m *mockProjectConfigService) Delete(name string, force bool) (int, []error) {
 	args := m.Called(name, force)
-	return args.Get(0).([]error)
+	return args.Int(0), args.Get(1).([]error)
 }
 
 func (m *mockProjectConfigService) Find(filter *config.ProjectConfigFilter) (*config.ProjectConfig, error) {
@@ -45,9 +45,9 @@ func (m *mockProjectConfigService) Save(pc *config.ProjectConfig) error {
 	return args.Error(0)
 }
 
-func (m *mockProjectConfigService) SetPrebuild(projectConfigName string, createProjectDto dto.CreatePrebuildDTO) (*dto.PrebuildDTO, error) {
+func (m *mockProjectConfigService) SetPrebuild(projectConfigName string, createProjectDto dto.CreatePrebuildDTO) (*dto.PrebuildDTO, int, error) {
 	args := m.Called(projectConfigName, createProjectDto)
-	return args.Get(0).(*dto.PrebuildDTO), args.Error(1)
+	return args.Get(0).(*dto.PrebuildDTO), args.Int(1), args.Error(2)
 }
 
 func (m *mockProjectConfigService) FindPrebuild(projectConfigFilter *config.ProjectConfigFilter, prebuildFilter *config.PrebuildFilter) (*dto.PrebuildDTO, error) {
@@ -60,9 +60,9 @@ func (m *mockProjectConfigService) ListPrebuilds(projectConfigFilter *config.Pro
 	return args.Get(0).([]*dto.PrebuildDTO), args.Error(1)
 }
 
-func (m *mockProjectConfigService) DeletePrebuild(projectConfigName string, id string, force bool) []error {
+func (m *mockProjectConfigService) DeletePrebuild(projectConfigName string, id string, force bool) (int, []error) {
 	args := m.Called(projectConfigName, id, force)
-	return args.Get(0).([]error)
+	return args.Int(0), args.Get(1).([]error)
 }
 
 func (m *mockProjectConfigService) StartRetentionPoller() error {
@@ -75,7 +75,7 @@ func (m *mockProjectConfigService) EnforceRetentionPolicy() error {
 	return args.Error(0)
 }
 
-func (m *mockProjectConfigService) ProcessGitEvent(data gitprovider.GitEventData) error {
+func (m *mockProjectConfigService) ProcessGitEvent(data gitprovider.GitEventData) (int, error) {
 	args := m.Called(data)
-	return args.Error(0)
+	return args.Int(0), args.Error(1)
 }
diff --git a/pkg/api/controllers/build/build.go b/pkg/api/controllers/build/build.go
@@ -51,12 +51,12 @@ func CreateBuild(ctx *gin.Context) {
 		return
 	}
 
-	repo, err := gitProvider.GetRepositoryContext(gitprovider.GetRepositoryContext{
+	repo, statusCode, err := gitProvider.GetRepositoryContext(gitprovider.GetRepositoryContext{
 		Url:    projectConfig.RepositoryUrl,
 		Branch: &createBuildDto.Branch,
 	})
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get repository: %s", err.Error()))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get repository: %s", err.Error()))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/branches.go b/pkg/api/controllers/gitprovider/branches.go
@@ -45,9 +45,9 @@ func GetRepoBranches(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	response, err := server.GitProviderService.GetRepoBranches(gitProviderId, namespaceId, repositoryId)
+	response, statusCode, err := server.GitProviderService.GetRepoBranches(gitProviderId, namespaceId, repositoryId)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get repo branches: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get repo branches: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/context.go b/pkg/api/controllers/gitprovider/context.go
@@ -39,9 +39,9 @@ func GetGitContext(ctx *gin.Context) {
 		return
 	}
 
-	repo, err := gitProvider.GetRepositoryContext(repositoryContext)
+	repo, statusCode, err := gitProvider.GetRepositoryContext(repositoryContext)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get repository: %s", err.Error()))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get repository: %s", err.Error()))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/gitprovider.go b/pkg/api/controllers/gitprovider/gitprovider.go
@@ -137,9 +137,9 @@ func SetGitProvider(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	err = server.GitProviderService.SetGitProviderConfig(&gitProviderConfig)
+	statusCode, err := server.GitProviderService.SetGitProviderConfig(&gitProviderConfig)
 	if err != nil {
-		ctx.AbortWithError(http.StatusBadRequest, fmt.Errorf("failed to set git provider: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to set git provider: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/namespaces.go b/pkg/api/controllers/gitprovider/namespaces.go
@@ -5,7 +5,6 @@ package gitprovider
 
 import (
 	"fmt"
-	"net/http"
 
 	"github.com/daytonaio/daytona/pkg/server"
 	"github.com/gin-gonic/gin"
@@ -27,9 +26,9 @@ func GetNamespaces(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	response, err := server.GitProviderService.GetNamespaces(gitProviderId)
+	response, statusCode, err := server.GitProviderService.GetNamespaces(gitProviderId)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get namespaces: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get namespaces: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/pull_requests.go b/pkg/api/controllers/gitprovider/pull_requests.go
@@ -44,9 +44,9 @@ func GetRepoPRs(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	response, err := server.GitProviderService.GetRepoPRs(gitProviderId, namespaceId, repositoryId)
+	response, statusCode, err := server.GitProviderService.GetRepoPRs(gitProviderId, namespaceId, repositoryId)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get repository pull requests: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get repository pull requests: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/repositories.go b/pkg/api/controllers/gitprovider/repositories.go
@@ -5,7 +5,6 @@ package gitprovider
 
 import (
 	"fmt"
-	"net/http"
 
 	"github.com/daytonaio/daytona/pkg/server"
 	"github.com/gin-gonic/gin"
@@ -29,9 +28,9 @@ func GetRepositories(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	response, err := server.GitProviderService.GetRepositories(gitProviderId, namespaceId)
+	response, statusCode, err := server.GitProviderService.GetRepositories(gitProviderId, namespaceId)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get repositories for url: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get repositories for url: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/gitprovider/user.go b/pkg/api/controllers/gitprovider/user.go
@@ -5,7 +5,6 @@ package gitprovider
 
 import (
 	"fmt"
-	"net/http"
 
 	"github.com/daytonaio/daytona/pkg/server"
 	"github.com/gin-gonic/gin"
@@ -27,9 +26,9 @@ func GetGitUser(ctx *gin.Context) {
 
 	server := server.GetInstance(nil)
 
-	response, err := server.GitProviderService.GetGitUser(gitProviderId)
+	response, statusCode, err := server.GitProviderService.GetGitUser(gitProviderId)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get git user: %w", err))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to get git user: %w", err))
 		return
 	}
 

diff --git a/pkg/api/controllers/projectconfig/prebuild/prebuild.go b/pkg/api/controllers/projectconfig/prebuild/prebuild.go
@@ -72,9 +72,9 @@ func SetPrebuild(ctx *gin.Context) {
 	}
 
 	server := server.GetInstance(nil)
-	prebuild, err := server.ProjectConfigService.SetPrebuild(configName, dto)
+	prebuild, statusCode, err := server.ProjectConfigService.SetPrebuild(configName, dto)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to set prebuild: %s", err.Error()))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to set prebuild: %s", err.Error()))
 		return
 	}
 
@@ -164,7 +164,7 @@ func DeletePrebuild(ctx *gin.Context) {
 	}
 
 	server := server.GetInstance(nil)
-	errs := server.ProjectConfigService.DeletePrebuild(configName, prebuildId, force)
+	statusCode, errs := server.ProjectConfigService.DeletePrebuild(configName, prebuildId, force)
 	if len(errs) > 0 {
 		if config.IsPrebuildNotFound(errs[0]) {
 			ctx.AbortWithError(http.StatusNotFound, errors.New("prebuild not found"))
@@ -173,7 +173,7 @@ func DeletePrebuild(ctx *gin.Context) {
 		for _, err := range errs {
 			_ = ctx.Error(err)
 		}
-		ctx.AbortWithStatus(http.StatusInternalServerError)
+		ctx.AbortWithStatus(statusCode)
 		return
 	}
 

diff --git a/pkg/api/controllers/projectconfig/prebuild/process_git_event.go b/pkg/api/controllers/projectconfig/prebuild/process_git_event.go
@@ -31,19 +31,19 @@ func ProcessGitEvent(ctx *gin.Context) {
 		return
 	}
 
-	gitEventData, err := gitProvider.ParseEventData(ctx.Request)
+	gitEventData, statusCode, err := gitProvider.ParseEventData(ctx.Request)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to parse event data: %s", err.Error()))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to parse event data: %s", err.Error()))
 		return
 	}
 
 	if gitEventData == nil {
 		return
 	}
 
-	err = server.ProjectConfigService.ProcessGitEvent(*gitEventData)
+	statusCode, err = server.ProjectConfigService.ProcessGitEvent(*gitEventData)
 	if err != nil {
-		ctx.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to process git event: %s", err.Error()))
+		ctx.AbortWithError(statusCode, fmt.Errorf("failed to process git event: %s", err.Error()))
 		return
 	}
 

diff --git a/pkg/api/controllers/projectconfig/project_config.go b/pkg/api/controllers/projectconfig/project_config.go
@@ -201,7 +201,7 @@ func DeleteProjectConfig(ctx *gin.Context) {
 		return
 	}
 
-	errs := server.ProjectConfigService.Delete(projectConfig.Name, force)
+	statusCode, errs := server.ProjectConfigService.Delete(projectConfig.Name, force)
 	if len(errs) > 0 {
 		if config.IsProjectConfigNotFound(errs[0]) {
 			ctx.AbortWithError(http.StatusNotFound, errors.New("project config not found"))
@@ -210,7 +210,7 @@ func DeleteProjectConfig(ctx *gin.Context) {
 		for _, err := range errs {
 			_ = ctx.Error(err)
 		}
-		ctx.AbortWithStatus(http.StatusInternalServerError)
+		ctx.AbortWithStatus(statusCode)
 		return
 	}