Improve error output when failing initial scan upload

debricked · Oct 5, 2023 · 3371c61 · 3371c61
1 parent 323ed16
commit 3371c61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/upload/batch.go b/internal/upload/batch.go
@@ -226,18 +226,20 @@ func (uploadBatch *uploadBatch) initUpload() ([]string, error) {
 		return files, nil
 	}
 
+	var entryFile string
+	var err error
 	for len(files) > 0 {
-		entryFile := files[0]
+		entryFile = files[0]
 		files = files[1:]
-		err := uploadBatch.uploadFile(entryFile)
+		err = uploadBatch.uploadFile(entryFile)
 		if err == nil {
 			printSuccessfulUpload(entryFile)
 
 			return files, nil
 		}
 	}
 
-	return files, errors.New("failed to initialize a scan due to badly formatted files")
+	return files, errors.New("failed to initialize a scan due to badly formatted files, initial upload file" + entryFile + " got the following error: " + err.Error())
 }
 
 type uploadedFile struct {

diff --git a/internal/upload/batch_test.go b/internal/upload/batch_test.go
@@ -102,6 +102,8 @@ func TestInitUploadBadFile(t *testing.T) {
 
 	assert.Empty(t, files)
 	assert.ErrorContains(t, err, "failed to initialize a scan due to badly formatted files")
+	assert.ErrorContains(t, err, "filetestdata/misc/requirements.txt")
+	assert.ErrorContains(t, err, "tried to upload empty file")
 }
 
 func TestInitUpload(t *testing.T) {