Fix recent lint offenses

.golangci.yaml

@@ -19,9 +19,7 @@ linters:
     - varnamelen
     - wsl
     # Deprecated
-    - execinquery
     - exportloopref
-    - gomnd
 
 linters-settings:
   cyclop:

cmd/poseidon/main.go

@@ -141,7 +141,7 @@ func watchMemoryAndAlert(options config.Profiling) {
 		log.WithField("interval", options.MemoryInterval).Error("Configured memory interval too big")
 		return
 	}
-	intervalDuration := time.Duration(options.MemoryInterval) * time.Millisecond //nolint:gosec // We check for an integer overflow right above.
+	intervalDuration := time.Duration(options.MemoryInterval) * time.Millisecond
 
 	var exceeded bool
 	for {

internal/api/websocket_test.go

@@ -487,13 +487,21 @@ func mockAPIExecute(api *nomad.ExecutorAPIMock, request *dto.ExecutionRequest,
 		mock.Anything,
 		mock.Anything)
 	call.Run(func(args mock.Arguments) {
-		exit, err := run(args.Get(0).(context.Context),
-			args.Get(1).(string),
-			args.Get(2).(string),
-			args.Get(3).(bool),
-			args.Get(5).(io.Reader),
-			args.Get(6).(io.Writer),
-			args.Get(7).(io.Writer))
-		call.ReturnArguments = mock.Arguments{exit, err}
+		mockCtx, errCtx := args.Get(0).(context.Context)
+		mockRunnerID, errRunnerID := args.Get(1).(string)
+		mockCommand, errCommand := args.Get(2).(string)
+		mockTty, errTty := args.Get(3).(bool)
+		mockStdin, errStdin := args.Get(5).(io.Reader)
+		mockStdout, errStdout := args.Get(6).(io.Writer)
+		mockStderr, errStderr := args.Get(7).(io.Writer)
+
+		if !errCtx || !errRunnerID || !errCommand || !errTty || !errStdin || !errStdout || !errStderr {
+			call.ReturnArguments = mock.Arguments{1, fmt.Errorf(
+				"%w: errCtx=%v, errRunnerId=%v, errCommand=%v, errTty=%v, errStdin=%v, errStdout=%v, errStderr=%v",
+				tests.ErrDefault, errCtx, errRunnerID, errCommand, errTty, errStdin, errStdout, errStderr)}
+		} else {
+			exit, err := run(mockCtx, mockRunnerID, mockCommand, mockTty, mockStdin, mockStdout, mockStderr)
+			call.ReturnArguments = mock.Arguments{exit, err}
+		}
 	})
 }

internal/api/ws/codeocean_writer_test.go

