use shared functionality for file mock

Author: bakito

pkg/http/mock.go

@@ -2,7 +2,7 @@ package http
 
 import (
 	"fmt"
-	"net/http/httputil"
+	"mime/multipart"
 
 	"github.com/bakito/batch-job-controller/pkg/config"
 	"github.com/bakito/batch-job-controller/pkg/metrics"
@@ -47,42 +47,28 @@ type mockServer struct {
 }
 
 func (s *mockServer) postResult(ctx *gin.Context) {
-	processPostResult(
-		ctx,
-		s.Server,
-		func(
-			ctx *gin.Context,
-			postLog logr.Logger,
-			results *metrics.Results,
-			node string,
-			executionID string,
-			body []byte,
+	processPostResult(ctx, s.Server,
+		func(ctx *gin.Context, postLog logr.Logger, results *metrics.Results, node string, executionID string, body []byte,
 		) error {
 			return nil
 		},
 	)
 }
 
 func (s *mockServer) postFile(ctx *gin.Context) {
-	node, executionID := nodeAndID(ctx)
-	postLog := s.Log.WithValues(
-		"node", node,
-		"id", executionID,
+	processPostedFiles(ctx, s.Server,
+		func(ctx *gin.Context, postLog logr.Logger, executionID string, node string, file *multipart.FileHeader) error {
+			return nil
+		},
+		func(ctx *gin.Context, postLog logr.Logger, executionID string, node string, fileName string, body []byte) error {
+			return nil
+		},
 	)
-	postLog.Info("Got file(s)")
-	b, _ := httputil.DumpRequest(ctx.Request, true)
-	println(string(b))
 }
 
 func (s *mockServer) postEvent(ctx *gin.Context) {
-	processPostedEvent(
-		ctx,
-		s.Server,
-		func(ctx *gin.Context,
-			postLog logr.Logger,
-			podName string,
-			event *Event,
-		) error {
+	processPostedEvent(ctx, s.Server,
+		func(ctx *gin.Context, postLog logr.Logger, podName string, event *Event) error {
 			return nil
 		},
 	)

pkg/http/postserver-file.go

@@ -3,15 +3,57 @@ package http
 import (
 	"fmt"
 	"mime"
+	"mime/multipart"
 	"net/http"
 	"path/filepath"
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-logr/logr"
 	"github.com/google/uuid"
 )
 
 func (s *PostServer) postFile(ctx *gin.Context) {
+	processPostedFiles(ctx, s.Server, s.saveFormFilesCallback, s.saveBodyFileCallback)
+}
+
+func (s *PostServer) saveFormFilesCallback(ctx *gin.Context, postLog logr.Logger, executionID string, node string, file *multipart.FileHeader) error {
+	if err := s.mkdir(executionID); err != nil {
+		ctx.String(http.StatusInternalServerError, err.Error())
+		postLog.Error(err, "error creating upload directory")
+		return err
+	}
+
+	err := ctx.SaveUploadedFile(file, filepath.Join(s.ReportPath, executionID, fmt.Sprintf("%s-%s", node, file.Filename)))
+	if err != nil {
+		ctx.String(http.StatusInternalServerError, err.Error())
+		postLog.Error(err, "error saving file")
+		return err
+	}
+	return nil
+}
+
+func (s *PostServer) saveBodyFileCallback(ctx *gin.Context, postLog logr.Logger, executionID string, node string, fileName string, body []byte) error {
+	fileName, err := s.SaveFile(executionID, fmt.Sprintf("%s-%s", node, fileName), body)
+	postLog = postLog.WithValues(
+		"name", filepath.Base(fileName),
+		"path", fileName,
+		"length", len(body),
+	)
+	if err != nil {
+		ctx.String(http.StatusInternalServerError, err.Error())
+		postLog.Error(err, "error receiving file")
+		return err
+	}
+	return nil
+}
+
+type (
+	saveFormFiles func(ctx *gin.Context, postLog logr.Logger, executionID string, node string, file *multipart.FileHeader) error
+	saveBodyFile  func(ctx *gin.Context, postLog logr.Logger, executionID string, node string, fileName string, body []byte) error
+)
+
+func processPostedFiles(ctx *gin.Context, s *Server, ffCallback saveFormFiles, bfCallback saveBodyFile) {
 	node, executionID := nodeAndID(ctx)
 	postLog := s.Log.WithValues(
 		"node", node,
@@ -24,19 +66,10 @@ func (s *PostServer) postFile(ctx *gin.Context) {
 		for _, files := range form.File {
 			for _, file := range files {
 
-				// Upload the file to specific dst.
-				if err := s.mkdir(executionID); err != nil {
-					ctx.String(http.StatusInternalServerError, err.Error())
-					postLog.Error(err, "error creating upload directory")
+				if ffCallback(ctx, postLog, executionID, node, file) != nil {
 					return
 				}
 
-				err := ctx.SaveUploadedFile(file, filepath.Join(s.ReportPath, executionID, fmt.Sprintf("%s-%s", node, file.Filename)))
-				if err != nil {
-					ctx.String(http.StatusInternalServerError, err.Error())
-					postLog.Error(err, "error saving file")
-					return
-				}
 				names = append(names, file.Filename)
 			}
 		}
@@ -59,25 +92,18 @@ func (s *PostServer) postFile(ctx *gin.Context) {
 		if fileName == "" {
 			fileName = uuid.New().String()
 
-			fileName += s.evaluateExtension(ctx.Request)
+			fileName += evaluateExtension(ctx.Request)
 		}
 
-		fileName, err = s.SaveFile(executionID, fmt.Sprintf("%s-%s", node, fileName), body)
-		postLog = postLog.WithValues(
-			"name", filepath.Base(fileName),
-			"path", fileName,
-			"length", len(body),
-		)
-		if err != nil {
-			ctx.String(http.StatusInternalServerError, err.Error())
-			postLog.Error(err, "error receiving file")
+		if bfCallback(ctx, postLog, executionID, node, fileName, body) != nil {
 			return
 		}
+
 		postLog.Info("received 1 file")
 	}
 }
 
-func (s *PostServer) evaluateExtension(r *http.Request) string {
+func evaluateExtension(r *http.Request) string {
 	ct := r.Header.Get("Content-Type")
 
 	mt, _, _ := mime.ParseMediaType(ct)