Merge remote-tracking branch 'origin/main' into dev/storage

Author: Artem Titov

common/connectors/storageconn/connector.go

@@ -27,6 +27,7 @@ func (s *Connector) Download(request *Request) *FileResponse {
 	response := NewFileResponse(*request)
 	if request.StorageFilename == "" {
 		response.Error = fmt.Errorf("storage filename not specified")
+		return response
 	}
 
 	if err := os.MkdirAll(request.BaseFolder, 0775); err != nil {
@@ -99,10 +100,6 @@ func (s *Connector) Download(request *Request) *FileResponse {
 
 func (s *Connector) Upload(request *Request) *Response {
 	response := &Response{R: *request}
-	if request.StorageFilename == "" {
-		response.Error = fmt.Errorf("storage filename not specified")
-		return response
-	}
 
 	if request.File == nil {
 		response.Error = fmt.Errorf("file for upload is not specified")
@@ -121,6 +118,8 @@ func (s *Connector) Upload(request *Request) *Response {
 	r.SetFormData(map[string]string{
 		"request": string(requestJSON),
 	})
+
+	// request.StorageFilename can be empty
 	r.SetFileReader("file", request.StorageFilename, request.File)
 
 	resp, err := r.Post(path)
@@ -153,7 +152,7 @@ func (s *Connector) Delete(request *Request) *Response {
 		return response
 	}
 
-	r.SetQueryParams(map[string]string{
+	r.SetFormData(map[string]string{
 		"request": string(requestJSON),
 	})
 

common/connectors/storageconn/structs.go

@@ -34,7 +34,7 @@ type Request struct {
 	// For uploads, File should be specified
 	File io.Reader `json:"-"`
 
-	// StorageFilename should be always specified
+	// If StorageFilename is not specified, Storage tries to get the filename automatically
 	StorageFilename string `json:"storageFilename"`
 }
 

common/constants/resource/resource_type.go

@@ -17,6 +17,7 @@ const (
 	CheckerOutput
 	Interactor
 	// Will be increased
+	// Don't forget to add a new type to storage/helpers.go
 )
 
 type DataType int

main.go

@@ -34,7 +34,7 @@ func main() {
 	if ts.Config.Storage != nil {
 		err := storage.SetupStorage(ts)
 		if err != nil {
-			logger.Panic(err.Error())
+			logger.Panic("Can not setup storage, error: %v", err.Error())
 		}
 	} else {
 		logger.Info("storage is not configured, skipping storage component")

storage/filesystem/filesystem.go

@@ -22,8 +22,7 @@ func NewFilesystem(storageConfig *config.StorageConfig) IFilesystem {
 }
 
 func (filesystem *Filesystem) generatePathFromID(prefix string, id string) string {
-	var parts []string
-	parts = append(parts, prefix)
+	parts := []string{prefix}
 	for i := 0; i < len(id); i += int(filesystem.BlockSize) {
 		end := min(i+int(filesystem.BlockSize), len(id))
 		parts = append(parts, id[i:end])

storage/helpers.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strconv"
 	"testing_system/common/connectors/storageconn"
 	"testing_system/common/constants/resource"
 
@@ -49,12 +48,12 @@ func parseRequest(c *gin.Context) (*storageconn.Request, error) {
 	var requestJSON string
 
 	switch c.Request.Method {
-	case http.MethodGet, http.MethodDelete:
+	case http.MethodGet:
 		requestJSON = c.Query("request")
 		if requestJSON == "" {
 			return nil, errors.New("missing request parameter in query")
 		}
-	case http.MethodPost, http.MethodPut:
+	case http.MethodPost, http.MethodPut, http.MethodDelete:
 		requestJSON = c.PostForm("request")
 		if requestJSON == "" {
 			return nil, errors.New("missing request parameter in form data")
@@ -105,16 +104,52 @@ func getDataId(dataType resource.DataType, request *storageconn.Request) (uint64
 }
 
 func getFilepath(request *storageconn.Request) (string, error) {
-	if request.StorageFilename == "" {
-		return "", errors.New("StorageFilename is not specified")
-	}
 	switch request.Resource {
-	case resource.TestInput, resource.TestOutput, resource.TestAnswer, resource.TestStderr:
+	case resource.SourceCode:
+		if request.StorageFilename == "" {
+			return "", errors.New("StorageFilename should be specified for SourceCode")
+		}
+		return fmt.Sprintf("source/%s", request.StorageFilename), nil
+	case resource.CompiledBinary:
+		return "solution", nil
+	case resource.CompileOutput:
+		return "compile.out", nil
+	case resource.TestInput:
+		if request.TestID == 0 {
+			return "", errors.New("TestID is not specified for TestInput")
+		}
+		return fmt.Sprintf("%02d", request.TestID), nil
+	case resource.TestAnswer:
+		if request.TestID == 0 {
+			return "", errors.New("TestID is not specified for TestAnswer")
+		}
+		return fmt.Sprintf("%02d.a", request.TestID), nil
+	case resource.TestOutput:
 		if request.TestID == 0 {
-			return "", errors.New("TestID is not specified for test resource")
+			return "", errors.New("TestID is not specified for TestOutput")
+		}
+		return fmt.Sprintf("%02d.out", request.TestID), nil
+	case resource.TestStderr:
+		if request.TestID == 0 {
+			return "", errors.New("TestID is not specified for TestOTestStderrutput")
+		}
+		return fmt.Sprintf("%02d.err", request.TestID), nil
+	case resource.CheckerOutput:
+		if request.TestID == 0 {
+			return "", errors.New("TestID is not specified for CheckerOutput")
+		}
+		return fmt.Sprintf("%02d.check", request.TestID), nil
+	case resource.Checker:
+		if request.StorageFilename == "" {
+			return "checkers/checker", nil
+		}
+		return fmt.Sprintf("checkers/%s", request.StorageFilename), nil
+	case resource.Interactor:
+		if request.StorageFilename == "" {
+			return "interactors/interactor", nil
 		}
-		return fmt.Sprintf("tests/%s/%s", strconv.FormatUint(request.TestID, 10), request.StorageFilename), nil
+		return fmt.Sprintf("interactors/%s", request.StorageFilename), nil
 	default:
-		return fmt.Sprintf("%s", request.StorageFilename), nil
+		return "", errors.New("Unknown resource type")
 	}
 }

storage/storage.go

@@ -26,7 +26,7 @@ func SetupStorage(ts *common.TestingSystem) error {
 	r.DELETE("/remove", storage.HandleRemove)
 	r.GET("/get", storage.HandleGet)
 
-	logger.Info("Configured invoker")
+	logger.Info("Configured storage")
 	return nil
 }