Added --namespace flag with input handling to agent and server

Author: VikingPingvin

cmd/agent.go

@@ -43,5 +43,7 @@ func init() {
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
 	// agentCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-	agentCmd.Flags().StringVar(&locker.InputArg, "file", "", "Specify path for input artifact file")
+	agentCmd.Flags().StringVar(&locker.InputArgPath, "file", "", "Specify path for input artifact file")
+
+	agentCmd.Flags().StringVar(&locker.InputArgNamespace, "namespace", "", "Specify namespace in the following format: namespace/project/job-id")
 }

go.mod

@@ -3,11 +3,12 @@ module vikingPingvin/locker
 go 1.15
 
 require (
-	github.com/golang/protobuf v1.4.1
+	github.com/golang/protobuf v1.4.3
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rs/xid v1.2.1
 	github.com/rs/zerolog v1.20.0
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.1
+	golang.org/x/tools/gopls v0.5.4 // indirect
 	google.golang.org/protobuf v1.25.0
 )

go.sum

@@ -10,6 +10,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"vikingPingvin/locker/locker/messaging"
 	"vikingPingvin/locker/locker/messaging/protobuf"
@@ -19,13 +20,17 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-// FileInput String Flag for Cobra CMD input
-var InputArg string
+// InputArgPath Relative or absolute path of files for Cobra CLI
+var InputArgPath string
+var InputArgNamespace string
 
 // InputData Populated at the start of the program
 type InputData struct {
-	FileInput string
+	FilePath  string
 	FileName  string
+	NameSpace string
+	Project   string
+	JobID     string
 	FileHash  []byte
 	ID        xid.ID
 }
@@ -61,12 +66,12 @@ func (a ArtifactAgent) Start(inputData *InputData) bool {
 
 // If --file cli input is not null, parse file
 func parseAndSendMetaData(connection net.Conn, inputData *InputData) (fileInfo os.FileInfo, err error) {
-	fileInfo, err = os.Stat(inputData.FileInput)
+	fileInfo, err = os.Stat(inputData.FilePath)
 	if os.IsNotExist(err) {
 		log.Error().Msgf("Parsing file Input error: %v", err)
 		return fileInfo, err
 	}
-	inputData.FileHash = hashFile(inputData.FileInput)
+	inputData.FileHash = hashFile(inputData.FilePath)
 	inputData.FileName = fileInfo.Name()
 
 	log.Info().
@@ -79,8 +84,9 @@ func parseAndSendMetaData(connection net.Conn, inputData *InputData) (fileInfo o
 	message, err := messaging.CreateMessage_FileMeta(
 		inputData.ID.Bytes(),
 		protobuf.MessageType_META,
-		"test_namespace",
-		"test_project",
+		inputData.NameSpace,
+		inputData.Project,
+		inputData.JobID,
 		inputData.FileName,
 		inputData.FileHash)
 	if err != nil {
@@ -97,10 +103,10 @@ func parseAndSendMetaData(connection net.Conn, inputData *InputData) (fileInfo o
 //func parseAndSendPayload(bytes *[]byte, numBytes int) {
 func parseAndSendPayload(connection net.Conn, inputData *InputData) {
 
-	f, err := os.Open(inputData.FileInput)
+	f, err := os.Open(inputData.FilePath)
 	defer f.Close()
 	if err != nil {
-		log.Error().Msgf("Cannot open file %s", inputData.FileInput)
+		log.Error().Msgf("Cannot open file %s", inputData.FilePath)
 	}
 
 	log.Info().Msg("Started sending Payload Packets...")
@@ -195,27 +201,43 @@ func parseInputArguments() *InputData {
 	var err error
 	var inputPath string
 
-	if len(InputArg) == 0 {
+	if len(InputArgPath) == 0 {
 		err = errors.New("--file empty")
 		log.Err(err).Str("agent", "parseInputArguments").Msgf("No input file was given.")
 	}
+	if len(InputArgNamespace) == 0 {
+		err = errors.New("--namespace empty")
+		log.Err(err).Str("agent", "parseInputArguments").Msgf("No input namespace was given.")
+	}
 	if err != nil {
 		os.Exit(1)
 	}
 
-	inputPath = InputArg
-	if !filepath.IsAbs(InputArg) {
+	inputPath = InputArgPath
+	if !filepath.IsAbs(InputArgPath) {
 		cwd, err := os.Getwd()
 		if err != nil {
 			log.Err(err).Msg("Error during CWD PATH parsing")
 			os.Exit(1)
 		}
-		log.Debug().Msgf("Relative path of input: %s", InputArg)
-		inputPath = filepath.Join(cwd, InputArg)
+		log.Debug().Msgf("Relative path of input: %s", InputArgPath)
+		inputPath = filepath.Join(cwd, InputArgPath)
 
 	}
+
+	fullNameSpace := InputArgNamespace
+	namePaths := strings.Split(fullNameSpace, "/")
+	if len(namePaths) != 3 {
+		err = errors.New("Namespace must contain 3 values separated by '/'")
+		log.Err(err).Msg("Namespace values not valid")
+		os.Exit(1)
+	}
+
 	data := &InputData{
-		FileInput: inputPath,
+		FilePath:  inputPath,
+		NameSpace: namePaths[0],
+		Project:   namePaths[1],
+		JobID:     namePaths[2],
 		ID:        xid.New(),
 	}
 	return data

locker/agent.go

@@ -30,7 +30,7 @@ func CreateMessage_ServerACk(id []byte, messageType pb.MessageType, isSuccess bo
 //  msgType
 //  fileName
 //  fileHash
-func CreateMessage_FileMeta(id []byte, msgType pb.MessageType, namesSpace string, projectName string, fileName string, fileHash []byte) (protoMessage *pb.LockerMessage, err error) {
+func CreateMessage_FileMeta(id []byte, msgType pb.MessageType, namesSpace string, projectName string, jobID string, fileName string, fileHash []byte) (protoMessage *pb.LockerMessage, err error) {
 
 	protoMessage = &pb.LockerMessage{
 		Message: &pb.LockerMessage_Meta{
@@ -39,6 +39,7 @@ func CreateMessage_FileMeta(id []byte, msgType pb.MessageType, namesSpace string
 				MsgType:   msgType,
 				Namespace: namesSpace,
 				Project:   projectName,
+				JobID:     jobID,
 				Filename:  fileName,
 				Hash:      fileHash,
 			},

locker/messaging/message_handler.go

@@ -13,8 +13,9 @@ message FileMeta{
     MessageType msgType = 2; 
     string namespace = 3;
     string project = 4;  
-    string filename = 5;
-    bytes hash = 6;
+    string jobID = 5;
+    string filename = 6;
+    bytes hash = 7;
 }
 
 message FilePackage{

locker/messaging/protobuf/messageSchema.pb.go

@@ -76,7 +76,6 @@ func handleConnection(connection net.Conn) {
 
 	metaData := metaInfo{}
 
-	//var hashInfoFromMeta []byte
 	timeoutDuration := 5 * time.Second
 	invalidCounterMax := 10
 	invalidCounter := 0
@@ -172,6 +171,7 @@ func handleProtoMeta(metaMessage *protobuf.FileMeta) (file *os.File, metaData me
 		Str("Artifact Name", metaMessage.GetFilename()).
 		Str("NameSpace", metaMessage.GetNamespace()).
 		Str("Project", metaMessage.GetProject()).
+		Str("Job-ID", metaMessage.GetJobID()).
 		Str("hash", fmt.Sprintf("%v", metaMessage.GetHash())).
 		Str("id", xidValue.String()).
 		Msg("Artifact Meta info Recieved")