Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 26 additions & 134 deletions pkg/provider/dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package provider

import (
"bytes"
"encoding/json"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -59,16 +58,16 @@ func GetProviderBinariesDir(context, providerName string) (string, error) {
}

func GetMachineDir(context, machineID string) (string, error) {
if machineID == "" {
return "", fmt.Errorf("machine id is empty")
if err := requireID("machine id", machineID); err != nil {
return "", err
}

return config.DefaultPathManager().MachineDir(context, machineID)
}

func GetWorkspaceDir(context, workspaceID string) (string, error) {
if workspaceID == "" {
return "", fmt.Errorf("workspace id is empty")
if err := requireID("workspace id", workspaceID); err != nil {
return "", err
}

return config.DefaultPathManager().WorkspaceDir(context, workspaceID)
Expand All @@ -78,8 +77,8 @@ func GetWorkspaceDir(context, workspaceID string) (string, error) {
// (.../workspaces/<id>/agent). Container-side agent code keeps using
// FindAgentHomeDir.
func GetWorkspaceAgentDir(context, workspaceID string) (string, error) {
if workspaceID == "" {
return "", fmt.Errorf("workspace id is empty")
if err := requireID("workspace id", workspaceID); err != nil {
return "", err
}

return config.DefaultPathManager().WorkspaceAgentDir(context, workspaceID)
Expand All @@ -94,8 +93,8 @@ func GetWorkspaceContentsDir(context string) (string, error) {
// GetWorkspaceContentDir returns the host-side bind-mount source for a
// workspace (.../contexts/<ctx>/contents/<id>).
func GetWorkspaceContentDir(context, workspaceID string) (string, error) {
if workspaceID == "" {
return "", fmt.Errorf("workspace id is empty")
if err := requireID("workspace id", workspaceID); err != nil {
return "", err
}

return config.DefaultPathManager().WorkspaceContentDir(context, workspaceID)
Expand All @@ -104,16 +103,16 @@ func GetWorkspaceContentDir(context, workspaceID string) (string, error) {
// GetWorkspaceLogDir returns the per-workspace log dir
// (.../workspaces/<id>/logs) used by the desktop's streaming-log store.
func GetWorkspaceLogDir(context, workspaceID string) (string, error) {
if workspaceID == "" {
return "", fmt.Errorf("workspace id is empty")
if err := requireID("workspace id", workspaceID); err != nil {
return "", err
}

return config.DefaultPathManager().WorkspaceLogDir(context, workspaceID)
}

func GetProInstanceDir(context, proInstanceHost string) (string, error) {
if proInstanceHost == "" {
return "", fmt.Errorf("pro instance host is empty")
if err := requireID("pro instance host", proInstanceHost); err != nil {
return "", err
}

return config.DefaultPathManager().ProInstanceDir(context, ToProInstanceID(proInstanceHost))
Expand Down Expand Up @@ -158,50 +157,16 @@ func SaveProviderConfig(context string, provider *ProviderConfig) error {
return err
}

// #nosec G301 -- TODO Consider using a more secure permission setting and ownership if needed.
err = os.MkdirAll(providerDir, 0o755)
if err != nil {
return err
}

providerDirBytes, err := json.Marshal(provider)
if err != nil {
return err
}

providerConfigFile := filepath.Join(providerDir, ProviderConfigFile)
err = WriteFileAtomic(providerConfigFile, providerDirBytes, 0o600)
if err != nil {
return err
}

return nil
return saveJSON(providerDir, ProviderConfigFile, provider, 0o600)
}

func SaveProInstanceConfig(context string, proInstance *ProInstance) error {
providerDir, err := GetProInstanceDir(context, proInstance.Host)
if err != nil {
return err
}

// #nosec G301 -- TODO Consider using a more secure permission setting and ownership if needed.
err = os.MkdirAll(providerDir, 0o755)
if err != nil {
return err
}

proInstanceBytes, err := json.Marshal(proInstance)
proDir, err := GetProInstanceDir(context, proInstance.Host)
if err != nil {
return err
}

proInstanceConfigFile := filepath.Join(providerDir, ProInstanceConfigFile)
err = WriteFileAtomic(proInstanceConfigFile, proInstanceBytes, 0o600)
if err != nil {
return err
}

return nil
return saveJSON(proDir, ProInstanceConfigFile, proInstance, 0o600)
}

func SaveWorkspaceResult(workspace *Workspace, result *config2.Result) error {
Expand All @@ -210,25 +175,16 @@ func SaveWorkspaceResult(workspace *Workspace, result *config2.Result) error {
return err
}

// Unlike saveJSON, this never creates the workspace dir: a result is only
// valid while the workspace config exists.
if _, err := os.Stat(filepath.Join(workspaceDir, WorkspaceConfigFile)); err != nil {
if os.IsNotExist(err) {
return fmt.Errorf("workspace %s no longer exists", workspace.ID)
}
return err
}

resultBytes, err := json.Marshal(result)
if err != nil {
return err
}

workspaceResultFile := filepath.Join(workspaceDir, WorkspaceResultFile)
err = WriteFileAtomic(workspaceResultFile, resultBytes, 0o600)
if err != nil {
return err
}

return nil
return writeJSONFile(filepath.Join(workspaceDir, WorkspaceResultFile), result, 0o600)
}

func SaveWorkspaceConfig(workspace *Workspace) error {
Expand All @@ -237,25 +193,7 @@ func SaveWorkspaceConfig(workspace *Workspace) error {
return err
}

// #nosec G301 -- TODO Consider using a more secure permission setting and ownership if needed.
err = os.MkdirAll(workspaceDir, 0o755)
if err != nil {
return err
}

workspaceConfigBytes, err := json.Marshal(workspace)
if err != nil {
return err
}

workspaceConfigFile := filepath.Join(workspaceDir, WorkspaceConfigFile)
// #nosec G306 -- TODO Consider using a more secure permission setting and ownership if needed.
err = WriteFileAtomic(workspaceConfigFile, workspaceConfigBytes, 0o644)
if err != nil {
return err
}

return nil
return saveJSON(workspaceDir, WorkspaceConfigFile, workspace, 0o644)
}

func SaveMachineConfig(machine *Machine) error {
Expand All @@ -264,24 +202,7 @@ func SaveMachineConfig(machine *Machine) error {
return err
}

// #nosec G301 -- TODO Consider using a more secure permission setting and ownership if needed.
err = os.MkdirAll(machineDir, 0o755)
if err != nil {
return err
}

machineConfigBytes, err := json.Marshal(machine)
if err != nil {
return err
}

machineConfigFile := filepath.Join(machineDir, MachineConfigFile)
err = WriteFileAtomic(machineConfigFile, machineConfigBytes, 0o600)
if err != nil {
return err
}

return nil
return saveJSON(machineDir, MachineConfigFile, machine, 0o600)
}

func MachineExists(context, machineID string) bool {
Expand Down Expand Up @@ -361,13 +282,7 @@ func LoadMachineConfig(context, machineID string) (*Machine, error) {
}

machineConfigFile := filepath.Join(machineDir, MachineConfigFile)
machineConfigBytes, err := os.ReadFile(machineConfigFile)
if err != nil {
return nil, err
}

machineConfig := &Machine{}
err = json.Unmarshal(machineConfigBytes, machineConfig)
machineConfig, err := loadJSON[Machine](machineConfigFile)
if err != nil {
return nil, err
}
Expand All @@ -383,19 +298,7 @@ func LoadProInstanceConfig(context, proInstanceHost string) (*ProInstance, error
return nil, err
}

proConfigFile := filepath.Join(proDir, ProInstanceConfigFile)
proConfigBytes, err := os.ReadFile(proConfigFile)
if err != nil {
return nil, err
}

proInstanceConfig := &ProInstance{}
err = json.Unmarshal(proConfigBytes, proInstanceConfig)
if err != nil {
return nil, err
}

return proInstanceConfig, nil
return loadJSON[ProInstance](filepath.Join(proDir, ProInstanceConfigFile))
}

func LoadWorkspaceConfig(context, workspaceID string) (*Workspace, error) {
Expand All @@ -405,13 +308,7 @@ func LoadWorkspaceConfig(context, workspaceID string) (*Workspace, error) {
}

workspaceConfigFile := filepath.Join(workspaceDir, WorkspaceConfigFile)
workspaceConfigBytes, err := os.ReadFile(workspaceConfigFile)
if err != nil {
return nil, err
}

workspaceConfig := &Workspace{}
err = json.Unmarshal(workspaceConfigBytes, workspaceConfig)
workspaceConfig, err := loadJSON[Workspace](workspaceConfigFile)
if err != nil {
return nil, err
}
Expand All @@ -427,19 +324,14 @@ func LoadWorkspaceResult(context, workspaceID string) (*config2.Result, error) {
return nil, err
}

workspaceResultFile := filepath.Join(workspaceDir, WorkspaceResultFile)
workspaceResultBytes, err := os.ReadFile(workspaceResultFile)
workspaceResult, err := loadJSON[config2.Result](
filepath.Join(workspaceDir, WorkspaceResultFile),
)
if os.IsNotExist(err) {
return nil, nil
} else if err != nil {
return nil, err
}

workspaceResult := &config2.Result{}
err = json.Unmarshal(workspaceResultBytes, workspaceResult)
if err != nil {
return nil, err
}

return workspaceResult, nil
}
32 changes: 20 additions & 12 deletions pkg/provider/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,16 @@ func ExportWorkspace(context, workspaceID string) (*ExportWorkspaceConfig, error
return nil, err
}

buf := &bytes.Buffer{}
err = extract.WriteTarExclude(buf, workspaceDir, true, excludedPaths)
data, err := archiveDirBase64(workspaceDir, "workspace")
if err != nil {
return nil, fmt.Errorf("compress workspace dir: %w", err)
return nil, err
}

return &ExportWorkspaceConfig{
ID: workspaceID,
UID: workspaceConfig.UID,
Context: context,
Data: base64.RawStdEncoding.EncodeToString(buf.Bytes()),
Data: data,
}, nil
}

Expand All @@ -111,16 +110,15 @@ func ExportMachine(context, machineID string) (*ExportMachineConfig, error) {
return nil, err
}

buf := &bytes.Buffer{}
err = extract.WriteTarExclude(buf, machineDir, true, excludedPaths)
data, err := archiveDirBase64(machineDir, "machine")
if err != nil {
return nil, fmt.Errorf("compress machine dir: %w", err)
return nil, err
}

return &ExportMachineConfig{
ID: machineID,
Context: context,
Data: base64.RawStdEncoding.EncodeToString(buf.Bytes()),
Data: data,
}, nil
}

Expand All @@ -138,10 +136,9 @@ func ExportProvider(
return nil, err
}

buf := &bytes.Buffer{}
err = extract.WriteTarExclude(buf, providerDir, true, excludedPaths)
data, err := archiveDirBase64(providerDir, "provider")
if err != nil {
return nil, fmt.Errorf("compress provider dir: %w", err)
return nil, err
}

var providerConfig *config.ProviderConfig
Expand All @@ -154,7 +151,18 @@ func ExportProvider(
return &ExportProviderConfig{
ID: providerID,
Context: context,
Data: base64.RawStdEncoding.EncodeToString(buf.Bytes()),
Data: data,
Config: providerConfig,
}, nil
}

// archiveDirBase64 tars dir (skipping excludedPaths) and returns it base64-encoded.
// kind names the dir in the error message ("compress <kind> dir").
func archiveDirBase64(dir, kind string) (string, error) {
buf := &bytes.Buffer{}
if err := extract.WriteTarExclude(buf, dir, true, excludedPaths); err != nil {
return "", fmt.Errorf("compress %s dir: %w", kind, err)
}

return base64.RawStdEncoding.EncodeToString(buf.Bytes()), nil
}
Loading
Loading