diff --git a/.github/workflows/lint_pr.yaml b/.github/workflows/lint_pr.yaml index a35f9d64b9..e96ae595d5 100644 --- a/.github/workflows/lint_pr.yaml +++ b/.github/workflows/lint_pr.yaml @@ -35,7 +35,7 @@ jobs: go install github.com/swaggo/swag/cmd/swag@v1.16.3 ./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 diff --git a/.licenserc.yaml b/.licenserc.yaml index 324048f6e1..3998b657cc 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -10,7 +10,7 @@ header: - "**/*.sh" paths-ignore: - - "**/serverapiclient/**" + - "**/apiclient/**" - "**/pkg/api/docs/docs.go" - ".devcontainer/postcreate.sh" diff --git a/hack/swagger.sh b/hack/swagger.sh index 0a690a1f6d..fe207934cf 100755 --- a/hack/swagger.sh +++ b/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/internal/cmd/tailscale/connection.go b/internal/cmd/tailscale/connection.go index a3ba8f69f4..51af2494e2 100644 --- a/internal/cmd/tailscale/connection.go +++ b/internal/cmd/tailscale/connection.go @@ -9,9 +9,9 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/tailscale" "github.com/google/uuid" "tailscale.com/tsnet" @@ -28,14 +28,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() diff --git a/internal/util/apiclient/server/api_client.go b/internal/util/apiclient/server/api_client.go index 9579ab040c..cafcf950a1 100644 --- a/internal/util/apiclient/server/api_client.go +++ b/internal/util/apiclient/server/api_client.go @@ -11,15 +11,15 @@ import ( "net/url" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "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,8 +53,8 @@ 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, }, @@ -62,7 +62,7 @@ func GetApiClient(profile *config.Profile) (*serverapiclient.APIClient, error) { 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,9 +71,9 @@ 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, }, @@ -81,7 +81,7 @@ func GetAgentApiClient(apiUrl, apiKey string) (*serverapiclient.APIClient, error 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 +90,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 +106,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,13 +116,13 @@ func GetProviderList() ([]serverapiclient.Provider, error) { providersList, res, err := apiClient.ProviderAPI.ListProviders(ctx).Execute() if err != nil { - return nil, apiclient.HandleErrorResponse(res, err) + return nil, apiclient_util.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 @@ -130,13 +130,13 @@ func GetTargetList() ([]serverapiclient.ProviderTarget, error) { targets, resp, err := apiClient.TargetAPI.ListTargets(context.Background()).Execute() if err != nil { - return nil, apiclient.HandleErrorResponse(resp, err) + return nil, apiclient_util.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 +146,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, apiclient_util.HandleErrorResponse(res, err) } return workspace, nil @@ -162,7 +162,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 "", apiclient_util.HandleErrorResponse(res, err) } if projectName == "" { diff --git a/internal/util/apiclient/server/conversion/project.go b/internal/util/apiclient/server/conversion/project.go index 20088a54a2..c60e517c6d 100644 --- a/internal/util/apiclient/server/conversion/project.go +++ b/internal/util/apiclient/server/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, } diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index bda7aacca3..63e6402216 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -12,12 +12,12 @@ import ( "time" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" "github.com/daytonaio/daytona/internal/util/apiclient/server/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" @@ -134,7 +134,7 @@ func (a *Agent) getProject() (*workspace.Project, error) { 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,7 +146,7 @@ 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) @@ -157,7 +157,7 @@ func (a *Agent) getGitProvider(repoUrl string) (*serverapiclient.GitProvider, er 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,7 +167,7 @@ func (a *Agent) getGitProvider(repoUrl string) (*serverapiclient.GitProvider, er return nil, nil } -func (a *Agent) getGitUser(gitProviderId string) (*serverapiclient.GitUser, error) { +func (a *Agent) getGitUser(gitProviderId string) (*apiclient.GitUser, error) { apiClient, err := server.GetAgentApiClient(a.Config.Server.ApiUrl, a.Config.Server.ApiKey) if err != nil { return nil, err @@ -175,7 +175,7 @@ func (a *Agent) getGitUser(gitProviderId string) (*serverapiclient.GitUser, erro 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 @@ -249,12 +249,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 diff --git a/pkg/agent/tailscale/server.go b/pkg/agent/tailscale/server.go index 2c4df5c926..ff52204115 100644 --- a/pkg/agent/tailscale/server.go +++ b/pkg/agent/tailscale/server.go @@ -14,7 +14,7 @@ import ( "github.com/daytonaio/daytona/internal/util/apiclient/server" "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" @@ -68,7 +68,7 @@ func (s *Server) getNetworkKey() (string, error) { 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) diff --git a/pkg/serverapiclient/.gitignore b/pkg/apiclient/.gitignore similarity index 100% rename from pkg/serverapiclient/.gitignore rename to pkg/apiclient/.gitignore diff --git a/pkg/serverapiclient/.openapi-generator-ignore b/pkg/apiclient/.openapi-generator-ignore similarity index 100% rename from pkg/serverapiclient/.openapi-generator-ignore rename to pkg/apiclient/.openapi-generator-ignore diff --git a/pkg/serverapiclient/.openapi-generator/VERSION b/pkg/apiclient/.openapi-generator/VERSION similarity index 100% rename from pkg/serverapiclient/.openapi-generator/VERSION rename to pkg/apiclient/.openapi-generator/VERSION diff --git a/pkg/serverapiclient/README.md b/pkg/apiclient/README.md similarity index 91% rename from pkg/serverapiclient/README.md rename to pkg/apiclient/README.md index 2e7db2fc33..0d93a9f9e8 100644 --- a/pkg/serverapiclient/README.md +++ b/pkg/apiclient/README.md @@ -1,4 +1,4 @@ -# Go API client for serverapiclient +# Go API client for apiclient Daytona Server API @@ -21,7 +21,7 @@ go get golang.org/x/net/context Put the package under your project folder and add the following in import: ```go -import serverapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" +import apiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ``` To use a proxy, set the environment variable `HTTP_PROXY`: @@ -36,18 +36,18 @@ Default configuration comes with `Servers` field that contains server objects as ### Select Server Configuration -For using other server than the one defined on index 0 set context value `serverapiclient.ContextServerIndex` of type `int`. +For using other server than the one defined on index 0 set context value `apiclient.ContextServerIndex` of type `int`. ```go -ctx := context.WithValue(context.Background(), serverapiclient.ContextServerIndex, 1) +ctx := context.WithValue(context.Background(), apiclient.ContextServerIndex, 1) ``` ### Templated Server URL -Templated server URL is formatted using default variables from configuration or from context value `serverapiclient.ContextServerVariables` of type `map[string]string`. +Templated server URL is formatted using default variables from configuration or from context value `apiclient.ContextServerVariables` of type `map[string]string`. ```go -ctx := context.WithValue(context.Background(), serverapiclient.ContextServerVariables, map[string]string{ +ctx := context.WithValue(context.Background(), apiclient.ContextServerVariables, map[string]string{ "basePath": "v2", }) ``` @@ -58,13 +58,13 @@ Note, enum values are always validated and all unused variables are silently ign Each operation can use different server URL defined using `OperationServers` map in the `Configuration`. An operation is uniquely identified by `"{classname}Service.{nickname}"` string. -Similar rules for overriding default operation server index and variables applies by using `serverapiclient.ContextOperationServerIndices` and `serverapiclient.ContextOperationServerVariables` context maps. +Similar rules for overriding default operation server index and variables applies by using `apiclient.ContextOperationServerIndices` and `apiclient.ContextOperationServerVariables` context maps. ```go -ctx := context.WithValue(context.Background(), serverapiclient.ContextOperationServerIndices, map[string]int{ +ctx := context.WithValue(context.Background(), apiclient.ContextOperationServerIndices, map[string]int{ "{classname}Service.{nickname}": 2, }) -ctx = context.WithValue(context.Background(), serverapiclient.ContextOperationServerVariables, map[string]map[string]string{ +ctx = context.WithValue(context.Background(), apiclient.ContextOperationServerVariables, map[string]map[string]string{ "{classname}Service.{nickname}": { "port": "8443", }, @@ -171,8 +171,8 @@ Example ```go auth := context.WithValue( context.Background(), - serverapiclient.ContextAPIKeys, - map[string]serverapiclient.APIKey{ + apiclient.ContextAPIKeys, + map[string]apiclient.APIKey{ "Authorization": {Key: "API_KEY_STRING"}, }, ) diff --git a/pkg/serverapiclient/api/openapi.yaml b/pkg/apiclient/api/openapi.yaml similarity index 100% rename from pkg/serverapiclient/api/openapi.yaml rename to pkg/apiclient/api/openapi.yaml diff --git a/pkg/serverapiclient/api_api_key.go b/pkg/apiclient/api_api_key.go similarity index 99% rename from pkg/serverapiclient/api_api_key.go rename to pkg/apiclient/api_api_key.go index 5dbcc45075..71fdb30eab 100644 --- a/pkg/serverapiclient/api_api_key.go +++ b/pkg/apiclient/api_api_key.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_container_registry.go b/pkg/apiclient/api_container_registry.go similarity index 99% rename from pkg/serverapiclient/api_container_registry.go rename to pkg/apiclient/api_container_registry.go index c7de9fea78..f4da5c3ac5 100644 --- a/pkg/serverapiclient/api_container_registry.go +++ b/pkg/apiclient/api_container_registry.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_git_provider.go b/pkg/apiclient/api_git_provider.go similarity index 99% rename from pkg/serverapiclient/api_git_provider.go rename to pkg/apiclient/api_git_provider.go index 5cb3a7d6d9..13607d4540 100644 --- a/pkg/serverapiclient/api_git_provider.go +++ b/pkg/apiclient/api_git_provider.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_profile.go b/pkg/apiclient/api_profile.go similarity index 99% rename from pkg/serverapiclient/api_profile.go rename to pkg/apiclient/api_profile.go index 6890ba7029..312e481db9 100644 --- a/pkg/serverapiclient/api_profile.go +++ b/pkg/apiclient/api_profile.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_provider.go b/pkg/apiclient/api_provider.go similarity index 99% rename from pkg/serverapiclient/api_provider.go rename to pkg/apiclient/api_provider.go index 40111d6bbe..01d1ea0db9 100644 --- a/pkg/serverapiclient/api_provider.go +++ b/pkg/apiclient/api_provider.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_server.go b/pkg/apiclient/api_server.go similarity index 99% rename from pkg/serverapiclient/api_server.go rename to pkg/apiclient/api_server.go index 86df85923c..10723b01fc 100644 --- a/pkg/serverapiclient/api_server.go +++ b/pkg/apiclient/api_server.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_target.go b/pkg/apiclient/api_target.go similarity index 99% rename from pkg/serverapiclient/api_target.go rename to pkg/apiclient/api_target.go index 839916d09e..0db35ea763 100644 --- a/pkg/serverapiclient/api_target.go +++ b/pkg/apiclient/api_target.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/api_workspace.go b/pkg/apiclient/api_workspace.go similarity index 99% rename from pkg/serverapiclient/api_workspace.go rename to pkg/apiclient/api_workspace.go index 36190338e8..10515a364a 100644 --- a/pkg/serverapiclient/api_workspace.go +++ b/pkg/apiclient/api_workspace.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/client.go b/pkg/apiclient/client.go similarity index 99% rename from pkg/serverapiclient/client.go rename to pkg/apiclient/client.go index 7e4bdddfcd..7f2a2be177 100644 --- a/pkg/serverapiclient/client.go +++ b/pkg/apiclient/client.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/configuration.go b/pkg/apiclient/configuration.go similarity index 99% rename from pkg/serverapiclient/configuration.go rename to pkg/apiclient/configuration.go index b5b406f2bd..b678c284ed 100644 --- a/pkg/serverapiclient/configuration.go +++ b/pkg/apiclient/configuration.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "context" diff --git a/pkg/serverapiclient/docs/ApiKey.md b/pkg/apiclient/docs/ApiKey.md similarity index 100% rename from pkg/serverapiclient/docs/ApiKey.md rename to pkg/apiclient/docs/ApiKey.md diff --git a/pkg/serverapiclient/docs/ApiKeyAPI.md b/pkg/apiclient/docs/ApiKeyAPI.md similarity index 95% rename from pkg/serverapiclient/docs/ApiKeyAPI.md rename to pkg/apiclient/docs/ApiKeyAPI.md index 67d5008abf..99e12717b5 100644 --- a/pkg/serverapiclient/docs/ApiKeyAPI.md +++ b/pkg/apiclient/docs/ApiKeyAPI.md @@ -27,7 +27,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -97,7 +97,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -158,7 +158,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/ApikeyApiKeyType.md b/pkg/apiclient/docs/ApikeyApiKeyType.md similarity index 100% rename from pkg/serverapiclient/docs/ApikeyApiKeyType.md rename to pkg/apiclient/docs/ApikeyApiKeyType.md diff --git a/pkg/serverapiclient/docs/ContainerRegistry.md b/pkg/apiclient/docs/ContainerRegistry.md similarity index 100% rename from pkg/serverapiclient/docs/ContainerRegistry.md rename to pkg/apiclient/docs/ContainerRegistry.md diff --git a/pkg/serverapiclient/docs/ContainerRegistryAPI.md b/pkg/apiclient/docs/ContainerRegistryAPI.md similarity index 96% rename from pkg/serverapiclient/docs/ContainerRegistryAPI.md rename to pkg/apiclient/docs/ContainerRegistryAPI.md index 30c407f9cb..7653c75bb6 100644 --- a/pkg/serverapiclient/docs/ContainerRegistryAPI.md +++ b/pkg/apiclient/docs/ContainerRegistryAPI.md @@ -28,7 +28,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -98,7 +98,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -159,7 +159,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -227,7 +227,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/CreateWorkspaceRequest.md b/pkg/apiclient/docs/CreateWorkspaceRequest.md similarity index 100% rename from pkg/serverapiclient/docs/CreateWorkspaceRequest.md rename to pkg/apiclient/docs/CreateWorkspaceRequest.md diff --git a/pkg/serverapiclient/docs/CreateWorkspaceRequestProject.md b/pkg/apiclient/docs/CreateWorkspaceRequestProject.md similarity index 100% rename from pkg/serverapiclient/docs/CreateWorkspaceRequestProject.md rename to pkg/apiclient/docs/CreateWorkspaceRequestProject.md diff --git a/pkg/serverapiclient/docs/CreateWorkspaceRequestProjectSource.md b/pkg/apiclient/docs/CreateWorkspaceRequestProjectSource.md similarity index 100% rename from pkg/serverapiclient/docs/CreateWorkspaceRequestProjectSource.md rename to pkg/apiclient/docs/CreateWorkspaceRequestProjectSource.md diff --git a/pkg/serverapiclient/docs/FRPSConfig.md b/pkg/apiclient/docs/FRPSConfig.md similarity index 100% rename from pkg/serverapiclient/docs/FRPSConfig.md rename to pkg/apiclient/docs/FRPSConfig.md diff --git a/pkg/serverapiclient/docs/FileStatus.md b/pkg/apiclient/docs/FileStatus.md similarity index 100% rename from pkg/serverapiclient/docs/FileStatus.md rename to pkg/apiclient/docs/FileStatus.md diff --git a/pkg/serverapiclient/docs/GitBranch.md b/pkg/apiclient/docs/GitBranch.md similarity index 100% rename from pkg/serverapiclient/docs/GitBranch.md rename to pkg/apiclient/docs/GitBranch.md diff --git a/pkg/serverapiclient/docs/GitNamespace.md b/pkg/apiclient/docs/GitNamespace.md similarity index 100% rename from pkg/serverapiclient/docs/GitNamespace.md rename to pkg/apiclient/docs/GitNamespace.md diff --git a/pkg/serverapiclient/docs/GitProvider.md b/pkg/apiclient/docs/GitProvider.md similarity index 100% rename from pkg/serverapiclient/docs/GitProvider.md rename to pkg/apiclient/docs/GitProvider.md diff --git a/pkg/serverapiclient/docs/GitProviderAPI.md b/pkg/apiclient/docs/GitProviderAPI.md similarity index 96% rename from pkg/serverapiclient/docs/GitProviderAPI.md rename to pkg/apiclient/docs/GitProviderAPI.md index ebef225151..f24800ceeb 100644 --- a/pkg/serverapiclient/docs/GitProviderAPI.md +++ b/pkg/apiclient/docs/GitProviderAPI.md @@ -34,7 +34,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -104,7 +104,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -174,7 +174,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -244,7 +244,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -314,7 +314,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -390,7 +390,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -466,7 +466,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -539,7 +539,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -600,7 +600,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -668,7 +668,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/GitPullRequest.md b/pkg/apiclient/docs/GitPullRequest.md similarity index 100% rename from pkg/serverapiclient/docs/GitPullRequest.md rename to pkg/apiclient/docs/GitPullRequest.md diff --git a/pkg/serverapiclient/docs/GitRepository.md b/pkg/apiclient/docs/GitRepository.md similarity index 100% rename from pkg/serverapiclient/docs/GitRepository.md rename to pkg/apiclient/docs/GitRepository.md diff --git a/pkg/serverapiclient/docs/GitStatus.md b/pkg/apiclient/docs/GitStatus.md similarity index 100% rename from pkg/serverapiclient/docs/GitStatus.md rename to pkg/apiclient/docs/GitStatus.md diff --git a/pkg/serverapiclient/docs/GitUser.md b/pkg/apiclient/docs/GitUser.md similarity index 100% rename from pkg/serverapiclient/docs/GitUser.md rename to pkg/apiclient/docs/GitUser.md diff --git a/pkg/serverapiclient/docs/InstallProviderRequest.md b/pkg/apiclient/docs/InstallProviderRequest.md similarity index 100% rename from pkg/serverapiclient/docs/InstallProviderRequest.md rename to pkg/apiclient/docs/InstallProviderRequest.md diff --git a/pkg/serverapiclient/docs/NetworkKey.md b/pkg/apiclient/docs/NetworkKey.md similarity index 100% rename from pkg/serverapiclient/docs/NetworkKey.md rename to pkg/apiclient/docs/NetworkKey.md diff --git a/pkg/serverapiclient/docs/ProfileAPI.md b/pkg/apiclient/docs/ProfileAPI.md similarity index 95% rename from pkg/serverapiclient/docs/ProfileAPI.md rename to pkg/apiclient/docs/ProfileAPI.md index f6ebf94661..db9b99fc85 100644 --- a/pkg/serverapiclient/docs/ProfileAPI.md +++ b/pkg/apiclient/docs/ProfileAPI.md @@ -27,7 +27,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -86,7 +86,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -147,7 +147,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/ProfileData.md b/pkg/apiclient/docs/ProfileData.md similarity index 100% rename from pkg/serverapiclient/docs/ProfileData.md rename to pkg/apiclient/docs/ProfileData.md diff --git a/pkg/serverapiclient/docs/Project.md b/pkg/apiclient/docs/Project.md similarity index 100% rename from pkg/serverapiclient/docs/Project.md rename to pkg/apiclient/docs/Project.md diff --git a/pkg/serverapiclient/docs/ProjectInfo.md b/pkg/apiclient/docs/ProjectInfo.md similarity index 100% rename from pkg/serverapiclient/docs/ProjectInfo.md rename to pkg/apiclient/docs/ProjectInfo.md diff --git a/pkg/serverapiclient/docs/ProjectState.md b/pkg/apiclient/docs/ProjectState.md similarity index 100% rename from pkg/serverapiclient/docs/ProjectState.md rename to pkg/apiclient/docs/ProjectState.md diff --git a/pkg/serverapiclient/docs/Provider.md b/pkg/apiclient/docs/Provider.md similarity index 100% rename from pkg/serverapiclient/docs/Provider.md rename to pkg/apiclient/docs/Provider.md diff --git a/pkg/serverapiclient/docs/ProviderAPI.md b/pkg/apiclient/docs/ProviderAPI.md similarity index 95% rename from pkg/serverapiclient/docs/ProviderAPI.md rename to pkg/apiclient/docs/ProviderAPI.md index fe2d588d9a..4ba2eaed59 100644 --- a/pkg/serverapiclient/docs/ProviderAPI.md +++ b/pkg/apiclient/docs/ProviderAPI.md @@ -28,7 +28,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -98,7 +98,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -162,7 +162,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -223,7 +223,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/ProviderProviderInfo.md b/pkg/apiclient/docs/ProviderProviderInfo.md similarity index 100% rename from pkg/serverapiclient/docs/ProviderProviderInfo.md rename to pkg/apiclient/docs/ProviderProviderInfo.md diff --git a/pkg/serverapiclient/docs/ProviderProviderTargetProperty.md b/pkg/apiclient/docs/ProviderProviderTargetProperty.md similarity index 100% rename from pkg/serverapiclient/docs/ProviderProviderTargetProperty.md rename to pkg/apiclient/docs/ProviderProviderTargetProperty.md diff --git a/pkg/serverapiclient/docs/ProviderProviderTargetPropertyType.md b/pkg/apiclient/docs/ProviderProviderTargetPropertyType.md similarity index 100% rename from pkg/serverapiclient/docs/ProviderProviderTargetPropertyType.md rename to pkg/apiclient/docs/ProviderProviderTargetPropertyType.md diff --git a/pkg/serverapiclient/docs/ProviderTarget.md b/pkg/apiclient/docs/ProviderTarget.md similarity index 100% rename from pkg/serverapiclient/docs/ProviderTarget.md rename to pkg/apiclient/docs/ProviderTarget.md diff --git a/pkg/serverapiclient/docs/ServerAPI.md b/pkg/apiclient/docs/ServerAPI.md similarity index 95% rename from pkg/serverapiclient/docs/ServerAPI.md rename to pkg/apiclient/docs/ServerAPI.md index 6372969158..902a268902 100644 --- a/pkg/serverapiclient/docs/ServerAPI.md +++ b/pkg/apiclient/docs/ServerAPI.md @@ -27,7 +27,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -88,7 +88,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -149,7 +149,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/ServerConfig.md b/pkg/apiclient/docs/ServerConfig.md similarity index 100% rename from pkg/serverapiclient/docs/ServerConfig.md rename to pkg/apiclient/docs/ServerConfig.md diff --git a/pkg/serverapiclient/docs/SetProjectState.md b/pkg/apiclient/docs/SetProjectState.md similarity index 100% rename from pkg/serverapiclient/docs/SetProjectState.md rename to pkg/apiclient/docs/SetProjectState.md diff --git a/pkg/serverapiclient/docs/Status.md b/pkg/apiclient/docs/Status.md similarity index 100% rename from pkg/serverapiclient/docs/Status.md rename to pkg/apiclient/docs/Status.md diff --git a/pkg/serverapiclient/docs/TargetAPI.md b/pkg/apiclient/docs/TargetAPI.md similarity index 95% rename from pkg/serverapiclient/docs/TargetAPI.md rename to pkg/apiclient/docs/TargetAPI.md index 047af0c6a6..7fc6d026c3 100644 --- a/pkg/serverapiclient/docs/TargetAPI.md +++ b/pkg/apiclient/docs/TargetAPI.md @@ -27,7 +27,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -88,7 +88,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -156,7 +156,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/Workspace.md b/pkg/apiclient/docs/Workspace.md similarity index 100% rename from pkg/serverapiclient/docs/Workspace.md rename to pkg/apiclient/docs/Workspace.md diff --git a/pkg/serverapiclient/docs/WorkspaceAPI.md b/pkg/apiclient/docs/WorkspaceAPI.md similarity index 96% rename from pkg/serverapiclient/docs/WorkspaceAPI.md rename to pkg/apiclient/docs/WorkspaceAPI.md index 580a074ec6..57b4fb1e2b 100644 --- a/pkg/serverapiclient/docs/WorkspaceAPI.md +++ b/pkg/apiclient/docs/WorkspaceAPI.md @@ -33,7 +33,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -99,7 +99,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -169,7 +169,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -235,7 +235,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -303,7 +303,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -376,7 +376,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -447,7 +447,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -515,7 +515,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { @@ -586,7 +586,7 @@ import ( "context" "fmt" "os" - openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/serverapiclient" + openapiclient "github.com/GIT_USER_ID/GIT_REPO_ID/apiclient" ) func main() { diff --git a/pkg/serverapiclient/docs/WorkspaceDTO.md b/pkg/apiclient/docs/WorkspaceDTO.md similarity index 100% rename from pkg/serverapiclient/docs/WorkspaceDTO.md rename to pkg/apiclient/docs/WorkspaceDTO.md diff --git a/pkg/serverapiclient/docs/WorkspaceInfo.md b/pkg/apiclient/docs/WorkspaceInfo.md similarity index 100% rename from pkg/serverapiclient/docs/WorkspaceInfo.md rename to pkg/apiclient/docs/WorkspaceInfo.md diff --git a/pkg/serverapiclient/model_api_key.go b/pkg/apiclient/model_api_key.go similarity index 99% rename from pkg/serverapiclient/model_api_key.go rename to pkg/apiclient/model_api_key.go index ba215e0bc1..8683d47344 100644 --- a/pkg/serverapiclient/model_api_key.go +++ b/pkg/apiclient/model_api_key.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_apikey_api_key_type.go b/pkg/apiclient/model_apikey_api_key_type.go similarity index 99% rename from pkg/serverapiclient/model_apikey_api_key_type.go rename to pkg/apiclient/model_apikey_api_key_type.go index 89207d0c89..f642f25cf5 100644 --- a/pkg/serverapiclient/model_apikey_api_key_type.go +++ b/pkg/apiclient/model_apikey_api_key_type.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_container_registry.go b/pkg/apiclient/model_container_registry.go similarity index 99% rename from pkg/serverapiclient/model_container_registry.go rename to pkg/apiclient/model_container_registry.go index b491f300cb..3f9d8905fc 100644 --- a/pkg/serverapiclient/model_container_registry.go +++ b/pkg/apiclient/model_container_registry.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_create_workspace_request.go b/pkg/apiclient/model_create_workspace_request.go similarity index 99% rename from pkg/serverapiclient/model_create_workspace_request.go rename to pkg/apiclient/model_create_workspace_request.go index d86d0e8391..9df8b540b0 100644 --- a/pkg/serverapiclient/model_create_workspace_request.go +++ b/pkg/apiclient/model_create_workspace_request.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/model_create_workspace_request_project.go b/pkg/apiclient/model_create_workspace_request_project.go similarity index 99% rename from pkg/serverapiclient/model_create_workspace_request_project.go rename to pkg/apiclient/model_create_workspace_request_project.go index 7d7dcb4ac0..675f3fdc15 100644 --- a/pkg/serverapiclient/model_create_workspace_request_project.go +++ b/pkg/apiclient/model_create_workspace_request_project.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "bytes" diff --git a/pkg/serverapiclient/model_create_workspace_request_project_source.go b/pkg/apiclient/model_create_workspace_request_project_source.go similarity index 99% rename from pkg/serverapiclient/model_create_workspace_request_project_source.go rename to pkg/apiclient/model_create_workspace_request_project_source.go index b63812fc41..c9e96efb19 100644 --- a/pkg/serverapiclient/model_create_workspace_request_project_source.go +++ b/pkg/apiclient/model_create_workspace_request_project_source.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_file_status.go b/pkg/apiclient/model_file_status.go similarity index 99% rename from pkg/serverapiclient/model_file_status.go rename to pkg/apiclient/model_file_status.go index 5d7ee5f6e4..8c25cbd7f7 100644 --- a/pkg/serverapiclient/model_file_status.go +++ b/pkg/apiclient/model_file_status.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_frps_config.go b/pkg/apiclient/model_frps_config.go similarity index 99% rename from pkg/serverapiclient/model_frps_config.go rename to pkg/apiclient/model_frps_config.go index 1b60884186..60ee616335 100644 --- a/pkg/serverapiclient/model_frps_config.go +++ b/pkg/apiclient/model_frps_config.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_branch.go b/pkg/apiclient/model_git_branch.go similarity index 99% rename from pkg/serverapiclient/model_git_branch.go rename to pkg/apiclient/model_git_branch.go index 8dac81dd9a..e687779d30 100644 --- a/pkg/serverapiclient/model_git_branch.go +++ b/pkg/apiclient/model_git_branch.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_namespace.go b/pkg/apiclient/model_git_namespace.go similarity index 99% rename from pkg/serverapiclient/model_git_namespace.go rename to pkg/apiclient/model_git_namespace.go index dfd41c0659..6c1ae005eb 100644 --- a/pkg/serverapiclient/model_git_namespace.go +++ b/pkg/apiclient/model_git_namespace.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_provider.go b/pkg/apiclient/model_git_provider.go similarity index 99% rename from pkg/serverapiclient/model_git_provider.go rename to pkg/apiclient/model_git_provider.go index e5e786288a..70acdd718e 100644 --- a/pkg/serverapiclient/model_git_provider.go +++ b/pkg/apiclient/model_git_provider.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_pull_request.go b/pkg/apiclient/model_git_pull_request.go similarity index 99% rename from pkg/serverapiclient/model_git_pull_request.go rename to pkg/apiclient/model_git_pull_request.go index 2fca50cbe7..2952889b4e 100644 --- a/pkg/serverapiclient/model_git_pull_request.go +++ b/pkg/apiclient/model_git_pull_request.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_repository.go b/pkg/apiclient/model_git_repository.go similarity index 99% rename from pkg/serverapiclient/model_git_repository.go rename to pkg/apiclient/model_git_repository.go index 0b635ce800..c65fc8447d 100644 --- a/pkg/serverapiclient/model_git_repository.go +++ b/pkg/apiclient/model_git_repository.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_status.go b/pkg/apiclient/model_git_status.go similarity index 99% rename from pkg/serverapiclient/model_git_status.go rename to pkg/apiclient/model_git_status.go index c19ce5b31c..4f5d306277 100644 --- a/pkg/serverapiclient/model_git_status.go +++ b/pkg/apiclient/model_git_status.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_git_user.go b/pkg/apiclient/model_git_user.go similarity index 99% rename from pkg/serverapiclient/model_git_user.go rename to pkg/apiclient/model_git_user.go index 42282334a0..de0dbc4582 100644 --- a/pkg/serverapiclient/model_git_user.go +++ b/pkg/apiclient/model_git_user.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_install_provider_request.go b/pkg/apiclient/model_install_provider_request.go similarity index 99% rename from pkg/serverapiclient/model_install_provider_request.go rename to pkg/apiclient/model_install_provider_request.go index 2d0e835de1..43f32296e9 100644 --- a/pkg/serverapiclient/model_install_provider_request.go +++ b/pkg/apiclient/model_install_provider_request.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_network_key.go b/pkg/apiclient/model_network_key.go similarity index 99% rename from pkg/serverapiclient/model_network_key.go rename to pkg/apiclient/model_network_key.go index c6563d2d31..3dd532856c 100644 --- a/pkg/serverapiclient/model_network_key.go +++ b/pkg/apiclient/model_network_key.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_profile_data.go b/pkg/apiclient/model_profile_data.go similarity index 99% rename from pkg/serverapiclient/model_profile_data.go rename to pkg/apiclient/model_profile_data.go index b274f57024..74f8a985b2 100644 --- a/pkg/serverapiclient/model_profile_data.go +++ b/pkg/apiclient/model_profile_data.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_project.go b/pkg/apiclient/model_project.go similarity index 99% rename from pkg/serverapiclient/model_project.go rename to pkg/apiclient/model_project.go index 2b1d0aa8fe..64cfd871df 100644 --- a/pkg/serverapiclient/model_project.go +++ b/pkg/apiclient/model_project.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_project_info.go b/pkg/apiclient/model_project_info.go similarity index 99% rename from pkg/serverapiclient/model_project_info.go rename to pkg/apiclient/model_project_info.go index cba51c8446..31298c7236 100644 --- a/pkg/serverapiclient/model_project_info.go +++ b/pkg/apiclient/model_project_info.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_project_state.go b/pkg/apiclient/model_project_state.go similarity index 99% rename from pkg/serverapiclient/model_project_state.go rename to pkg/apiclient/model_project_state.go index 4624542401..c8b219988f 100644 --- a/pkg/serverapiclient/model_project_state.go +++ b/pkg/apiclient/model_project_state.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_provider.go b/pkg/apiclient/model_provider.go similarity index 99% rename from pkg/serverapiclient/model_provider.go rename to pkg/apiclient/model_provider.go index 5d154d3286..6f36cb18fa 100644 --- a/pkg/serverapiclient/model_provider.go +++ b/pkg/apiclient/model_provider.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_provider_provider_info.go b/pkg/apiclient/model_provider_provider_info.go similarity index 99% rename from pkg/serverapiclient/model_provider_provider_info.go rename to pkg/apiclient/model_provider_provider_info.go index 44893154b3..270b0f850a 100644 --- a/pkg/serverapiclient/model_provider_provider_info.go +++ b/pkg/apiclient/model_provider_provider_info.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_provider_provider_target_property.go b/pkg/apiclient/model_provider_provider_target_property.go similarity index 99% rename from pkg/serverapiclient/model_provider_provider_target_property.go rename to pkg/apiclient/model_provider_provider_target_property.go index 396645efab..4e902b4c6c 100644 --- a/pkg/serverapiclient/model_provider_provider_target_property.go +++ b/pkg/apiclient/model_provider_provider_target_property.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_provider_provider_target_property_type.go b/pkg/apiclient/model_provider_provider_target_property_type.go similarity index 99% rename from pkg/serverapiclient/model_provider_provider_target_property_type.go rename to pkg/apiclient/model_provider_provider_target_property_type.go index 865ccbdcd6..48c56fc8c2 100644 --- a/pkg/serverapiclient/model_provider_provider_target_property_type.go +++ b/pkg/apiclient/model_provider_provider_target_property_type.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_provider_target.go b/pkg/apiclient/model_provider_target.go similarity index 99% rename from pkg/serverapiclient/model_provider_target.go rename to pkg/apiclient/model_provider_target.go index 8860e18639..3994dd2284 100644 --- a/pkg/serverapiclient/model_provider_target.go +++ b/pkg/apiclient/model_provider_target.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_server_config.go b/pkg/apiclient/model_server_config.go similarity index 99% rename from pkg/serverapiclient/model_server_config.go rename to pkg/apiclient/model_server_config.go index ba3f94edc9..bf4653f421 100644 --- a/pkg/serverapiclient/model_server_config.go +++ b/pkg/apiclient/model_server_config.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_set_project_state.go b/pkg/apiclient/model_set_project_state.go similarity index 99% rename from pkg/serverapiclient/model_set_project_state.go rename to pkg/apiclient/model_set_project_state.go index 9ff37611a4..a43721a2fe 100644 --- a/pkg/serverapiclient/model_set_project_state.go +++ b/pkg/apiclient/model_set_project_state.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_status.go b/pkg/apiclient/model_status.go similarity index 99% rename from pkg/serverapiclient/model_status.go rename to pkg/apiclient/model_status.go index 77bf24eb19..f74ffda6b7 100644 --- a/pkg/serverapiclient/model_status.go +++ b/pkg/apiclient/model_status.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_workspace.go b/pkg/apiclient/model_workspace.go similarity index 99% rename from pkg/serverapiclient/model_workspace.go rename to pkg/apiclient/model_workspace.go index 687db3333a..c240ab678a 100644 --- a/pkg/serverapiclient/model_workspace.go +++ b/pkg/apiclient/model_workspace.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_workspace_dto.go b/pkg/apiclient/model_workspace_dto.go similarity index 99% rename from pkg/serverapiclient/model_workspace_dto.go rename to pkg/apiclient/model_workspace_dto.go index 57f1754ee7..a05ba675fd 100644 --- a/pkg/serverapiclient/model_workspace_dto.go +++ b/pkg/apiclient/model_workspace_dto.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/model_workspace_info.go b/pkg/apiclient/model_workspace_info.go similarity index 99% rename from pkg/serverapiclient/model_workspace_info.go rename to pkg/apiclient/model_workspace_info.go index 67731e93d8..e2d7dfba83 100644 --- a/pkg/serverapiclient/model_workspace_info.go +++ b/pkg/apiclient/model_workspace_info.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/serverapiclient/response.go b/pkg/apiclient/response.go similarity index 98% rename from pkg/serverapiclient/response.go rename to pkg/apiclient/response.go index cfd3956846..750cbb3551 100644 --- a/pkg/serverapiclient/response.go +++ b/pkg/apiclient/response.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "net/http" diff --git a/pkg/serverapiclient/utils.go b/pkg/apiclient/utils.go similarity index 99% rename from pkg/serverapiclient/utils.go rename to pkg/apiclient/utils.go index 26722000f1..4069a797a0 100644 --- a/pkg/serverapiclient/utils.go +++ b/pkg/apiclient/utils.go @@ -8,7 +8,7 @@ API version: 0.1.0 // Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. -package serverapiclient +package apiclient import ( "encoding/json" diff --git a/pkg/cmd/apikey/generate.go b/pkg/cmd/apikey/generate.go index eb26ddc63c..7001ad40fc 100644 --- a/pkg/cmd/apikey/generate.go +++ b/pkg/cmd/apikey/generate.go @@ -12,9 +12,9 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/server/apikey" view "github.com/daytonaio/daytona/pkg/views/server/apikey" @@ -38,7 +38,7 @@ var GenerateCmd = &cobra.Command{ apiKeyList, _, err := apiClient.ApiKeyAPI.ListClientApiKeys(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(nil, err)) + log.Fatal(apiclient_util.HandleErrorResponse(nil, err)) } if len(args) == 1 { @@ -55,7 +55,7 @@ var GenerateCmd = &cobra.Command{ key, _, err := apiClient.ApiKeyAPI.GenerateApiKey(ctx, keyName).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(nil, err)) + log.Fatal(apiclient_util.HandleErrorResponse(nil, err)) } if saveFlag { @@ -67,7 +67,7 @@ var GenerateCmd = &cobra.Command{ return } - serverConfig, _, err := apiClient.ServerAPI.GetConfigExecute(serverapiclient.ApiGetConfigRequest{}) + serverConfig, _, err := apiClient.ServerAPI.GetConfigExecute(apiclient.ApiGetConfigRequest{}) if err != nil { log.Fatal(err) } diff --git a/pkg/cmd/apikey/revoke.go b/pkg/cmd/apikey/revoke.go index 7c95888617..809ff7b8e6 100644 --- a/pkg/cmd/apikey/revoke.go +++ b/pkg/cmd/apikey/revoke.go @@ -13,9 +13,9 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" "github.com/daytonaio/daytona/internal/apikeys" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/server/apikey" ) @@ -45,11 +45,11 @@ var revokeCmd = &cobra.Command{ log.Fatal(err) } - var selectedApiKey *serverapiclient.ApiKey + var selectedApiKey *apiclient.ApiKey apiKeyList, _, err := apiClient.ApiKeyAPI.ListClientApiKeys(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(nil, err)) + log.Fatal(apiclient_util.HandleErrorResponse(nil, err)) } if len(args) == 1 { @@ -96,7 +96,7 @@ var revokeCmd = &cobra.Command{ if yesFlag { _, err = apiClient.ApiKeyAPI.RevokeApiKey(ctx, *selectedApiKey.Name).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(nil, err)) + log.Fatal(apiclient_util.HandleErrorResponse(nil, err)) } views.RenderInfoMessage("API key revoked") diff --git a/pkg/cmd/containerregistry/delete.go b/pkg/cmd/containerregistry/delete.go index fc179e3214..d15fc89ce8 100644 --- a/pkg/cmd/containerregistry/delete.go +++ b/pkg/cmd/containerregistry/delete.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" containerregistry_view "github.com/daytonaio/daytona/pkg/views/containerregistry" log "github.com/sirupsen/logrus" @@ -23,7 +23,7 @@ var containerRegistryDeleteCmd = &cobra.Command{ Short: "Delete a container registry", Args: cobra.RangeArgs(0, 2), Run: func(cmd *cobra.Command, args []string) { - var registryDto *serverapiclient.ContainerRegistry + var registryDto *apiclient.ContainerRegistry var selectedServer string apiClient, err := server.GetApiClient(nil) @@ -44,7 +44,7 @@ var containerRegistryDeleteCmd = &cobra.Command{ containerRegistries, res, err := apiClient.ContainerRegistryAPI.ListContainerRegistries(context.Background()).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } if len(containerRegistries) == 0 { @@ -64,7 +64,7 @@ var containerRegistryDeleteCmd = &cobra.Command{ res, err := apiClient.ContainerRegistryAPI.RemoveContainerRegistry(context.Background(), url.QueryEscape(selectedServer)).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } views.RenderInfoMessage("Container registry deleted successfully") diff --git a/pkg/cmd/containerregistry/set.go b/pkg/cmd/containerregistry/set.go index 0dc82016a6..ddc5ec2fce 100644 --- a/pkg/cmd/containerregistry/set.go +++ b/pkg/cmd/containerregistry/set.go @@ -8,9 +8,9 @@ import ( "net/url" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" containerregistry_view "github.com/daytonaio/daytona/pkg/views/containerregistry" "github.com/spf13/cobra" @@ -24,7 +24,7 @@ var containerRegistrySetCmd = &cobra.Command{ Args: cobra.NoArgs, Aliases: []string{"add", "update", "register"}, Run: func(cmd *cobra.Command, args []string) { - var registryDto *serverapiclient.ContainerRegistry + var registryDto *apiclient.ContainerRegistry selectedServer := serverFlag c, err := config.GetConfig() @@ -50,7 +50,7 @@ var containerRegistrySetCmd = &cobra.Command{ containerRegistries, res, err := apiClient.ContainerRegistryAPI.ListContainerRegistries(context.Background()).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } if serverFlag == "" || usernameFlag == "" || passwordFlag == "" { @@ -79,7 +79,7 @@ var containerRegistrySetCmd = &cobra.Command{ } } - registryDto = &serverapiclient.ContainerRegistry{ + registryDto = &apiclient.ContainerRegistry{ Server: ®istryView.Server, Username: ®istryView.Username, Password: ®istryView.Password, @@ -87,7 +87,7 @@ var containerRegistrySetCmd = &cobra.Command{ res, err = apiClient.ContainerRegistryAPI.SetContainerRegistry(context.Background(), url.QueryEscape(selectedServer)).ContainerRegistry(*registryDto).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } views.RenderInfoMessage("Registry set successfully") diff --git a/pkg/cmd/gitprovider/add.go b/pkg/cmd/gitprovider/add.go index 26222c9041..3d4656338a 100644 --- a/pkg/cmd/gitprovider/add.go +++ b/pkg/cmd/gitprovider/add.go @@ -7,7 +7,7 @@ import ( "context" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" gitprovider_view "github.com/daytonaio/daytona/pkg/views/gitprovider" log "github.com/sirupsen/logrus" @@ -26,7 +26,7 @@ var GitProviderAddCmd = &cobra.Command{ log.Fatal(err) } - gitProviderData := serverapiclient.GitProvider{} + gitProviderData := apiclient.GitProvider{} gitProviderData.Id = new(string) gitProviderData.Username = new(string) gitProviderData.Token = new(string) diff --git a/pkg/cmd/gitprovider/delete.go b/pkg/cmd/gitprovider/delete.go index 2e4d1f0a34..842f12b4b7 100644 --- a/pkg/cmd/gitprovider/delete.go +++ b/pkg/cmd/gitprovider/delete.go @@ -6,9 +6,9 @@ package gitprovider import ( "context" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" gitprovider_view "github.com/daytonaio/daytona/pkg/views/gitprovider" log "github.com/sirupsen/logrus" @@ -29,10 +29,10 @@ var gitProviderDeleteCmd = &cobra.Command{ gitProviders, res, err := apiClient.GitProviderAPI.ListGitProviders(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } - var gitProviderData serverapiclient.GitProvider + var gitProviderData apiclient.GitProvider gitProviderData.Id = new(string) gitProviderData.Username = new(string) gitProviderData.Token = new(string) diff --git a/pkg/cmd/provider/install.go b/pkg/cmd/provider/install.go index d4efd3dc2a..2fc717b5ab 100644 --- a/pkg/cmd/provider/install.go +++ b/pkg/cmd/provider/install.go @@ -6,11 +6,11 @@ package provider import ( "fmt" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/os" "github.com/daytonaio/daytona/pkg/provider/manager" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/provider" "github.com/spf13/cobra" @@ -29,9 +29,9 @@ var providerInstallCmd = &cobra.Command{ log.Fatal(err) } - serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(serverapiclient.ApiGetConfigRequest{}) + serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(apiclient.ApiGetConfigRequest{}) if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } providersManifest, err := manager.GetProvidersManifest(*serverConfig.RegistryUrl) @@ -55,12 +55,12 @@ var providerInstallCmd = &cobra.Command{ } downloadUrls := convertToStringMap((*providersManifest)[*providerToInstall.Name].Versions[*providerToInstall.Version].DownloadUrls) - res, err = apiClient.ProviderAPI.InstallProviderExecute(serverapiclient.ApiInstallProviderRequest{}.Provider(serverapiclient.InstallProviderRequest{ + res, err = apiClient.ProviderAPI.InstallProviderExecute(apiclient.ApiInstallProviderRequest{}.Provider(apiclient.InstallProviderRequest{ Name: providerToInstall.Name, DownloadUrls: &downloadUrls, })) if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } if err != nil { @@ -71,11 +71,11 @@ var providerInstallCmd = &cobra.Command{ }, } -func convertToDTO(manifest *manager.ProvidersManifest) []serverapiclient.Provider { - pluginList := []serverapiclient.Provider{} +func convertToDTO(manifest *manager.ProvidersManifest) []apiclient.Provider { + pluginList := []apiclient.Provider{} for pluginName, pluginManifest := range *manifest { for version := range pluginManifest.Versions { - pluginList = append(pluginList, serverapiclient.Provider{ + pluginList = append(pluginList, apiclient.Provider{ Name: &pluginName, Version: &version, }) diff --git a/pkg/cmd/provider/update.go b/pkg/cmd/provider/update.go index 5e97e7df11..6a6c96f9e3 100644 --- a/pkg/cmd/provider/update.go +++ b/pkg/cmd/provider/update.go @@ -6,10 +6,10 @@ package provider import ( "fmt" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/provider/manager" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views/provider" "github.com/spf13/cobra" @@ -34,9 +34,9 @@ var providerUpdateCmd = &cobra.Command{ log.Fatal(err) } - serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(serverapiclient.ApiGetConfigRequest{}) + serverConfig, res, err := apiClient.ServerAPI.GetConfigExecute(apiclient.ApiGetConfigRequest{}) if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } providersManifest, err := manager.GetProvidersManifest(*serverConfig.RegistryUrl) @@ -75,7 +75,7 @@ var providerUpdateCmd = &cobra.Command{ }, } -func updateProvider(providerToUpdate *serverapiclient.Provider, providersManifest *manager.ProvidersManifest, apiClient *serverapiclient.APIClient) error { +func updateProvider(providerToUpdate *apiclient.Provider, providersManifest *manager.ProvidersManifest, apiClient *apiclient.APIClient) error { providerManifest, ok := (*providersManifest)[*providerToUpdate.Name] if !ok { return fmt.Errorf("Provider %s not found in manifest", *providerToUpdate.Name) @@ -88,12 +88,12 @@ func updateProvider(providerToUpdate *serverapiclient.Provider, providersManifes downloadUrls := convertToStringMap(version.DownloadUrls) - res, err := apiClient.ProviderAPI.InstallProviderExecute(serverapiclient.ApiInstallProviderRequest{}.Provider(serverapiclient.InstallProviderRequest{ + res, err := apiClient.ProviderAPI.InstallProviderExecute(apiclient.ApiInstallProviderRequest{}.Provider(apiclient.InstallProviderRequest{ Name: providerToUpdate.Name, DownloadUrls: &downloadUrls, })) if err != nil { - return apiclient.HandleErrorResponse(res, err) + return apiclient_util.HandleErrorResponse(res, err) } return nil diff --git a/pkg/cmd/target/set.go b/pkg/cmd/target/set.go index 5a5b638cb2..9dc8809a68 100644 --- a/pkg/cmd/target/set.go +++ b/pkg/cmd/target/set.go @@ -8,9 +8,9 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" internal_util "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/provider" "github.com/daytonaio/daytona/pkg/views/target" @@ -54,7 +54,7 @@ var TargetSetCmd = &cobra.Command{ log.Fatal(err) } - filteredTargets := []serverapiclient.ProviderTarget{} + filteredTargets := []apiclient.ProviderTarget{} for _, t := range targets { if *t.ProviderInfo.Name == *selectedProvider.Name { filteredTargets = append(filteredTargets, t) @@ -73,12 +73,12 @@ var TargetSetCmd = &cobra.Command{ targetManifest, res, err := client.ProviderAPI.GetTargetManifest(context.Background(), *selectedProvider.Name).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } if *selectedTarget.Name == target.NewTargetName { *selectedTarget.Name = "" - err = target.NewTargetNameInput(selectedTarget.Name, internal_util.ArrayMap(targets, func(t serverapiclient.ProviderTarget) string { + err = target.NewTargetNameInput(selectedTarget.Name, internal_util.ArrayMap(targets, func(t apiclient.ProviderTarget) string { return *t.Name })) if err != nil { @@ -91,14 +91,14 @@ var TargetSetCmd = &cobra.Command{ log.Fatal(err) } - selectedTarget.ProviderInfo = &serverapiclient.ProviderProviderInfo{ + selectedTarget.ProviderInfo = &apiclient.ProviderProviderInfo{ Name: selectedProvider.Name, Version: selectedProvider.Version, } res, err = client.TargetAPI.SetTarget(context.Background()).Target(*selectedTarget).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } views.RenderInfoMessage("Target set successfully") diff --git a/pkg/cmd/workspace/code.go b/pkg/cmd/workspace/code.go index ec83f317d7..b3c8e4356b 100644 --- a/pkg/cmd/workspace/code.go +++ b/pkg/cmd/workspace/code.go @@ -10,10 +10,10 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" "github.com/daytonaio/daytona/internal/jetbrains" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/ide" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/workspace/selection" @@ -36,7 +36,7 @@ var CodeCmd = &cobra.Command{ var workspaceId string var projectName string var ideId string - var workspace *serverapiclient.WorkspaceDTO + var workspace *apiclient.WorkspaceDTO activeProfile, err := c.GetActiveProfile() if err != nil { @@ -53,7 +53,7 @@ var CodeCmd = &cobra.Command{ if len(args) == 0 { workspaceList, res, err := apiClient.WorkspaceAPI.ListWorkspaces(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } workspace = selection.GetWorkspaceFromPrompt(workspaceList, "Open") @@ -117,7 +117,7 @@ func selectWorkspaceProject(workspaceId string, profile *config.Profile) (*strin wsInfo, res, err := apiClient.WorkspaceAPI.GetWorkspace(ctx, workspaceId).Execute() if err != nil { - return nil, apiclient.HandleErrorResponse(res, err) + return nil, apiclient_util.HandleErrorResponse(res, err) } if len(wsInfo.Projects) > 1 { diff --git a/pkg/cmd/workspace/create.go b/pkg/cmd/workspace/create.go index 34d1abd0df..754b9becbb 100644 --- a/pkg/cmd/workspace/create.go +++ b/pkg/cmd/workspace/create.go @@ -15,11 +15,11 @@ import ( "github.com/daytonaio/daytona/internal/cmd/tailscale" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" ssh_config "github.com/daytonaio/daytona/pkg/agent/ssh/config" + "github.com/daytonaio/daytona/pkg/apiclient" workspace_util "github.com/daytonaio/daytona/pkg/cmd/workspace/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/target" "github.com/daytonaio/daytona/pkg/views/workspace/info" @@ -40,7 +40,7 @@ var CreateCmd = &cobra.Command{ Args: cobra.RangeArgs(0, 1), Run: func(cmd *cobra.Command, args []string) { ctx := context.Background() - var projects []serverapiclient.CreateWorkspaceRequestProject + var projects []apiclient.CreateWorkspaceRequestProject var workspaceName string var existingWorkspaceNames []string @@ -61,7 +61,7 @@ var CreateCmd = &cobra.Command{ profileData, res, err := apiClient.ProfileAPI.GetProfileData(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } if nameFlag != "" { @@ -70,7 +70,7 @@ var CreateCmd = &cobra.Command{ workspaceList, res, err := apiClient.WorkspaceAPI.ListWorkspaces(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } for _, workspaceInfo := range workspaceList { existingWorkspaceNames = append(existingWorkspaceNames, *workspaceInfo.Name) @@ -131,14 +131,14 @@ var CreateCmd = &cobra.Command{ go readWorkspaceLogs(activeProfile, id, projects, &stopLogs) - createdWorkspace, res, err := apiClient.WorkspaceAPI.CreateWorkspace(ctx).Workspace(serverapiclient.CreateWorkspaceRequest{ + createdWorkspace, res, err := apiClient.WorkspaceAPI.CreateWorkspace(ctx).Workspace(apiclient.CreateWorkspaceRequest{ Id: &id, Name: &workspaceName, Target: target.Name, Projects: projects, }).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } dialStartTime := time.Now() @@ -153,7 +153,7 @@ var CreateCmd = &cobra.Command{ wsInfo, res, err := apiClient.WorkspaceAPI.GetWorkspace(ctx, workspaceName).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } chosenIdeId := c.DefaultIdeId @@ -204,7 +204,7 @@ func init() { CreateCmd.Flags().BoolVarP(&codeFlag, "code", "c", false, "Open the workspace in the IDE after workspace creation") } -func getTarget(activeProfileName string) (*serverapiclient.ProviderTarget, error) { +func getTarget(activeProfileName string) (*apiclient.ProviderTarget, error) { targets, err := server.GetTargetList() if err != nil { return nil, err @@ -226,15 +226,15 @@ func getTarget(activeProfileName string) (*serverapiclient.ProviderTarget, error return target.GetTargetFromPrompt(targets, activeProfileName, false) } -func processPrompting(apiClient *serverapiclient.APIClient, workspaceName *string, projects *[]serverapiclient.CreateWorkspaceRequestProject, workspaceNames []string, ctx context.Context) error { +func processPrompting(apiClient *apiclient.APIClient, workspaceName *string, projects *[]apiclient.CreateWorkspaceRequestProject, workspaceNames []string, ctx context.Context) error { gitProviders, res, err := apiClient.GitProviderAPI.ListGitProviders(ctx).Execute() if err != nil { - return apiclient.HandleErrorResponse(res, err) + return apiclient_util.HandleErrorResponse(res, err) } apiServerConfig, res, err := apiClient.ServerAPI.GetConfig(context.Background()).Execute() if err != nil { - return apiclient.HandleErrorResponse(res, err) + return apiclient_util.HandleErrorResponse(res, err) } *workspaceName, *projects, err = workspace_util.GetCreationDataFromPrompt(workspace_util.CreateDataPromptConfig{ @@ -251,7 +251,7 @@ func processPrompting(apiClient *serverapiclient.APIClient, workspaceName *strin return nil } -func processCmdArguments(args []string, apiClient *serverapiclient.APIClient, projects *[]serverapiclient.CreateWorkspaceRequestProject, ctx context.Context) error { +func processCmdArguments(args []string, apiClient *apiclient.APIClient, projects *[]apiclient.CreateWorkspaceRequestProject, ctx context.Context) error { repoUrl := args[0] repoUrl, err := util.GetValidatedUrl(repoUrl) @@ -262,12 +262,12 @@ func processCmdArguments(args []string, apiClient *serverapiclient.APIClient, pr encodedURLParam := url.QueryEscape(repoUrl) repoResponse, res, err := apiClient.GitProviderAPI.GetGitContext(ctx, encodedURLParam).Execute() if err != nil { - return apiclient.HandleErrorResponse(res, err) + return apiclient_util.HandleErrorResponse(res, err) } - project := &serverapiclient.CreateWorkspaceRequestProject{ + project := &apiclient.CreateWorkspaceRequestProject{ Name: *repoResponse.Name, - Source: &serverapiclient.CreateWorkspaceRequestProjectSource{ + Source: &apiclient.CreateWorkspaceRequestProjectSource{ Repository: repoResponse, }, } @@ -277,11 +277,11 @@ func processCmdArguments(args []string, apiClient *serverapiclient.APIClient, pr return nil } -func readWorkspaceLogs(activeProfile config.Profile, workspaceId string, projects []serverapiclient.CreateWorkspaceRequestProject, stopLogs *bool) { +func readWorkspaceLogs(activeProfile config.Profile, workspaceId string, projects []apiclient.CreateWorkspaceRequestProject, stopLogs *bool) { var wg sync.WaitGroup for _, project := range projects { wg.Add(1) - go func(project serverapiclient.CreateWorkspaceRequestProject) { + go func(project apiclient.CreateWorkspaceRequestProject) { defer wg.Done() query := "follow=true" @@ -289,7 +289,7 @@ func readWorkspaceLogs(activeProfile config.Profile, workspaceId string, project ws, res, err := server.GetWebsocketConn(fmt.Sprintf("/log/workspace/%s/%s", workspaceId, project.Name), &activeProfile, &query) // We want to retry getting the logs if it fails if err != nil { - log.Trace(apiclient.HandleErrorResponse(res, err)) + log.Trace(apiclient_util.HandleErrorResponse(res, err)) time.Sleep(500 * time.Millisecond) continue } @@ -307,7 +307,7 @@ func readWorkspaceLogs(activeProfile config.Profile, workspaceId string, project ws, res, err := server.GetWebsocketConn(fmt.Sprintf("/log/workspace/%s", workspaceId), &activeProfile, &query) // We want to retry getting the logs if it fails if err != nil { - log.Trace(apiclient.HandleErrorResponse(res, err)) + log.Trace(apiclient_util.HandleErrorResponse(res, err)) time.Sleep(500 * time.Millisecond) continue } @@ -386,7 +386,7 @@ func readLog(ws *websocket.Conn, stopLogs *bool) { } } -func getEnvVariables(project *serverapiclient.CreateWorkspaceRequestProject, profileData *serverapiclient.ProfileData) *map[string]string { +func getEnvVariables(project *apiclient.CreateWorkspaceRequestProject, profileData *apiclient.ProfileData) *map[string]string { envVars := map[string]string{} if profileData.EnvVars != nil { diff --git a/pkg/cmd/workspace/delete.go b/pkg/cmd/workspace/delete.go index cf78c5b368..3df606a0d9 100644 --- a/pkg/cmd/workspace/delete.go +++ b/pkg/cmd/workspace/delete.go @@ -9,9 +9,9 @@ import ( "github.com/charmbracelet/huh" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/daytonaio/daytona/pkg/views/workspace/selection" @@ -61,7 +61,7 @@ var DeleteCmd = &cobra.Command{ } ctx := context.Background() - var workspace *serverapiclient.WorkspaceDTO + var workspace *apiclient.WorkspaceDTO apiClient, err := server.GetApiClient(nil) if err != nil { @@ -71,7 +71,7 @@ var DeleteCmd = &cobra.Command{ if len(args) == 0 { workspaceList, res, err := apiClient.WorkspaceAPI.ListWorkspaces(ctx).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } workspace = selection.GetWorkspaceFromPrompt(workspaceList, "Delete") @@ -133,13 +133,13 @@ func DeleteAllWorkspaces() error { workspaceList, res, err := apiClient.WorkspaceAPI.ListWorkspaces(ctx).Execute() if err != nil { - return apiclient.HandleErrorResponse(res, err) + return apiclient_util.HandleErrorResponse(res, err) } for _, workspace := range workspaceList { res, err := apiClient.WorkspaceAPI.RemoveWorkspace(ctx, *workspace.Id).Execute() if err != nil { - log.Errorf("Failed to delete workspace %s: %v", *workspace.Name, apiclient.HandleErrorResponse(res, err)) + log.Errorf("Failed to delete workspace %s: %v", *workspace.Name, apiclient_util.HandleErrorResponse(res, err)) continue } views.RenderLine(fmt.Sprintf("- Workspace %s successfully deleted\n", *workspace.Name)) @@ -147,10 +147,10 @@ func DeleteAllWorkspaces() error { return nil } -func removeWorkspace(ctx context.Context, apiClient *serverapiclient.APIClient, workspace *serverapiclient.WorkspaceDTO) error { +func removeWorkspace(ctx context.Context, apiClient *apiclient.APIClient, workspace *apiclient.WorkspaceDTO) error { res, err := apiClient.WorkspaceAPI.RemoveWorkspace(ctx, *workspace.Id).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } c, err := config.GetConfig() diff --git a/pkg/cmd/workspace/info.go b/pkg/cmd/workspace/info.go index c1ac3a4ebb..26d163cb4b 100644 --- a/pkg/cmd/workspace/info.go +++ b/pkg/cmd/workspace/info.go @@ -6,10 +6,10 @@ package workspace import ( "context" - "github.com/daytonaio/daytona/internal/util/apiclient" + apiclient_util "github.com/daytonaio/daytona/internal/util/apiclient" "github.com/daytonaio/daytona/internal/util/apiclient/server" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/cmd/output" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views/workspace/info" "github.com/daytonaio/daytona/pkg/views/workspace/selection" log "github.com/sirupsen/logrus" @@ -29,12 +29,12 @@ var InfoCmd = &cobra.Command{ log.Fatal(err) } - var workspace *serverapiclient.WorkspaceDTO + var workspace *apiclient.WorkspaceDTO if len(args) == 0 { workspaceList, res, err := apiClient.WorkspaceAPI.ListWorkspaces(ctx).Verbose(true).Execute() if err != nil { - log.Fatal(apiclient.HandleErrorResponse(res, err)) + log.Fatal(apiclient_util.HandleErrorResponse(res, err)) } workspace = selection.GetWorkspaceFromPrompt(workspaceList, "View") diff --git a/pkg/cmd/workspace/util/creation_data.go b/pkg/cmd/workspace/util/creation_data.go index acd7788911..3dba7799ad 100644 --- a/pkg/cmd/workspace/util/creation_data.go +++ b/pkg/cmd/workspace/util/creation_data.go @@ -10,22 +10,22 @@ import ( "slices" "strings" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views/workspace/create" ) type CreateDataPromptConfig struct { - ApiServerConfig *serverapiclient.ServerConfig + ApiServerConfig *apiclient.ServerConfig ExistingWorkspaceNames []string - UserGitProviders []serverapiclient.GitProvider + UserGitProviders []apiclient.GitProvider Manual bool MultiProject bool - ApiClient *serverapiclient.APIClient + ApiClient *apiclient.APIClient } -func GetCreationDataFromPrompt(config CreateDataPromptConfig) (string, []serverapiclient.CreateWorkspaceRequestProject, error) { - var projectList []serverapiclient.CreateWorkspaceRequestProject - var providerRepo *serverapiclient.GitRepository +func GetCreationDataFromPrompt(config CreateDataPromptConfig) (string, []apiclient.CreateWorkspaceRequestProject, error) { + var projectList []apiclient.CreateWorkspaceRequestProject + var providerRepo *apiclient.GitRepository var err error var workspaceName string @@ -43,9 +43,9 @@ func GetCreationDataFromPrompt(config CreateDataPromptConfig) (string, []servera } } - projectList = []serverapiclient.CreateWorkspaceRequestProject{{ + projectList = []apiclient.CreateWorkspaceRequestProject{{ Name: *providerRepo.Name, - Source: &serverapiclient.CreateWorkspaceRequestProjectSource{ + Source: &apiclient.CreateWorkspaceRequestProjectSource{ Repository: providerRepo, }, }} @@ -72,9 +72,9 @@ func GetCreationDataFromPrompt(config CreateDataPromptConfig) (string, []servera } } - projectList = append(projectList, serverapiclient.CreateWorkspaceRequestProject{ + projectList = append(projectList, apiclient.CreateWorkspaceRequestProject{ Name: *providerRepo.Name, - Source: &serverapiclient.CreateWorkspaceRequestProjectSource{ + Source: &apiclient.CreateWorkspaceRequestProjectSource{ Repository: providerRepo, }, }) diff --git a/pkg/cmd/workspace/util/repository_wizard.go b/pkg/cmd/workspace/util/repository_wizard.go index 5114a66799..7f3ddc7984 100644 --- a/pkg/cmd/workspace/util/repository_wizard.go +++ b/pkg/cmd/workspace/util/repository_wizard.go @@ -11,13 +11,13 @@ import ( "github.com/daytonaio/daytona/cmd/daytona/config" "github.com/daytonaio/daytona/internal/util/apiclient/server" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" gitprovider_view "github.com/daytonaio/daytona/pkg/views/gitprovider" views_util "github.com/daytonaio/daytona/pkg/views/util" "github.com/daytonaio/daytona/pkg/views/workspace/selection" ) -func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, additionalProjectOrder int) (*serverapiclient.GitRepository, error) { +func getRepositoryFromWizard(userGitProviders []apiclient.GitProvider, additionalProjectOrder int) (*apiclient.GitRepository, error) { var providerId string var namespaceId string var checkoutOptions []selection.CheckoutOption @@ -54,7 +54,7 @@ func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, add log.Fatal(err) } - var namespaceList []serverapiclient.GitNamespace + var namespaceList []apiclient.GitNamespace err = views_util.With(func() error { namespaceList, _, err = apiClient.GitProviderAPI.GetNamespaces(ctx, providerId).Execute() @@ -73,7 +73,7 @@ func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, add } } - var providerRepos []serverapiclient.GitRepository + var providerRepos []apiclient.GitRepository err = views_util.With(func() error { providerRepos, _, err = apiClient.GitProviderAPI.GetRepositories(ctx, providerId, namespaceId).Execute() return err @@ -88,7 +88,7 @@ func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, add return nil, errors.New("must select a repository") } - var branchList []serverapiclient.GitBranch + var branchList []apiclient.GitBranch err = views_util.With(func() error { branchList, _, err = apiClient.GitProviderAPI.GetRepoBranches(ctx, providerId, namespaceId, url.QueryEscape(*chosenRepo.Id)).Execute() return err @@ -108,7 +108,7 @@ func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, add return chosenRepo, nil } - var prList []serverapiclient.GitPullRequest + var prList []apiclient.GitPullRequest err = views_util.With(func() error { prList, _, err = apiClient.GitProviderAPI.GetRepoPRs(ctx, providerId, namespaceId, url.QueryEscape(*chosenRepo.Id)).Execute() return err @@ -118,7 +118,7 @@ func getRepositoryFromWizard(userGitProviders []serverapiclient.GitProvider, add return nil, err } - var branch *serverapiclient.GitBranch + var branch *apiclient.GitBranch if len(prList) == 0 { branch = selection.GetBranchFromPrompt(branchList, additionalProjectOrder) if branch == nil { diff --git a/pkg/cmd/workspacemode/info.go b/pkg/cmd/workspacemode/info.go index 2878279134..1ad0d7ab22 100644 --- a/pkg/cmd/workspacemode/info.go +++ b/pkg/cmd/workspacemode/info.go @@ -5,8 +5,8 @@ package workspacemode import ( "github.com/daytonaio/daytona/internal/util/apiclient/server" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/cmd/output" - "github.com/daytonaio/daytona/pkg/serverapiclient" "github.com/daytonaio/daytona/pkg/views/workspace/info" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -18,7 +18,7 @@ var infoCmd = &cobra.Command{ Aliases: []string{"view"}, Args: cobra.ExactArgs(0), Run: func(cmd *cobra.Command, args []string) { - var workspace *serverapiclient.WorkspaceDTO + var workspace *apiclient.WorkspaceDTO workspace, err := server.GetWorkspace(workspaceId) if err != nil { diff --git a/pkg/views/containerregistry/list/view.go b/pkg/views/containerregistry/list/view.go index de83fbef7e..f098ce2cce 100644 --- a/pkg/views/containerregistry/list/view.go +++ b/pkg/views/containerregistry/list/view.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" views_util "github.com/daytonaio/daytona/pkg/views/util" @@ -22,7 +22,7 @@ type rowData struct { Password string } -func getRowData(registry *serverapiclient.ContainerRegistry) *rowData { +func getRowData(registry *apiclient.ContainerRegistry) *rowData { rowData := rowData{"", "", ""} rowData.Server = *registry.Server @@ -42,7 +42,7 @@ func getRowFromRowData(rowData rowData) []string { return row } -func ListRegistries(registryList []serverapiclient.ContainerRegistry) { +func ListRegistries(registryList []apiclient.ContainerRegistry) { re := lipgloss.NewRenderer(os.Stdout) headers := []string{"Server", "Username", "Password"} data := [][]string{} @@ -86,7 +86,7 @@ func ListRegistries(registryList []serverapiclient.ContainerRegistry) { fmt.Println(views.BaseTableStyle.Render(t.String())) } -func renderUnstyledList(registryList []serverapiclient.ContainerRegistry) { +func renderUnstyledList(registryList []apiclient.ContainerRegistry) { output := "\n" for _, registry := range registryList { diff --git a/pkg/views/containerregistry/select.go b/pkg/views/containerregistry/select.go index c257ae3a27..f4cdd2ed60 100644 --- a/pkg/views/containerregistry/select.go +++ b/pkg/views/containerregistry/select.go @@ -9,14 +9,14 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) const NewRegistryServerIdentifier = "+ New Container Registry" -func GetRegistryFromPrompt(registries []serverapiclient.ContainerRegistry, activeProfileName string, withNewRegistry bool) (*serverapiclient.ContainerRegistry, error) { - items := util.ArrayMap(registries, func(r serverapiclient.ContainerRegistry) list.Item { +func GetRegistryFromPrompt(registries []apiclient.ContainerRegistry, activeProfileName string, withNewRegistry bool) (*apiclient.ContainerRegistry, error) { + items := util.ArrayMap(registries, func(r apiclient.ContainerRegistry) list.Item { return item{ registry: r, } @@ -26,7 +26,7 @@ func GetRegistryFromPrompt(registries []serverapiclient.ContainerRegistry, activ name := NewRegistryServerIdentifier emptyString := "" items = append(items, item{ - registry: serverapiclient.ContainerRegistry{ + registry: apiclient.ContainerRegistry{ Password: &emptyString, Username: &emptyString, Server: &name, diff --git a/pkg/views/containerregistry/set.go b/pkg/views/containerregistry/set.go index e49f731535..7439d68f4e 100644 --- a/pkg/views/containerregistry/set.go +++ b/pkg/views/containerregistry/set.go @@ -8,7 +8,7 @@ import ( "log" "github.com/charmbracelet/huh" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) @@ -18,7 +18,7 @@ type RegistryView struct { Password string } -func RegistryCreationView(registryView *RegistryView, registries []serverapiclient.ContainerRegistry, editing bool) { +func RegistryCreationView(registryView *RegistryView, registries []apiclient.ContainerRegistry, editing bool) { form := huh.NewForm( huh.NewGroup( huh.NewInput(). diff --git a/pkg/views/containerregistry/view.go b/pkg/views/containerregistry/view.go index 16ac7cb99a..80c6cc0f8c 100644 --- a/pkg/views/containerregistry/view.go +++ b/pkg/views/containerregistry/view.go @@ -6,12 +6,12 @@ package containerregistry import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) type item struct { - registry serverapiclient.ContainerRegistry + registry apiclient.ContainerRegistry } func (i item) Title() string { return *i.registry.Server } @@ -25,7 +25,7 @@ func (i item) FilterValue() string { return *i.registry.Server } type model struct { list list.Model - choice *serverapiclient.ContainerRegistry + choice *apiclient.ContainerRegistry footer string } diff --git a/pkg/views/gitprovider/select.go b/pkg/views/gitprovider/select.go index 92cc986ee5..1e0e6e3a1b 100644 --- a/pkg/views/gitprovider/select.go +++ b/pkg/views/gitprovider/select.go @@ -11,7 +11,7 @@ import ( "github.com/charmbracelet/huh" "github.com/daytonaio/daytona/cmd/daytona/config" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) @@ -25,7 +25,7 @@ type GitProviderView struct { var commonGitProviderIds = []string{"github", "gitlab", "bitbucket"} -func GitProviderSelectionView(gitProviderAddView *serverapiclient.GitProvider, userGitProviders []serverapiclient.GitProvider, isDeleting bool) { +func GitProviderSelectionView(gitProviderAddView *apiclient.GitProvider, userGitProviders []apiclient.GitProvider, isDeleting bool) { supportedProviders := config.GetSupportedGitProviders() var gitProviderOptions []huh.Option[string] diff --git a/pkg/views/provider/list.go b/pkg/views/provider/list.go index 121223dd1d..dc0aa03b25 100644 --- a/pkg/views/provider/list.go +++ b/pkg/views/provider/list.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/lipgloss" @@ -29,7 +29,7 @@ func getRowFromRowData(rowData RowData) []string { return row } -func getRowData(provider *serverapiclient.Provider) *RowData { +func getRowData(provider *apiclient.Provider) *RowData { rowData := RowData{"", ""} rowData.Name = *provider.Name @@ -38,7 +38,7 @@ func getRowData(provider *serverapiclient.Provider) *RowData { return &rowData } -func List(providerList []serverapiclient.Provider) { +func List(providerList []apiclient.Provider) { re := lipgloss.NewRenderer(os.Stdout) @@ -86,7 +86,7 @@ func List(providerList []serverapiclient.Provider) { fmt.Println(views.BaseTableStyle.Render(t.String())) } -func renderUnstyledList(providerList []serverapiclient.Provider) { +func renderUnstyledList(providerList []apiclient.Provider) { output := "\n" for _, provider := range providerList { diff --git a/pkg/views/provider/select.go b/pkg/views/provider/select.go index 739abb4f35..67d523d76f 100644 --- a/pkg/views/provider/select.go +++ b/pkg/views/provider/select.go @@ -8,13 +8,13 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) var NewProviderId = "+ New Provider" -func GetProviderFromPrompt(providers []serverapiclient.Provider, title string, withNewProvider bool) (*serverapiclient.Provider, error) { +func GetProviderFromPrompt(providers []apiclient.Provider, title string, withNewProvider bool) (*apiclient.Provider, error) { var items []list.Item for _, p := range providers { @@ -26,7 +26,7 @@ func GetProviderFromPrompt(providers []serverapiclient.Provider, title string, w if withNewProvider { name := NewProviderId items = append(items, item{ - provider: serverapiclient.Provider{ + provider: apiclient.Provider{ Name: &name, }, }) diff --git a/pkg/views/provider/view.go b/pkg/views/provider/view.go index 5af9bd5722..6bc6fb3ebd 100644 --- a/pkg/views/provider/view.go +++ b/pkg/views/provider/view.go @@ -8,13 +8,13 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "golang.org/x/term" ) type item struct { - provider serverapiclient.Provider + provider apiclient.Provider } func (i item) Title() string { return *i.provider.Name } @@ -25,7 +25,7 @@ func (i item) FilterValue() string { return *i.provider.Name } type model struct { list list.Model - choice *serverapiclient.Provider + choice *apiclient.Provider } func (m model) Init() tea.Cmd { diff --git a/pkg/views/server/apikey/create.go b/pkg/views/server/apikey/create.go index bc5633f5d2..00eb0a4819 100644 --- a/pkg/views/server/apikey/create.go +++ b/pkg/views/server/apikey/create.go @@ -7,13 +7,13 @@ import ( "errors" "log" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/huh" ) -func ApiKeyCreationView(name *string, saveToDefaultProfile *bool, clientKeys []serverapiclient.ApiKey) { +func ApiKeyCreationView(name *string, saveToDefaultProfile *bool, clientKeys []apiclient.ApiKey) { form := huh.NewForm( huh.NewGroup( huh.NewInput(). diff --git a/pkg/views/server/apikey/list.go b/pkg/views/server/apikey/list.go index 5447533c67..61740d5525 100644 --- a/pkg/views/server/apikey/list.go +++ b/pkg/views/server/apikey/list.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/lipgloss" @@ -29,7 +29,7 @@ func getRowFromRowData(rowData RowData) []string { return row } -func getRowData(apiKey *serverapiclient.ApiKey) *RowData { +func getRowData(apiKey *apiclient.ApiKey) *RowData { rowData := RowData{"", ""} rowData.Name = *apiKey.Name @@ -38,7 +38,7 @@ func getRowData(apiKey *serverapiclient.ApiKey) *RowData { return &rowData } -func ListApiKeys(apiKeyList []serverapiclient.ApiKey) { +func ListApiKeys(apiKeyList []apiclient.ApiKey) { re := lipgloss.NewRenderer(os.Stdout) @@ -86,7 +86,7 @@ func ListApiKeys(apiKeyList []serverapiclient.ApiKey) { fmt.Println(views.BaseTableStyle.Render(t.String())) } -func renderUnstyledList(apiKeyList []serverapiclient.ApiKey) { +func renderUnstyledList(apiKeyList []apiclient.ApiKey) { output := "\n" for _, apiKey := range apiKeyList { diff --git a/pkg/views/server/apikey/select.go b/pkg/views/server/apikey/select.go index 6181bb5a22..4eb6a3ad41 100644 --- a/pkg/views/server/apikey/select.go +++ b/pkg/views/server/apikey/select.go @@ -8,13 +8,13 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) var NewApiKeyName = "+ New API Key" -func GetApiKeyFromPrompt(apiKeys []serverapiclient.ApiKey, title string, withNewApiKey bool) (*serverapiclient.ApiKey, error) { +func GetApiKeyFromPrompt(apiKeys []apiclient.ApiKey, title string, withNewApiKey bool) (*apiclient.ApiKey, error) { var items []list.Item for _, p := range apiKeys { @@ -26,7 +26,7 @@ func GetApiKeyFromPrompt(apiKeys []serverapiclient.ApiKey, title string, withNew if withNewApiKey { name := NewApiKeyName items = append(items, item{ - apiKey: serverapiclient.ApiKey{ + apiKey: apiclient.ApiKey{ Name: &name, }, }) diff --git a/pkg/views/server/apikey/view.go b/pkg/views/server/apikey/view.go index 471b2d2867..fca13b83ef 100644 --- a/pkg/views/server/apikey/view.go +++ b/pkg/views/server/apikey/view.go @@ -8,13 +8,13 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "golang.org/x/term" ) type item struct { - apiKey serverapiclient.ApiKey + apiKey apiclient.ApiKey } func (i item) Title() string { return *i.apiKey.Name } @@ -25,7 +25,7 @@ func (i item) FilterValue() string { return *i.apiKey.Name } type model struct { list list.Model - choice *serverapiclient.ApiKey + choice *apiclient.ApiKey } func (m model) Init() tea.Cmd { diff --git a/pkg/views/server/configure.go b/pkg/views/server/configure.go index 2a30af56dd..04178ad256 100644 --- a/pkg/views/server/configure.go +++ b/pkg/views/server/configure.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/charmbracelet/huh" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) @@ -20,7 +20,7 @@ type ServerUpdateKeyView struct { PathToPrivateKey string } -func ConfigurationForm(config *serverapiclient.ServerConfig) *serverapiclient.ServerConfig { +func ConfigurationForm(config *apiclient.ServerConfig) *apiclient.ServerConfig { apiPortView := strconv.Itoa(int(config.GetApiPort())) headscalePortView := strconv.Itoa(int(config.GetHeadscalePort())) frpsPortView := strconv.Itoa(int(config.Frps.GetPort())) @@ -97,7 +97,7 @@ func ConfigurationForm(config *serverapiclient.ServerConfig) *serverapiclient.Se return config } -func createPortValidator(config *serverapiclient.ServerConfig, portView *string, port *int32) func(string) error { +func createPortValidator(config *apiclient.ServerConfig, portView *string, port *int32) func(string) error { return func(string) error { validatePort, err := strconv.Atoi(*portView) if err != nil { diff --git a/pkg/views/target/list/view.go b/pkg/views/target/list/view.go index f1efb2ba72..823b2600ef 100644 --- a/pkg/views/target/list/view.go +++ b/pkg/views/target/list/view.go @@ -8,7 +8,7 @@ import ( "os" "sort" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/lipgloss" @@ -32,7 +32,7 @@ func getRowFromRowData(rowData RowData) []string { return row } -func getRowData(target *serverapiclient.ProviderTarget) *RowData { +func getRowData(target *apiclient.ProviderTarget) *RowData { rowData := RowData{"", "", ""} rowData.Target = *target.Name @@ -42,7 +42,7 @@ func getRowData(target *serverapiclient.ProviderTarget) *RowData { return &rowData } -func ListTargets(targetList []serverapiclient.ProviderTarget) { +func ListTargets(targetList []apiclient.ProviderTarget) { sortTargets(&targetList) @@ -92,7 +92,7 @@ func ListTargets(targetList []serverapiclient.ProviderTarget) { fmt.Println(views.BaseTableStyle.Render(t.String())) } -func sortTargets(targets *[]serverapiclient.ProviderTarget) { +func sortTargets(targets *[]apiclient.ProviderTarget) { sort.Slice(*targets, func(i, j int) bool { t1 := (*targets)[i] t2 := (*targets)[j] @@ -100,7 +100,7 @@ func sortTargets(targets *[]serverapiclient.ProviderTarget) { }) } -func renderUnstyledList(targetList []serverapiclient.ProviderTarget) { +func renderUnstyledList(targetList []apiclient.ProviderTarget) { output := "\n" for _, target := range targetList { diff --git a/pkg/views/target/select.go b/pkg/views/target/select.go index a87e82c2fd..94e13bae06 100644 --- a/pkg/views/target/select.go +++ b/pkg/views/target/select.go @@ -9,14 +9,14 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) const NewTargetName = "+ New Target" -func GetTargetFromPrompt(targets []serverapiclient.ProviderTarget, activeProfileName string, withNewTarget bool) (*serverapiclient.ProviderTarget, error) { - items := util.ArrayMap(targets, func(t serverapiclient.ProviderTarget) list.Item { +func GetTargetFromPrompt(targets []apiclient.ProviderTarget, activeProfileName string, withNewTarget bool) (*apiclient.ProviderTarget, error) { + items := util.ArrayMap(targets, func(t apiclient.ProviderTarget) list.Item { return item{ target: t, } @@ -26,7 +26,7 @@ func GetTargetFromPrompt(targets []serverapiclient.ProviderTarget, activeProfile name := NewTargetName options := "{}" items = append(items, item{ - target: serverapiclient.ProviderTarget{ + target: apiclient.ProviderTarget{ Name: &name, Options: &options, }, diff --git a/pkg/views/target/set.go b/pkg/views/target/set.go index 944973fe91..7b3579bd64 100644 --- a/pkg/views/target/set.go +++ b/pkg/views/target/set.go @@ -16,7 +16,7 @@ import ( "github.com/charmbracelet/huh" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) @@ -42,7 +42,7 @@ func NewTargetNameInput(targetName *string, existingTargetNames []string) error return nil } -func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[string]serverapiclient.ProviderProviderTargetProperty) error { +func SetTargetForm(target *apiclient.ProviderTarget, targetManifest map[string]apiclient.ProviderProviderTargetProperty) error { fields := make([]huh.Field, 0, len(targetManifest)) groups := []*huh.Group{} options := make(map[string]interface{}) @@ -67,7 +67,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st } switch *property.Type { - case serverapiclient.ProviderTargetPropertyTypeFloat, serverapiclient.ProviderTargetPropertyTypeInt: + case apiclient.ProviderTargetPropertyTypeFloat, apiclient.ProviderTargetPropertyTypeInt: var initialValue *string floatValue, ok := options[name].(float64) if ok { @@ -78,7 +78,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st input, value := getInput(name, property, initialValue) fields = append(fields, input) options[name] = value - case serverapiclient.ProviderTargetPropertyTypeString: + case apiclient.ProviderTargetPropertyTypeString: var initialValue *string v, ok := options[name].(string) if ok { @@ -88,7 +88,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st input, value := getInput(name, property, initialValue) fields = append(fields, input) options[name] = value - case serverapiclient.ProviderTargetPropertyTypeBoolean: + case apiclient.ProviderTargetPropertyTypeBoolean: var initialValue *bool v, ok := options[name].(bool) if ok { @@ -98,7 +98,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st confirm, value := getConfirm(name, property, initialValue) fields = append(fields, confirm) options[name] = value - case serverapiclient.ProviderTargetPropertyTypeOption: + case apiclient.ProviderTargetPropertyTypeOption: var initialValue *string v, ok := options[name].(string) if ok { @@ -108,7 +108,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st selectField, value := getSelect(name, property, initialValue) fields = append(fields, selectField) options[name] = value - case serverapiclient.ProviderTargetPropertyTypeFilePath: + case apiclient.ProviderTargetPropertyTypeFilePath: group, value := getFilePicker(name, property) groups = append(groups, group...) options[name] = value @@ -128,17 +128,17 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st } } switch *property.Type { - case serverapiclient.ProviderTargetPropertyTypeInt: + case apiclient.ProviderTargetPropertyTypeInt: options[name], err = strconv.Atoi(*options[name].(*string)) if err != nil { return err } - case serverapiclient.ProviderTargetPropertyTypeFloat: + case apiclient.ProviderTargetPropertyTypeFloat: options[name], err = strconv.ParseFloat(*options[name].(*string), 64) if err != nil { return err } - case serverapiclient.ProviderTargetPropertyTypeFilePath: + case apiclient.ProviderTargetPropertyTypeFilePath: if *options[name].(*string) == "none" { delete(options, name) } @@ -155,7 +155,7 @@ func SetTargetForm(target *serverapiclient.ProviderTarget, targetManifest map[st return nil } -func getInput(name string, property serverapiclient.ProviderProviderTargetProperty, initialValue *string) (*huh.Input, *string) { +func getInput(name string, property apiclient.ProviderProviderTargetProperty, initialValue *string) (*huh.Input, *string) { value := property.DefaultValue if initialValue != nil { value = initialValue @@ -168,10 +168,10 @@ func getInput(name string, property serverapiclient.ProviderProviderTargetProper Password(property.InputMasked != nil && *property.InputMasked). Validate(func(s string) error { switch *property.Type { - case serverapiclient.ProviderTargetPropertyTypeInt: + case apiclient.ProviderTargetPropertyTypeInt: _, err := strconv.Atoi(s) return err - case serverapiclient.ProviderTargetPropertyTypeFloat: + case apiclient.ProviderTargetPropertyTypeFloat: _, err := strconv.ParseFloat(s, 64) return err } @@ -179,7 +179,7 @@ func getInput(name string, property serverapiclient.ProviderProviderTargetProper }), value } -func getSelect(name string, property serverapiclient.ProviderProviderTargetProperty, initialValue *string) (*huh.Select[string], *string) { +func getSelect(name string, property apiclient.ProviderProviderTargetProperty, initialValue *string) (*huh.Select[string], *string) { value := property.DefaultValue if initialValue != nil { value = initialValue @@ -194,7 +194,7 @@ func getSelect(name string, property serverapiclient.ProviderProviderTargetPrope Value(value), value } -func getConfirm(name string, property serverapiclient.ProviderProviderTargetProperty, initialValue *bool) (*huh.Confirm, *bool) { +func getConfirm(name string, property apiclient.ProviderProviderTargetProperty, initialValue *bool) (*huh.Confirm, *bool) { value := false if property.DefaultValue != nil && *property.DefaultValue == "true" { value = true @@ -209,7 +209,7 @@ func getConfirm(name string, property serverapiclient.ProviderProviderTargetProp Value(&value), &value } -func getFilePicker(name string, property serverapiclient.ProviderProviderTargetProperty) ([]*huh.Group, *string) { +func getFilePicker(name string, property apiclient.ProviderProviderTargetProperty) ([]*huh.Group, *string) { dirPath := "~" if property.DefaultValue != nil { diff --git a/pkg/views/target/view.go b/pkg/views/target/view.go index f5f9070d7c..cfc06c9761 100644 --- a/pkg/views/target/view.go +++ b/pkg/views/target/view.go @@ -8,13 +8,13 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "golang.org/x/term" ) type item struct { - target serverapiclient.ProviderTarget + target apiclient.ProviderTarget } func (i item) Title() string { return *i.target.Name } @@ -28,7 +28,7 @@ func (i item) FilterValue() string { return *i.target.Name } type model struct { list list.Model - choice *serverapiclient.ProviderTarget + choice *apiclient.ProviderTarget footer string } diff --git a/pkg/views/workspace/create/configuration.go b/pkg/views/workspace/create/configuration.go index 6a393b9413..c5f82bee8f 100644 --- a/pkg/views/workspace/create/configuration.go +++ b/pkg/views/workspace/create/configuration.go @@ -10,7 +10,7 @@ import ( "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/huh" "github.com/charmbracelet/lipgloss" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" configure "github.com/daytonaio/daytona/pkg/views/server" "github.com/daytonaio/daytona/pkg/views/workspace/selection" @@ -25,8 +25,8 @@ type ProjectConfigurationData struct { EnvVars map[string]string } -func ConfigureProjects(projectList []serverapiclient.CreateWorkspaceRequestProject) ([]serverapiclient.CreateWorkspaceRequestProject, error) { - var currentProject *serverapiclient.CreateWorkspaceRequestProject +func ConfigureProjects(projectList []apiclient.CreateWorkspaceRequestProject) ([]apiclient.CreateWorkspaceRequestProject, error) { + var currentProject *apiclient.CreateWorkspaceRequestProject if len(projectList) > 1 { currentProject = selection.GetProjectRequestFromPrompt(projectList) diff --git a/pkg/views/workspace/create/summary.go b/pkg/views/workspace/create/summary.go index dfa7efbef9..ae44dcb8d3 100644 --- a/pkg/views/workspace/create/summary.go +++ b/pkg/views/workspace/create/summary.go @@ -12,7 +12,7 @@ import ( "github.com/charmbracelet/huh" "github.com/charmbracelet/lipgloss" util "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) @@ -23,13 +23,13 @@ type SummaryModel struct { width int quitting bool workspaceName string - projectList []serverapiclient.CreateWorkspaceRequestProject + projectList []apiclient.CreateWorkspaceRequestProject } var configureCheck bool var userCancelled bool -func RunSubmissionForm(workspaceName *string, suggestedName string, workspaceNames []string, projectList *[]serverapiclient.CreateWorkspaceRequestProject, apiServerConfig *serverapiclient.ServerConfig) error { +func RunSubmissionForm(workspaceName *string, suggestedName string, workspaceNames []string, projectList *[]apiclient.CreateWorkspaceRequestProject, apiServerConfig *apiclient.ServerConfig) error { configureCheck = false m := NewSummaryModel(workspaceName, suggestedName, workspaceNames, *projectList) @@ -75,7 +75,7 @@ func RunSubmissionForm(workspaceName *string, suggestedName string, workspaceNam return RunSubmissionForm(workspaceName, suggestedName, workspaceNames, projectList, apiServerConfig) } -func RenderSummary(workspaceName string, projectList []serverapiclient.CreateWorkspaceRequestProject) (string, error) { +func RenderSummary(workspaceName string, projectList []apiclient.CreateWorkspaceRequestProject) (string, error) { output := views.GetStyledMainTitle(fmt.Sprintf("SUMMARY - Workspace %s", workspaceName)) @@ -97,7 +97,7 @@ func RenderSummary(workspaceName string, projectList []serverapiclient.CreateWor return output, nil } -func NewSummaryModel(workspaceName *string, suggestedName string, workspaceNames []string, projectList []serverapiclient.CreateWorkspaceRequestProject) SummaryModel { +func NewSummaryModel(workspaceName *string, suggestedName string, workspaceNames []string, projectList []apiclient.CreateWorkspaceRequestProject) SummaryModel { m := SummaryModel{width: maxWidth} m.lg = lipgloss.DefaultRenderer() m.styles = NewStyles(m.lg) diff --git a/pkg/views/workspace/create/view.go b/pkg/views/workspace/create/view.go index 61a3ec67a3..56613b5ad0 100644 --- a/pkg/views/workspace/create/view.go +++ b/pkg/views/workspace/create/view.go @@ -10,7 +10,7 @@ import ( "net/url" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/huh" @@ -61,7 +61,7 @@ type Model struct { width int } -func GetRepositoryFromUrlInput(multiProject bool, apiClient *serverapiclient.APIClient) (*serverapiclient.GitRepository, error) { +func GetRepositoryFromUrlInput(multiProject bool, apiClient *apiclient.APIClient) (*apiclient.GitRepository, error) { m := Model{width: maxWidth} m.lg = lipgloss.DefaultRenderer() m.styles = NewStyles(m.lg) @@ -73,7 +73,7 @@ func GetRepositoryFromUrlInput(multiProject bool, apiClient *serverapiclient.API } var initialRepoUrl string - var repo *serverapiclient.GitRepository + var repo *apiclient.GitRepository initialRepoInput := huh.NewInput(). Title(title). @@ -104,13 +104,13 @@ func GetRepositoryFromUrlInput(multiProject bool, apiClient *serverapiclient.API return repo, nil } -func RunAdditionalProjectRepoForm(index int, apiClient *serverapiclient.APIClient) (*serverapiclient.GitRepository, bool, error) { +func RunAdditionalProjectRepoForm(index int, apiClient *apiclient.APIClient) (*apiclient.GitRepository, bool, error) { m := Model{width: maxWidth} m.lg = lipgloss.DefaultRenderer() m.styles = NewStyles(m.lg) var repoUrl string - var repo *serverapiclient.GitRepository + var repo *apiclient.GitRepository var addAnother bool @@ -207,7 +207,7 @@ func getOrderNumberString(number int) string { return "Invalid" } -func validateRepoUrl(repoUrl string, apiClient *serverapiclient.APIClient) (*serverapiclient.GitRepository, error) { +func validateRepoUrl(repoUrl string, apiClient *apiclient.APIClient) (*apiclient.GitRepository, error) { result, err := util.GetValidatedUrl(repoUrl) if err != nil { return nil, err diff --git a/pkg/views/workspace/info/view.go b/pkg/views/workspace/info/view.go index e9e7dad290..0c48726f23 100644 --- a/pkg/views/workspace/info/view.go +++ b/pkg/views/workspace/info/view.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/charmbracelet/lipgloss" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "golang.org/x/term" ) @@ -23,7 +23,7 @@ var propertyValueStyle = lipgloss.NewStyle(). Foreground(views.Light). Bold(true) -func Render(workspace *serverapiclient.WorkspaceDTO, ide string, forceUnstyled bool) { +func Render(workspace *apiclient.WorkspaceDTO, ide string, forceUnstyled bool) { var isCreationView bool var output string nameLabel := "Name" @@ -86,7 +86,7 @@ func renderTUIView(output string, width int, isCreationView bool) { fmt.Println(content) } -func getSingleProjectOutput(project *serverapiclient.Project, isCreationView bool) string { +func getSingleProjectOutput(project *apiclient.Project, isCreationView bool) string { var output string var repositoryUrl string @@ -116,7 +116,7 @@ func getSingleProjectOutput(project *serverapiclient.Project, isCreationView boo return output } -func getProjectsOutputs(projects []serverapiclient.Project, isCreationView bool) string { +func getProjectsOutputs(projects []apiclient.Project, isCreationView bool) string { var output string for i, project := range projects { output += getInfoLine(fmt.Sprintf("Project #%d", i+1), *project.Name) @@ -139,7 +139,7 @@ func getInfoLine(key, value string) string { return propertyNameStyle.Render(fmt.Sprintf("%-*s", propertyNameWidth, key)) + propertyValueStyle.Render(value) + "\n" } -func getInfoLineState(key string, state *serverapiclient.ProjectState) string { +func getInfoLineState(key string, state *apiclient.ProjectState) string { var uptime int var stateProperty string @@ -158,7 +158,7 @@ func getInfoLineState(key string, state *serverapiclient.ProjectState) string { return propertyNameStyle.Render(fmt.Sprintf("%-*s", propertyNameWidth, key)) + stateProperty + propertyValueStyle.Foreground(views.Light).Render("\n") } -func getInfoLineGitStatus(key string, status *serverapiclient.GitStatus) string { +func getInfoLineGitStatus(key string, status *apiclient.GitStatus) string { output := propertyNameStyle.Render(fmt.Sprintf("%-*s", propertyNameWidth, key)) if status.CurrentBranch == nil { return output + propertyValueStyle.Foreground(views.Gray).Render("No branch") + "\n" diff --git a/pkg/views/workspace/list/view.go b/pkg/views/workspace/list/view.go index 0e90ecd088..ddf41abee5 100644 --- a/pkg/views/workspace/list/view.go +++ b/pkg/views/workspace/list/view.go @@ -11,7 +11,7 @@ import ( "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss/table" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" views_util "github.com/daytonaio/daytona/pkg/views/util" info_view "github.com/daytonaio/daytona/pkg/views/workspace/info" @@ -27,7 +27,7 @@ type RowData struct { Branch string } -func ListWorkspaces(workspaceList []serverapiclient.WorkspaceDTO, specifyGitProviders bool, verbose bool) { +func ListWorkspaces(workspaceList []apiclient.WorkspaceDTO, specifyGitProviders bool, verbose bool) { sortWorkspaces(&workspaceList, verbose) re := lipgloss.NewRenderer(os.Stdout) @@ -101,7 +101,7 @@ func ListWorkspaces(workspaceList []serverapiclient.WorkspaceDTO, specifyGitProv fmt.Println(views.BaseTableStyle.Render(t.String())) } -func renderUnstyledList(workspaceList []serverapiclient.WorkspaceDTO) { +func renderUnstyledList(workspaceList []apiclient.WorkspaceDTO) { for _, workspace := range workspaceList { info_view.Render(&workspace, "", true) @@ -140,7 +140,7 @@ func getRowFromRowData(rowData RowData, isMultiProjectAccordion bool) []string { return row } -func sortWorkspaces(workspaceList *[]serverapiclient.WorkspaceDTO, verbose bool) { +func sortWorkspaces(workspaceList *[]apiclient.WorkspaceDTO, verbose bool) { if verbose { sort.Slice(*workspaceList, func(i, j int) bool { ws1 := (*workspaceList)[i] @@ -167,7 +167,7 @@ func sortWorkspaces(workspaceList *[]serverapiclient.WorkspaceDTO, verbose bool) } -func getWorkspaceTableRowData(workspace serverapiclient.WorkspaceDTO, specifyGitProviders bool) *RowData { +func getWorkspaceTableRowData(workspace apiclient.WorkspaceDTO, specifyGitProviders bool) *RowData { rowData := RowData{"", "", "", "", "", ""} if workspace.Name != nil { rowData.Name = *workspace.Name + views_util.AdditionalPropertyPadding @@ -190,7 +190,7 @@ func getWorkspaceTableRowData(workspace serverapiclient.WorkspaceDTO, specifyGit return &rowData } -func getProjectTableRowData(workspaceDTO serverapiclient.WorkspaceDTO, project serverapiclient.Project, specifyGitProviders bool) *RowData { +func getProjectTableRowData(workspaceDTO apiclient.WorkspaceDTO, project apiclient.Project, specifyGitProviders bool) *RowData { rowData := RowData{"", "", "", "", "", ""} if project.Name != nil { rowData.Name = " └ " + *project.Name diff --git a/pkg/views/workspace/selection/branch.go b/pkg/views/workspace/selection/branch.go index ff3f4e87c5..4451d80284 100644 --- a/pkg/views/workspace/selection/branch.go +++ b/pkg/views/workspace/selection/branch.go @@ -7,14 +7,14 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" ) -func selectBranchPrompt(branches []serverapiclient.GitBranch, additionalProjectOrder int, choiceChan chan<- string) { +func selectBranchPrompt(branches []apiclient.GitBranch, additionalProjectOrder int, choiceChan chan<- string) { items := []list.Item{} // Populate items with titles and descriptions from workspaces. @@ -49,7 +49,7 @@ func selectBranchPrompt(branches []serverapiclient.GitBranch, additionalProjectO } } -func GetBranchFromPrompt(branches []serverapiclient.GitBranch, additionalProjectOrder int) *serverapiclient.GitBranch { +func GetBranchFromPrompt(branches []apiclient.GitBranch, additionalProjectOrder int) *apiclient.GitBranch { choiceChan := make(chan string) go selectBranchPrompt(branches, additionalProjectOrder, choiceChan) diff --git a/pkg/views/workspace/selection/namespace.go b/pkg/views/workspace/selection/namespace.go index 5e8886e3ef..6bfe1a9798 100644 --- a/pkg/views/workspace/selection/namespace.go +++ b/pkg/views/workspace/selection/namespace.go @@ -9,11 +9,11 @@ import ( "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" ) -func selectNamespacePrompt(namespaces []serverapiclient.GitNamespace, additionalProjectOrder int, choiceChan chan<- string) { +func selectNamespacePrompt(namespaces []apiclient.GitNamespace, additionalProjectOrder int, choiceChan chan<- string) { items := []list.Item{} var desc string @@ -51,7 +51,7 @@ func selectNamespacePrompt(namespaces []serverapiclient.GitNamespace, additional } } -func GetNamespaceIdFromPrompt(namespaces []serverapiclient.GitNamespace, additionalProjectOrder int) string { +func GetNamespaceIdFromPrompt(namespaces []apiclient.GitNamespace, additionalProjectOrder int) string { choiceChan := make(chan string) go selectNamespacePrompt(namespaces, additionalProjectOrder, choiceChan) diff --git a/pkg/views/workspace/selection/project.go b/pkg/views/workspace/selection/project.go index 86d1865bd0..d760d07f73 100644 --- a/pkg/views/workspace/selection/project.go +++ b/pkg/views/workspace/selection/project.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/list" @@ -15,13 +15,13 @@ import ( "github.com/charmbracelet/lipgloss" ) -func GetProjectFromPrompt(projects []serverapiclient.Project, actionVerb string) *serverapiclient.Project { - choiceChan := make(chan *serverapiclient.Project) +func GetProjectFromPrompt(projects []apiclient.Project, actionVerb string) *apiclient.Project { + choiceChan := make(chan *apiclient.Project) go selectProjectPrompt(projects, actionVerb, choiceChan) return <-choiceChan } -func selectProjectPrompt(projects []serverapiclient.Project, actionVerb string, choiceChan chan<- *serverapiclient.Project) { +func selectProjectPrompt(projects []apiclient.Project, actionVerb string, choiceChan chan<- *apiclient.Project) { items := []list.Item{} for _, project := range projects { @@ -31,7 +31,7 @@ func selectProjectPrompt(projects []serverapiclient.Project, actionVerb string, } else { projectName = "Unnamed Project" } - newItem := item[serverapiclient.Project]{title: projectName, desc: "", choiceProperty: project} + newItem := item[apiclient.Project]{title: projectName, desc: "", choiceProperty: project} items = append(items, newItem) } @@ -54,7 +54,7 @@ func selectProjectPrompt(projects []serverapiclient.Project, actionVerb string, l.FilterInput.PromptStyle = lipgloss.NewStyle().Foreground(views.Green) l.FilterInput.TextStyle = lipgloss.NewStyle().Foreground(views.Green) - m := model[serverapiclient.Project]{list: l} + m := model[apiclient.Project]{list: l} m.list.Title = views.GetStyledMainTitle("Select a Project To " + actionVerb) m.list.Styles.Title = lipgloss.NewStyle().Foreground(views.Green).Bold(true) @@ -65,7 +65,7 @@ func selectProjectPrompt(projects []serverapiclient.Project, actionVerb string, os.Exit(1) } - if m, ok := p.(model[serverapiclient.Project]); ok && m.choice != nil { + if m, ok := p.(model[apiclient.Project]); ok && m.choice != nil { choiceChan <- m.choice } else { choiceChan <- nil diff --git a/pkg/views/workspace/selection/projectrequest.go b/pkg/views/workspace/selection/projectrequest.go index 445596cce7..9e42926008 100644 --- a/pkg/views/workspace/selection/projectrequest.go +++ b/pkg/views/workspace/selection/projectrequest.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/key" @@ -18,22 +18,22 @@ import ( "github.com/charmbracelet/lipgloss" ) -var DoneConfiguring = serverapiclient.CreateWorkspaceRequestProject{Name: "DoneConfiguringName"} +var DoneConfiguring = apiclient.CreateWorkspaceRequestProject{Name: "DoneConfiguringName"} type projectRequestItem struct { - item[serverapiclient.CreateWorkspaceRequestProject] + item[apiclient.CreateWorkspaceRequestProject] name, image, user, postStartCommands string - project serverapiclient.CreateWorkspaceRequestProject + project apiclient.CreateWorkspaceRequestProject } type projectRequestItemDelegate struct { - ItemDelegate[serverapiclient.CreateWorkspaceRequestProject] + ItemDelegate[apiclient.CreateWorkspaceRequestProject] } type projectRequestModel struct { - model[serverapiclient.CreateWorkspaceRequestProject] + model[apiclient.CreateWorkspaceRequestProject] } -func selectProjectRequestPrompt(projects []serverapiclient.CreateWorkspaceRequestProject, choiceChan chan<- *serverapiclient.CreateWorkspaceRequestProject) { +func selectProjectRequestPrompt(projects []apiclient.CreateWorkspaceRequestProject, choiceChan chan<- *apiclient.CreateWorkspaceRequestProject) { items := []list.Item{} for _, project := range projects { @@ -107,8 +107,8 @@ func selectProjectRequestPrompt(projects []serverapiclient.CreateWorkspaceReques } } -func GetProjectRequestFromPrompt(projects []serverapiclient.CreateWorkspaceRequestProject) *serverapiclient.CreateWorkspaceRequestProject { - choiceChan := make(chan *serverapiclient.CreateWorkspaceRequestProject) +func GetProjectRequestFromPrompt(projects []apiclient.CreateWorkspaceRequestProject) *apiclient.CreateWorkspaceRequestProject { + choiceChan := make(chan *apiclient.CreateWorkspaceRequestProject) go selectProjectRequestPrompt(projects, choiceChan) diff --git a/pkg/views/workspace/selection/pullrequest.go b/pkg/views/workspace/selection/pullrequest.go index f64dba0257..ca8e306be3 100644 --- a/pkg/views/workspace/selection/pullrequest.go +++ b/pkg/views/workspace/selection/pullrequest.go @@ -7,14 +7,14 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" ) -func selectPullRequestPrompt(pullRequests []serverapiclient.GitPullRequest, additionalProjectOrder int, choiceChan chan<- string) { +func selectPullRequestPrompt(pullRequests []apiclient.GitPullRequest, additionalProjectOrder int, choiceChan chan<- string) { items := []list.Item{} // Populate items with titles and descriptions from workspaces. @@ -49,7 +49,7 @@ func selectPullRequestPrompt(pullRequests []serverapiclient.GitPullRequest, addi } } -func GetPullRequestFromPrompt(pullRequests []serverapiclient.GitPullRequest, additionalProjectOrder int) *serverapiclient.GitPullRequest { +func GetPullRequestFromPrompt(pullRequests []apiclient.GitPullRequest, additionalProjectOrder int) *apiclient.GitPullRequest { choiceChan := make(chan string) go selectPullRequestPrompt(pullRequests, additionalProjectOrder, choiceChan) diff --git a/pkg/views/workspace/selection/repository.go b/pkg/views/workspace/selection/repository.go index 415c0d3e89..f56dc8c3a2 100644 --- a/pkg/views/workspace/selection/repository.go +++ b/pkg/views/workspace/selection/repository.go @@ -7,14 +7,14 @@ import ( "fmt" "os" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" ) -func selectRepositoryPrompt(repositories []serverapiclient.GitRepository, index int, choiceChan chan<- string) { +func selectRepositoryPrompt(repositories []apiclient.GitRepository, index int, choiceChan chan<- string) { items := []list.Item{} // Populate items with titles and descriptions from workspaces. @@ -46,7 +46,7 @@ func selectRepositoryPrompt(repositories []serverapiclient.GitRepository, index } } -func GetRepositoryFromPrompt(repositories []serverapiclient.GitRepository, index int) *serverapiclient.GitRepository { +func GetRepositoryFromPrompt(repositories []apiclient.GitRepository, index int) *apiclient.GitRepository { choiceChan := make(chan string) go selectRepositoryPrompt(repositories, index, choiceChan) diff --git a/pkg/views/workspace/selection/workspace.go b/pkg/views/workspace/selection/workspace.go index c36781eee7..f059360ab9 100644 --- a/pkg/views/workspace/selection/workspace.go +++ b/pkg/views/workspace/selection/workspace.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/daytonaio/daytona/internal/util" - "github.com/daytonaio/daytona/pkg/serverapiclient" + "github.com/daytonaio/daytona/pkg/apiclient" "github.com/daytonaio/daytona/pkg/views" "github.com/charmbracelet/bubbles/list" @@ -17,7 +17,7 @@ import ( "github.com/charmbracelet/lipgloss" ) -func selectWorkspacePrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb string, choiceChan chan<- *serverapiclient.WorkspaceDTO) { +func selectWorkspacePrompt(workspaces []apiclient.WorkspaceDTO, actionVerb string, choiceChan chan<- *apiclient.WorkspaceDTO) { // Initialize an empty list of items. items := []list.Item{} @@ -53,7 +53,7 @@ func selectWorkspacePrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb } } - newItem := item[serverapiclient.WorkspaceDTO]{ + newItem := item[apiclient.WorkspaceDTO]{ title: *workspace.Name, id: *workspace.Id, desc: strings.Join(projectsInfo, ", "), @@ -66,7 +66,7 @@ func selectWorkspacePrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb items = append(items, newItem) } - d := ItemDelegate[serverapiclient.WorkspaceDTO]{} + d := ItemDelegate[apiclient.WorkspaceDTO]{} l := list.New(items, d, 0, 0) @@ -76,7 +76,7 @@ func selectWorkspacePrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb l.FilterInput.PromptStyle = lipgloss.NewStyle().Foreground(views.Green) l.FilterInput.TextStyle = lipgloss.NewStyle().Foreground(views.Green) - m := model[serverapiclient.WorkspaceDTO]{list: l} + m := model[apiclient.WorkspaceDTO]{list: l} m.list.Title = views.GetStyledMainTitle("Select a Workspace To " + actionVerb) m.list.Styles.Title = lipgloss.NewStyle().Foreground(views.Green).Bold(true) @@ -87,15 +87,15 @@ func selectWorkspacePrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb os.Exit(1) } - if m, ok := p.(model[serverapiclient.WorkspaceDTO]); ok && m.choice != nil { + if m, ok := p.(model[apiclient.WorkspaceDTO]); ok && m.choice != nil { choiceChan <- m.choice } else { choiceChan <- nil } } -func GetWorkspaceFromPrompt(workspaces []serverapiclient.WorkspaceDTO, actionVerb string) *serverapiclient.WorkspaceDTO { - choiceChan := make(chan *serverapiclient.WorkspaceDTO) +func GetWorkspaceFromPrompt(workspaces []apiclient.WorkspaceDTO, actionVerb string) *apiclient.WorkspaceDTO { + choiceChan := make(chan *apiclient.WorkspaceDTO) go selectWorkspacePrompt(workspaces, actionVerb, choiceChan)