Skip to content

Simplify delete file|dir to just delete path #2181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djeebus merged 6 commits into from
Mar 20, 2026
Merged

Simplify delete file|dir to just delete path #2181

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77fbe92
fix implementation
djeebus Mar 19, 2026
1b3374a
remove obsolete methods, common now called 'path'
djeebus Mar 20, 2026
c082c1c
rename another handler
djeebus Mar 20, 2026
7b81a53
Merge remote-tracking branch 'origin/main' into simplify-deletes
djeebus Mar 20, 2026
b4522b8
fix broken symlink handling
djeebus Mar 20, 2026
fec8cfa
parallel tests are hard
djeebus Mar 20, 2026
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
2 changes: 1 addition & 1 deletion packages/api/internal/handlers/volume_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func isValidVolumeName(name string) bool {

func (a *APIStore) createVolume(ctx context.Context, clusterID uuid.UUID, volume queries.Volume) error {
return a.executeOnOrchestratorByClusterID(ctx, clusterID, func(ctx context.Context, client *clusters.GRPCClient) error {
_, err := client.Volumes.Create(ctx, &orchestrator.VolumeCreateRequest{
_, err := client.Volumes.CreateVolume(ctx, &orchestrator.CreateVolumeRequest{
Volume: toVolumeKey(volume),
})

Expand Down
2 changes: 1 addition & 1 deletion packages/api/internal/handlers/volume_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (a *APIStore) DeleteVolumesVolumeID(c *gin.Context, volumeID api.VolumeID)

func (a *APIStore) deleteVolume(ctx context.Context, clusterID uuid.UUID, volume queries.Volume) error {
return a.executeOnOrchestratorByClusterID(ctx, clusterID, func(ctx context.Context, client *clusters.GRPCClient) error {
_, err := client.Volumes.Delete(ctx, &orchestrator.VolumeDeleteRequest{
_, err := client.Volumes.DeleteVolume(ctx, &orchestrator.DeleteVolumeRequest{
Volume: toVolumeKey(volume),
})

Expand Down
4 changes: 2 additions & 2 deletions packages/orchestrator/pkg/volumes/dir_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/e2b-dev/infra/packages/shared/pkg/utils"
)

func (s *Service) CreateDir(ctx context.Context, request *orchestrator.VolumeDirCreateRequest) (r *orchestrator.VolumeDirCreateResponse, err error) {
func (s *Service) CreateDir(ctx context.Context, request *orchestrator.CreateDirRequest) (r *orchestrator.CreateDirResponse, err error) {
ctx, span := tracer.Start(ctx, "create directory in volume")
defer func() {
setSpanStatus(span, err)
Expand Down Expand Up @@ -82,7 +82,7 @@ func (s *Service) CreateDir(ctx context.Context, request *orchestrator.VolumeDir

entry := toEntry(path, stat)

return &orchestrator.VolumeDirCreateResponse{Entry: entry}, nil
return &orchestrator.CreateDirResponse{Entry: entry}, nil
}

func processError(ctx context.Context, s string, err error) error {
Expand Down
14 changes: 7 additions & 7 deletions packages/orchestrator/pkg/volumes/dir_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func TestDirCreate(t *testing.T) {
t.Parallel()

dirname := "test-dir"
_, err := s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err := s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
})
Expand All @@ -37,7 +37,7 @@ func TestDirCreate(t *testing.T) {
t.Parallel()

dirname := "parent/child"
_, err := s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err := s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
CreateParents: true,
Expand All @@ -53,7 +53,7 @@ func TestDirCreate(t *testing.T) {
t.Parallel()

dirname := "another-parent/child"
_, err := s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err := s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
CreateParents: false,
Expand All @@ -69,7 +69,7 @@ func TestDirCreate(t *testing.T) {
uid := uint32(1000)
gid := uint32(1000)

_, err := s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err := s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
Mode: utils.ToPtr(mode),
Expand All @@ -90,7 +90,7 @@ func TestDirCreate(t *testing.T) {
err := os.Mkdir(filepath.Join(tmpdir, dirname), 0o755)
require.NoError(t, err)

_, err = s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err = s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
})
Expand All @@ -105,7 +105,7 @@ func TestDirCreate(t *testing.T) {
err := os.WriteFile(fullPath, []byte("test"), 0o644)
require.NoError(t, err)

_, err = s.CreateDir(t.Context(), &orchestrator.VolumeDirCreateRequest{
_, err = s.CreateDir(t.Context(), &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: filename,
CreateParents: true,
Expand Down Expand Up @@ -133,7 +133,7 @@ func TestDirCreate(t *testing.T) {

// Now call CreateDir with CreateParents=true and a different mode
newMode := uint32(0o777)
request := &orchestrator.VolumeDirCreateRequest{
request := &orchestrator.CreateDirRequest{
Volume: volumeInfo,
Path: dirname,
CreateParents: true,
Expand Down
67 changes: 0 additions & 67 deletions packages/orchestrator/pkg/volumes/dir_delete.go
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions packages/orchestrator/pkg/volumes/dir_delete_test.go
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/orchestrator/pkg/volumes/dir_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const (

func (s *Service) ListDir(
ctx context.Context,
request *orchestrator.VolumeDirListRequest,
) (r *orchestrator.VolumeDirListResponse, err error) {
request *orchestrator.ListDirRequest,
) (r *orchestrator.ListDirResponse, err error) {
ctx, span := tracer.Start(ctx, "list directory in volume")
defer func() {
setSpanStatus(span, err)
Expand Down Expand Up @@ -70,7 +70,7 @@ func (s *Service) ListDir(
return nil, fmt.Errorf("failed to read directory %q: %w", path, err)
}

return &orchestrator.VolumeDirListResponse{Files: results}, nil
return &orchestrator.ListDirResponse{Files: results}, nil
}

func (s *Service) listRecursive(
Expand Down
10 changes: 5 additions & 5 deletions packages/orchestrator/pkg/volumes/dir_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestListDir_Depth(t *testing.T) {
t.Run("depth 0", func(t *testing.T) {
t.Parallel()

req := &orchestrator.VolumeDirListRequest{
req := &orchestrator.ListDirRequest{
Volume: volumeInfo,
Path: "dir",
Depth: 0,
Expand All @@ -56,7 +56,7 @@ func TestListDir_Depth(t *testing.T) {
t.Run("depth 1", func(t *testing.T) {
t.Parallel()

req := &orchestrator.VolumeDirListRequest{
req := &orchestrator.ListDirRequest{
Volume: volumeInfo,
Path: "dir",
Depth: 1,
Expand All @@ -72,7 +72,7 @@ func TestListDir_Depth(t *testing.T) {
t.Run("depth 2", func(t *testing.T) {
t.Parallel()

req := &orchestrator.VolumeDirListRequest{
req := &orchestrator.ListDirRequest{
Volume: volumeInfo,
Path: "dir",
Depth: 2,
Expand All @@ -88,7 +88,7 @@ func TestListDir_Depth(t *testing.T) {
t.Run("list non-existent dir", func(t *testing.T) {
t.Parallel()

req := &orchestrator.VolumeDirListRequest{
req := &orchestrator.ListDirRequest{
Volume: volumeInfo,
Path: "non-existent-dir",
}
Expand All @@ -99,7 +99,7 @@ func TestListDir_Depth(t *testing.T) {
t.Run("list depth out of range", func(t *testing.T) {
t.Parallel()

req := &orchestrator.VolumeDirListRequest{
req := &orchestrator.ListDirRequest{
Volume: volumeInfo,
Path: "dir",
Depth: 11,
Expand Down
6 changes: 3 additions & 3 deletions packages/orchestrator/pkg/volumes/file_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ func (s *Service) CreateFile(server orchestrator.VolumeService_CreateFileServer)
}

switch m := req.GetMessage().(type) {
case *orchestrator.VolumeFileCreateRequest_Content:
case *orchestrator.CreateFileRequest_Content:
if _, err := file.Write(m.Content.GetContent()); err != nil {
return fmt.Errorf("failed to write file content: %w", err)
}

case *orchestrator.VolumeFileCreateRequest_Finish:
case *orchestrator.CreateFileRequest_Finish:
if err = file.Sync(); err != nil {
return fmt.Errorf("failed to sync file to disk: %w", err)
}
Expand All @@ -112,7 +112,7 @@ func (s *Service) CreateFile(server orchestrator.VolumeService_CreateFileServer)

entry := toEntry(path, fi)

return server.SendAndClose(&orchestrator.VolumeFileCreateResponse{
return server.SendAndClose(&orchestrator.CreateFileResponse{
Entry: entry,
})

Expand Down
Loading
Loading