@@ -51,27 +51,27 @@ func (s *MainTestSuite) TestRawToCodeOceanWriter() {
 type sendExitInfoTestCase struct {
 	name    string
 	info    *runner.ExitInfo
-	message dto.WebSocketMessage
+	message *dto.WebSocketMessage
 }
 
 func (s *MainTestSuite) TestCodeOceanOutputWriter_SendExitInfo() {
 	testCases := []sendExitInfoTestCase{
 		{
 			"Timeout", &runner.ExitInfo{Err: runner.ErrRunnerInactivityTimeout},
-			dto.WebSocketMessage{Type: dto.WebSocketMetaTimeout},
+			&dto.WebSocketMessage{Type: dto.WebSocketMetaTimeout},
 		},
 		{
 			"Error", &runner.ExitInfo{Err: websocket.ErrCloseSent},
-			dto.WebSocketMessage{Type: dto.WebSocketOutputError, Data: "Error executing the request"},
+			&dto.WebSocketMessage{Type: dto.WebSocketOutputError, Data: "Error executing the request"},
 		},
 		// CodeOcean expects this exact string in case of a OOM Killed runner.
 		{
 			"Specific data for OOM Killed runner", &runner.ExitInfo{Err: runner.ErrOOMKilled},
-			dto.WebSocketMessage{Type: dto.WebSocketOutputError, Data: "the allocation was OOM Killed"},
+			&dto.WebSocketMessage{Type: dto.WebSocketOutputError, Data: "the allocation was OOM Killed"},
 		},
 		{
 			"Exit", &runner.ExitInfo{Code: 21},
-			dto.WebSocketMessage{Type: dto.WebSocketExit, ExitCode: 21},
+			&dto.WebSocketMessage{Type: dto.WebSocketExit, ExitCode: 21},
 		},
 	}
 

internal/runner/nomad_runner.go

@@ -114,7 +114,7 @@ func (r *NomadJob) MappedPorts() []*dto.MappedPort {
 			log.WithError(util.ErrOverflow).WithField("mapping", portMapping.To).Warn("not a valid port")
 		}
 		ports = append(ports, &dto.MappedPort{
-			ExposedPort: uint(portMapping.To), //nolint:gosec // We check for an overflow right above.
+			ExposedPort: uint(portMapping.To),
 			HostAddress: fmt.Sprintf("%s:%d", portMapping.HostIP, portMapping.Value),
 		})
 	}
@@ -140,7 +140,7 @@ func (r *NomadJob) UpdateMappedPorts(ports []*dto.MappedPort) error {
 
 		mapping = append(mapping, nomadApi.PortMapping{
 			Value:  port,
-			To:     int(portMapping.ExposedPort), //nolint:gosec // We check for an integer overflow right above.
+			To:     int(portMapping.ExposedPort),
 			HostIP: hostAddress[0],
 		})
 	}

internal/runner/nomad_runner_test.go

@@ -66,7 +66,7 @@ func (s *MainTestSuite) TestMarshalRunner() {
 	runner := NewNomadJob(s.TestCtx, tests.DefaultRunnerID, nil, apiMock, func(_ Runner) error { return nil })
 	marshal, err := json.Marshal(runner)
 	s.Require().NoError(err)
-	s.Equal("{\"runnerId\":\""+tests.DefaultRunnerID+"\"}", string(marshal))
+	s.JSONEq(`{"runnerId":"`+tests.DefaultRunnerID+`"}`, string(marshal))
 	s.Require().NoError(runner.Destroy(nil))
 }
 

pkg/dto/dto.go

@@ -244,7 +244,7 @@ type WebSocketMessage struct {
 
 // MarshalJSON implements the json.Marshaler interface.
 // This converts the WebSocketMessage into the expected schema (see docs/websocket.schema.json).
-func (m WebSocketMessage) MarshalJSON() (res []byte, err error) {
+func (m *WebSocketMessage) MarshalJSON() (res []byte, err error) {
 	switch m.Type {
 	case WebSocketOutputStdout, WebSocketOutputStderr, WebSocketOutputError:
 		res, err = json.Marshal(struct {

pkg/nullio/ls2json_test.go

@@ -35,10 +35,10 @@ func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteCreationAndClose() {
 	s.Zero(count)
 	s.Require().NoError(err)
 
-	s.Equal("{\"files\": [", s.buf.String())
+	s.Equal("{\"files\": [", s.buf.String()) //nolint:testifylint // The expected string is not a valid JSON
 
 	s.writer.Close()
-	s.Equal("{\"files\": []}", s.buf.String())
+	s.JSONEq(`{"files": []}`, s.buf.String())
 }
 
 func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteFile() {
@@ -48,8 +48,8 @@ func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteFile() {
 	s.Require().NoError(err)
 	s.writer.Close()
 
-	s.Equal("{\"files\": [{\"name\":\"flag\",\"entryType\":\"-\",\"size\":0,\"modificationTime\":1660763446"+
-		",\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"}]}",
+	s.JSONEq(`{"files": [{"name":"flag","entryType":"-","size":0,"modificationTime":1660763446`+
+		`,"permissions":"rw-rw-r--","owner":"kali","group":"kali"}]}`,
 		s.buf.String())
 }
 
@@ -62,40 +62,40 @@ func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteRecursive() {
 	s.Require().NoError(err)
 	s.writer.Close()
 
-	s.Equal("{\"files\": ["+
-		"{\"name\":\"./dir\",\"entryType\":\"d\",\"size\":4096,\"modificationTime\":1660764411,"+
-		"\"permissions\":\"rwxrwxr-x\",\"owner\":\"kali\",\"group\":\"kali\"},"+
-		"{\"name\":\"./flag\",\"entryType\":\"-\",\"size\":0,\"modificationTime\":1660763446,"+
-		"\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"},"+
-		"{\"name\":\"./dir/another.txt\",\"entryType\":\"-\",\"size\":3,\"modificationTime\":1660764366,"+
-		"\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"}"+
-		"]}",
+	s.JSONEq(`{"files": [`+
+		`{"name":"./dir","entryType":"d","size":4096,"modificationTime":1660764411,`+
+		`"permissions":"rwxrwxr-x","owner":"kali","group":"kali"},`+
+		`{"name":"./flag","entryType":"-","size":0,"modificationTime":1660763446,`+
+		`"permissions":"rw-rw-r--","owner":"kali","group":"kali"},`+
+		`{"name":"./dir/another.txt","entryType":"-","size":3,"modificationTime":1660764366,`+
+		`"permissions":"rw-rw-r--","owner":"kali","group":"kali"}`+
+		`]}`,
 		s.buf.String())
 }
 
 func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteRemaining() {
 	input1 := "total 4\n" + perm664 + "1 " + ownerGroupKali + "3 1660764366 an.txt\n" + perm664 + "1 kal"
 	_, err := s.writer.Write([]byte(input1))
 	s.Require().NoError(err)
-	s.Equal("{\"files\": [{\"name\":\"an.txt\",\"entryType\":\"-\",\"size\":3,\"modificationTime\":1660764366,"+
-		"\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"}", s.buf.String())
+	s.JSONEq(`{"files": [{"name":"an.txt","entryType":"-","size":3,"modificationTime":1660764366,`+
+		`"permissions":"rw-rw-r--","owner":"kali","group":"kali"}`, s.buf.String())
 
 	input2 := "i kali 0 1660763446 flag\n"
 	_, err = s.writer.Write([]byte(input2))
 	s.Require().NoError(err)
 	s.writer.Close()
-	s.Equal("{\"files\": [{\"name\":\"an.txt\",\"entryType\":\"-\",\"size\":3,\"modificationTime\":1660764366,"+
-		"\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"},"+
-		"{\"name\":\"flag\",\"entryType\":\"-\",\"size\":0,\"modificationTime\":1660763446,"+
-		"\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"}]}", s.buf.String())
+	s.JSONEq(`{"files": [{"name":"an.txt","entryType":"-","size":3,"modificationTime":1660764366,`+
+		`"permissions":"rw-rw-r--","owner":"kali","group":"kali"},`+
+		`{"name":"flag","entryType":"-","size":0,"modificationTime":1660763446,`+
+		`"permissions":"rw-rw-r--","owner":"kali","group":"kali"}]}`, s.buf.String())
 }
 
 func (s *Ls2JsonTestSuite) TestLs2JsonWriter_WriteLink() {
 	input1 := "total 4\nlrw-rw-r-- 1 " + ownerGroupKali + "3 1660764366 another.txt -> /bin/bash\n"
 	_, err := s.writer.Write([]byte(input1))
 	s.Require().NoError(err)
 	s.writer.Close()
-	s.Equal("{\"files\": [{\"name\":\"another.txt\",\"entryType\":\"l\",\"linkTarget\":\"/bin/bash\",\"size\":3,"+
-		"\"modificationTime\":1660764366,\"permissions\":\"rw-rw-r--\",\"owner\":\"kali\",\"group\":\"kali\"}]}",
+	s.JSONEq(`{"files": [{"name":"another.txt","entryType":"l","linkTarget":"/bin/bash","size":3,`+
+		`"modificationTime":1660764366,"permissions":"rw-rw-r--","owner":"kali","group":"kali"}]}`,
 		s.buf.String())
 }