Return mapped ports when requesting runners

We now store the mapped ports returned by Nomad locally in our runner
struct and return them when requesting the runner. The returned ip
address is in most Nomad setups not reachable from external users.

api/dto/dto.go

@@ -42,9 +42,17 @@ type ExecutionEnvironmentRequest struct {
 	ExposedPorts       []uint16 `json:"exposedPorts"`
 }
 
+// MappedPort contains the mapping from exposed port inside the container to the host address
+// outside the container.
+type MappedPort struct {
+	ExposedPort uint   `json:"exposedPort"`
+	HostAddress string `json:"hostAddress"`
+}
+
 // RunnerResponse is the expected response when providing a runner.
 type RunnerResponse struct {
-	ID string `json:"runnerId"`
+	ID          string        `json:"runnerId"`
+	MappedPorts []*MappedPort `json:"mappedPorts"`
 }
 
 // ExecutionResponse is the expected response when creating an execution for a runner.

api/runners.go

@@ -62,7 +62,7 @@ func (r *RunnerController) provide(writer http.ResponseWriter, request *http.Req
 		}
 		return
 	}
-	sendJSON(writer, &dto.RunnerResponse{ID: nextRunner.ID()}, http.StatusOK)
+	sendJSON(writer, &dto.RunnerResponse{ID: nextRunner.ID(), MappedPorts: nextRunner.MappedPorts()}, http.StatusOK)
 }
 
 // updateFileSystem handles the files API route.

api/runners_test.go

@@ -28,7 +28,7 @@ type MiddlewareTestSuite struct {
 
 func (s *MiddlewareTestSuite) SetupTest() {
 	s.manager = &runner.ManagerMock{}
-	s.runner = runner.NewNomadJob(tests.DefaultRunnerID, nil, nil)
+	s.runner = runner.NewNomadJob(tests.DefaultRunnerID, nil, nil, nil)
 	s.capturedRunner = nil
 	s.runnerRequest = func(runnerId string) *http.Request {
 		path, err := s.router.Get("test-runner-id").URL(RunnerIDKey, runnerId)
@@ -91,7 +91,7 @@ type RunnerRouteTestSuite struct {
 func (s *RunnerRouteTestSuite) SetupTest() {
 	s.runnerManager = &runner.ManagerMock{}
 	s.router = NewRouter(s.runnerManager, nil)
-	s.runner = runner.NewNomadJob("some-id", nil, nil)
+	s.runner = runner.NewNomadJob("some-id", nil, nil, nil)
 	s.executionID = "execution-id"
 	s.runner.Add(s.executionID, &dto.ExecutionRequest{})
 	s.runnerManager.On("Get", s.runner.ID()).Return(s.runner, nil)

api/websocket_test.go

@@ -370,9 +370,9 @@ func TestCodeOceanToRawReaderReturnsOnlyAfterOneByteWasReadFromConnection(t *tes
 
 // --- Test suite specific test helpers ---
 
-func newNomadAllocationWithMockedAPIClient(runnerID string) (r runner.Runner, executorAPIMock *nomad.ExecutorAPIMock) {
-	executorAPIMock = &nomad.ExecutorAPIMock{}
-	r = runner.NewNomadJob(runnerID, executorAPIMock, nil)
+func newNomadAllocationWithMockedAPIClient(runnerID string) (r runner.Runner, mock *nomad.ExecutorAPIMock) {
+	mock = &nomad.ExecutorAPIMock{}
+	r = runner.NewNomadJob(runnerID, nil, mock, nil)
 	return
 }