#136 Copy files back from Nomad runner.

internal/api/runners.go

@@ -20,9 +20,11 @@ const (
 	ExecutePath          = "/execute"
 	WebsocketPath        = "/websocket"
 	UpdateFileSystemPath = "/files"
+	FileContentRawPath   = UpdateFileSystemPath + "/raw"
 	DeleteRoute          = "deleteRunner"
 	RunnerIDKey          = "runnerId"
 	ExecutionIDKey       = "executionID"
+	PathKey              = "path"
 	ProvideRoute         = "provideRunner"
 )
 
@@ -39,6 +41,7 @@ func (r *RunnerController) ConfigureRoutes(router *mux.Router) {
 	r.runnerRouter.Use(r.findRunnerMiddleware)
 	r.runnerRouter.HandleFunc(UpdateFileSystemPath, r.updateFileSystem).Methods(http.MethodPatch).
 		Name(UpdateFileSystemPath)
+	r.runnerRouter.HandleFunc(FileContentRawPath, r.fileContent).Methods(http.MethodGet).Name(FileContentRawPath)
 	r.runnerRouter.HandleFunc(ExecutePath, r.execute).Methods(http.MethodPost).Name(ExecutePath)
 	r.runnerRouter.HandleFunc(WebsocketPath, r.connectToRunner).Methods(http.MethodGet).Name(WebsocketPath)
 	r.runnerRouter.HandleFunc("", r.delete).Methods(http.MethodDelete).Name(DeleteRoute)
@@ -92,6 +95,25 @@ func (r *RunnerController) updateFileSystem(writer http.ResponseWriter, request
 	writer.WriteHeader(http.StatusNoContent)
 }
 
+func (r *RunnerController) fileContent(writer http.ResponseWriter, request *http.Request) {
+	monitoring.AddRequestSize(request)
+	targetRunner, _ := runner.FromContext(request.Context())
+	path := request.URL.Query().Get(PathKey)
+
+	err := targetRunner.GetFileContent(path, writer, request.Context())
+	if errors.Is(err, runner.ErrFileNotFound) {
+		writeNotFound(writer, err)
+		return
+	} else if err != nil {
+		log.WithError(err).Error("Could not retrieve the requested file.")
+		writeInternalServerError(writer, err, dto.ErrorUnknown)
+		return
+	}
+
+	writer.Header().Set("Content-Type", "application/octet-stream")
+	writer.WriteHeader(http.StatusOK)
+}
+
 // execute handles the execute API route.
 // It takes an ExecutionRequest and stores it for a runner.
 // It returns a url to connect to for a websocket connection to this execution in the corresponding runner.

internal/api/runners_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gorilla/mux"
+	"github.com/openHPI/poseidon/internal/nomad"
 	"github.com/openHPI/poseidon/internal/runner"
 	"github.com/openHPI/poseidon/pkg/dto"
 	"github.com/openHPI/poseidon/tests"
@@ -310,6 +311,39 @@ func (s *UpdateFileSystemRouteTestSuite) TestUpdateFileSystemReturnsInternalServ
 	s.Equal(http.StatusInternalServerError, s.recorder.Code)
 }
 
+func (s *UpdateFileSystemRouteTestSuite) TestFileContent() {
+	routeURL, err := s.router.Get(FileContentRawPath).URL(RunnerIDKey, tests.DefaultMockID)
+	s.Require().NoError(err)
+	mockCall := s.runnerMock.
+		On("GetFileContent", mock.AnythingOfType("string"), mock.Anything, mock.Anything)
+
+	s.Run("Not Found", func() {
+		mockCall.Return(runner.ErrFileNotFound)
+		request, err := http.NewRequest(http.MethodGet, routeURL.String(), strings.NewReader(""))
+		s.Require().NoError(err)
+		s.router.ServeHTTP(s.recorder, request)
+		s.Equal(http.StatusNotFound, s.recorder.Code)
+	})
+
+	s.recorder = httptest.NewRecorder()
+	s.Run("Unknown Error", func() {
+		mockCall.Return(nomad.ErrorExecutorCommunicationFailed)
+		request, err := http.NewRequest(http.MethodGet, routeURL.String(), strings.NewReader(""))
+		s.Require().NoError(err)
+		s.router.ServeHTTP(s.recorder, request)
+		s.Equal(http.StatusInternalServerError, s.recorder.Code)
+	})
+
+	s.recorder = httptest.NewRecorder()
+	s.Run("No Error", func() {
+		mockCall.Return(nil)
+		request, err := http.NewRequest(http.MethodGet, routeURL.String(), strings.NewReader(""))
+		s.Require().NoError(err)
+		s.router.ServeHTTP(s.recorder, request)
+		s.Equal(http.StatusOK, s.recorder.Code)
+	})
+}
+
 func TestDeleteRunnerRouteTestSuite(t *testing.T) {
 	suite.Run(t, new(DeleteRunnerRouteTestSuite))
 }