Implement merge request comments

api/environments.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gorilla/mux"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
 	"net/http"
 )
 
@@ -37,8 +38,12 @@ func (e *EnvironmentController) createOrUpdate(writer http.ResponseWriter, reque
 		writeBadRequest(writer, fmt.Errorf("could not find %s", executionEnvironmentIDKey))
 		return
 	}
-
-	created, err := e.manager.CreateOrUpdate(id, *req)
+	environmentID, err := runner.NewEnvironmentID(id)
+	if err != nil {
+		writeBadRequest(writer, fmt.Errorf("could not update environment: %w", err))
+		return
+	}
+	created, err := e.manager.CreateOrUpdate(environmentID, *req)
 	if err != nil {
 		writeInternalServerError(writer, err, dto.ErrorUnknown)
 	}
@@ -51,6 +56,6 @@ func (e *EnvironmentController) createOrUpdate(writer http.ResponseWriter, reque
 }
 
 // delete removes an execution environment from the executor
-func (e *EnvironmentController) delete(writer http.ResponseWriter, request *http.Request) { // nolint:unused
+func (e *EnvironmentController) delete(writer http.ResponseWriter, request *http.Request) { // nolint:unused ToDo
 
 }

api/environments_test.go

@@ -8,9 +8,13 @@ import (
 	"github.com/stretchr/testify/suite"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/environment"
+	"gitlab.hpi.de/codeocean/codemoon/poseidon/runner"
 	"gitlab.hpi.de/codeocean/codemoon/poseidon/tests"
+	"math"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
+	"strings"
 	"testing"
 )
 
@@ -32,7 +36,7 @@ func (s *EnvironmentControllerTestSuite) SetupTest() {
 type CreateOrUpdateEnvironmentTestSuite struct {
 	EnvironmentControllerTestSuite
 	path string
-	id   string
+	id   runner.EnvironmentID
 	body []byte
 }
 
@@ -42,8 +46,8 @@ func TestCreateOrUpdateEnvironmentTestSuite(t *testing.T) {
 
 func (s *CreateOrUpdateEnvironmentTestSuite) SetupTest() {
 	s.EnvironmentControllerTestSuite.SetupTest()
-	s.id = tests.DefaultEnvironmentIDAsString
-	testURL, err := s.router.Get(createOrUpdateRouteName).URL(executionEnvironmentIDKey, s.id)
+	s.id = tests.DefaultEnvironmentIDAsInteger
+	testURL, err := s.router.Get(createOrUpdateRouteName).URL(executionEnvironmentIDKey, strconv.Itoa(int(s.id)))
 	if err != nil {
 		s.T().Fatal(err)
 	}
@@ -98,3 +102,16 @@ func (s *CreateOrUpdateEnvironmentTestSuite) TestReturnsNoContentIfNotNewEnviron
 	recorder := s.recordRequest()
 	s.Equal(http.StatusNoContent, recorder.Code)
 }
+
+func (s *CreateOrUpdateEnvironmentTestSuite) TestReturnsNotFoundOnNonIntegerID() {
+	s.path = strings.Join([]string{BasePath, EnvironmentsPath, "/", "invalid-id"}, "")
+	recorder := s.recordRequest()
+	s.Equal(http.StatusNotFound, recorder.Code)
+}
+
+func (s *CreateOrUpdateEnvironmentTestSuite) TestFailsOnTooLargeID() {
+	tooLargeIntStr := strconv.Itoa(math.MaxInt64) + "0"
+	s.path = strings.Join([]string{BasePath, EnvironmentsPath, "/", tooLargeIntStr}, "")
+	recorder := s.recordRequest()
+	s.Equal(http.StatusBadRequest, recorder.Code)
+}

api/runners_test.go

@@ -29,7 +29,7 @@ type MiddlewareTestSuite struct {
 
 func (s *MiddlewareTestSuite) SetupTest() {
 	s.manager = &runner.ManagerMock{}
-	s.runner = runner.NewNomadJob("runner", nil)
+	s.runner = runner.NewNomadJob(tests.DefaultRunnerID, nil)
 	s.capturedRunner = nil
 	s.runnerRequest = func(runnerId string) *http.Request {
 		path, err := s.router.Get("test-runner-id").URL(RunnerIdKey, runnerId)