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
38 changes: 37 additions & 1 deletion server/cmd/api/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package api

import (
"context"
"errors"
"fmt"
"os"
"time"

"github.com/onkernel/kernel-images/server/lib/logger"
Expand Down Expand Up @@ -92,7 +94,7 @@ func (s *ApiService) StopRecording(ctx context.Context, req oapi.StopRecordingRe

rec, exists := s.recordManager.GetRecorder(recorderID)
if !exists {
log.Warn("attempted to stop recording when none is active", "recorder_id", recorderID)
log.Error("attempted to stop recording when none is active", "recorder_id", recorderID)
return oapi.StopRecording400JSONResponse{BadRequestErrorJSONResponse: oapi.BadRequestErrorJSONResponse{Message: "no active recording to stop"}}, nil
} else if !rec.IsRecording(ctx) {
log.Warn("recording already stopped", "recorder_id", recorderID)
Expand Down Expand Up @@ -140,6 +142,10 @@ func (s *ApiService) DownloadRecording(ctx context.Context, req oapi.DownloadRec
log.Error("attempted to download non-existent recording", "recorder_id", recorderID)
return oapi.DownloadRecording404JSONResponse{NotFoundErrorJSONResponse: oapi.NotFoundErrorJSONResponse{Message: "no recording found"}}, nil
}
if rec.IsDeleted(ctx) {
log.Error("attempted to download deleted recording", "recorder_id", recorderID)
return oapi.DownloadRecording400JSONResponse{BadRequestErrorJSONResponse: oapi.BadRequestErrorJSONResponse{Message: "requested recording has been deleted"}}, nil
}

out, meta, err := rec.Recording(ctx)
if err != nil {
Expand Down Expand Up @@ -167,6 +173,36 @@ func (s *ApiService) DownloadRecording(ctx context.Context, req oapi.DownloadRec
}, nil
}

func (s *ApiService) DeleteRecording(ctx context.Context, req oapi.DeleteRecordingRequestObject) (oapi.DeleteRecordingResponseObject, error) {
log := logger.FromContext(ctx)

recorderID := s.defaultRecorderID
if req.Body != nil && req.Body.Id != nil && *req.Body.Id != "" {
recorderID = *req.Body.Id
}
rec, exists := s.recordManager.GetRecorder(recorderID)
if !exists {
log.Error("attempted to delete non-existent recording", "recorder_id", recorderID)
return oapi.DeleteRecording404JSONResponse{NotFoundErrorJSONResponse: oapi.NotFoundErrorJSONResponse{Message: "no recording found"}}, nil
}

if rec.IsRecording(ctx) {
log.Error("attempted to delete recording while still in progress", "recorder_id", recorderID)
return oapi.DeleteRecording400JSONResponse{BadRequestErrorJSONResponse: oapi.BadRequestErrorJSONResponse{Message: "recording must be stopped first"}}, nil
}

// fine to do this async
go func() {
if err := rec.Delete(context.Background()); err != nil && !errors.Is(err, os.ErrNotExist) {
log.Error("failed to delete recording", "err", err, "recorder_id", recorderID)
} else {
log.Info("recording deleted", "recorder_id", recorderID)
}
}()

return oapi.DeleteRecording200Response{}, nil
}

// ListRecorders returns a list of all registered recorders and whether each one is currently recording.
func (s *ApiService) ListRecorders(ctx context.Context, _ oapi.ListRecordersRequestObject) (oapi.ListRecordersResponseObject, error) {
infos := []oapi.RecorderInfo{}
Expand Down
15 changes: 15 additions & 0 deletions server/cmd/api/api/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"io"
"math/rand"
"os"
"testing"

oapi "github.com/onkernel/kernel-images/server/lib/oapi"
Expand Down Expand Up @@ -217,6 +218,7 @@ type mockRecorder struct {
forceStopErr error
recordingErr error
recordingData []byte
deleted bool
}

func (m *mockRecorder) ID() string { return m.id }
Expand Down Expand Up @@ -251,6 +253,9 @@ func (m *mockRecorder) ForceStop(ctx context.Context) error {
func (m *mockRecorder) IsRecording(ctx context.Context) bool { return m.isRecordingFlag }

func (m *mockRecorder) Recording(ctx context.Context) (io.ReadCloser, *recorder.RecordingMetadata, error) {
if m.deleted {
return nil, nil, fmt.Errorf("deleted: %w", os.ErrNotExist)
}
if m.recordingErr != nil {
return nil, nil, m.recordingErr
}
Expand All @@ -263,6 +268,16 @@ func (m *mockRecorder) Metadata() *recorder.RecordingMetadata {
return &recorder.RecordingMetadata{}
}

func (m *mockRecorder) Delete(ctx context.Context) error {
if m.isRecordingFlag {
return fmt.Errorf("still recording")
}
m.deleted = true
return nil
}

func (m *mockRecorder) IsDeleted(ctx context.Context) bool { return m.deleted }

func newMockFactory() recorder.FFmpegRecorderFactory {
return func(id string, _ recorder.FFmpegRecordingParams) (recorder.Recorder, error) {
rec := &mockRecorder{id: id}
Expand Down
Loading
Loading