Merge pull request #21 from mercedes-benz/tagOnUpload

tag spdx on upload

cmd/onDemandCheckSBOM.go

@@ -24,7 +24,7 @@ var onDemandCheckSBOM = &cobra.Command{
 			fmt.Println("Missing filename of SBOM upload")
 			os.Exit(1)
 		}
-		msg := helper.DiscoApiMultipartPost(helper.GetProjectAPIURL("/sbomcheck"), fileName)
+		msg := helper.SbomUploadFormData(helper.GetProjectAPIURL("/sbomcheck"), fileName, "")
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }

cmd/sbomUpload.go

@@ -14,23 +14,27 @@ import (
 )
 
 var sbomUploadCmd = &cobra.Command{
-	Use:   "sbomUpload [FileName]",
+	Use:   "sbomUpload [FileName] [Tag]",
 	Short: "Uploads SBOM file to a project version",
 	Long:  `Uploads SBOM file to a project version`,
 	Run: func(cmd *cobra.Command, args []string) {
 		projectVersion := conf.Config.ProjectVersion
 		fileName := ""
+		tag := ""
 		if len(projectVersion) <= 0 {
 			fmt.Println("Missing project version")
 			os.Exit(1)
 		}
 		if len(args) > 0 {
 			fileName = args[0]
+			if len(args) > 1 {
+				tag = args[1]
+			}
 		} else {
 			fmt.Println("Missing filename of SBOM upload")
 			os.Exit(1)
 		}
-		msg := helper.DiscoApiMultipartPost(helper.GetProjectVersionAPIURL(projectVersion, "sboms"), fileName)
+		msg := helper.SbomUploadFormData(helper.GetProjectVersionAPIURL(projectVersion, "sboms"), fileName, tag)
 		helper.WriteMessageToOut(cmd, ""+helper.PrettyJSONString(msg))
 	},
 }

pkg/helper/apiRequests.go

@@ -17,14 +17,20 @@ import (
 	"github.com/mercedes-benz/disclosure-cli/conf"
 )
 
-func DiscoApiMultipartPost(url string, completeFilename string) string {
+func SbomUploadFormData(url string, completeFilename string, tag string) string {
 	client := &http.Client{}
 	r, w := io.Pipe()
 	m := multipart.NewWriter(w)
 	go func() {
 		defer w.Close()
 		defer m.Close()
-
+		if len(tag) > 0 {
+			err := m.WriteField("sbomTag", tag)
+			if err != nil {
+				fmt.Println("Error adding tag field " + err.Error())
+				os.Exit(1)
+			}
+		}
 		_, fileName := path.Split(completeFilename)
 		part, err := m.CreateFormFile("file", fileName)
 		if err != nil {