Fixed namespace folder creation, and added fileutils

Author: VikingPingvin

locker/agent.go

@@ -76,6 +76,7 @@ func parseAndSendMetaData(connection net.Conn, inputData *InputData) (fileInfo o
 
 	log.Info().
 		Str("file name", fileInfo.Name()).
+		Str("Namespace", fmt.Sprintf("%s/%s/%s", inputData.NameSpace, inputData.Project, inputData.JobID)).
 		Str("size", fmt.Sprintf("%d", fileInfo.Size())).
 		Str("hash", fmt.Sprintf("%v", inputData.FileHash)).
 		Str("id", inputData.ID.String()).

locker/fileutils/fileutils.go

@@ -0,0 +1,30 @@
+package fileutils
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/rs/zerolog/log"
+)
+
+func EnsurePathExists(elements ...string) error {
+	fullPath := filepath.Join(elements...)
+
+	err := os.MkdirAll(fullPath, os.ModeDir)
+	if err != nil {
+		log.Err(err).Msg("Cannot create folder structure")
+	}
+	return err
+}
+
+func CreateFileAt() {
+
+}
+
+func MoveFile(oldPath string, newPath string) error {
+	err := os.Rename(oldPath, newPath)
+	if err != nil {
+		log.Err(err).Msg("File move failed!")
+	}
+	return err
+}

locker/fileutils/fileutils_test.go

@@ -0,0 +1,3 @@
+package fileutils
+
+// Test EnsurePathexists with 0, 1 and more []string

locker/server.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"path/filepath"
 	"time"
+	"vikingPingvin/locker/locker/fileutils"
 	"vikingPingvin/locker/locker/messaging"
 	"vikingPingvin/locker/locker/messaging/protobuf"
 
@@ -27,9 +28,12 @@ type connectionType struct {
 
 // Struct containing file data from received MetaData message
 type metaInfo struct {
-	fileHash []byte
-	fileName string
-	ID       []byte
+	fileHash  []byte
+	fileName  string
+	namespace string
+	project   string
+	jobID     string
+	ID        []byte
 }
 
 type Server interface {
@@ -74,7 +78,7 @@ func handleConnection(connection net.Conn) {
 	artifactReceived := false
 	var artifactPath *os.File
 
-	metaData := metaInfo{}
+	metaData := &metaInfo{}
 
 	timeoutDuration := 5 * time.Second
 	invalidCounterMax := 10
@@ -153,18 +157,33 @@ func handleConnection(connection net.Conn) {
 	if receptionSuccesful {
 		//Rename file
 		baseDir := filepath.Dir(artifactPath.Name())
-		newPath := filepath.Join(baseDir, metaData.fileName)
-		os.Rename(artifactPath.Name(), newPath)
+		newPath := filepath.Join(baseDir,
+			metaData.namespace,
+			metaData.project,
+			metaData.jobID,
+			metaData.fileName)
+		err := fileutils.EnsurePathExists(filepath.Dir(newPath))
+		if err == nil {
+			err = fileutils.MoveFile(artifactPath.Name(), newPath)
+			if err != nil {
+				log.Err(err).Msg("SAD")
+			}
+		}
 		log.Info().Msgf("Artifact ready: %s", newPath)
 	}
-	sendAckMessage(connection, &metaData, receptionSuccesful)
+	sendAckMessage(connection, metaData, receptionSuccesful)
 }
 
-func handleProtoMeta(metaMessage *protobuf.FileMeta) (file *os.File, metaData metaInfo) {
+func handleProtoMeta(metaMessage *protobuf.FileMeta) (file *os.File, _ *metaInfo) {
+
+	metaData := &metaInfo{}
 
 	xidValue, _ := xid.FromBytes(metaMessage.GetId())
 	metaData.fileHash = metaMessage.GetHash()
 	metaData.fileName = metaMessage.GetFilename()
+	metaData.namespace = metaMessage.GetNamespace()
+	metaData.project = metaMessage.GetProject()
+	metaData.jobID = metaMessage.GetJobID()
 	metaData.ID = metaMessage.GetId()
 
 	log.Info().