fix(cli): stores import csv strip all BOMs from payload.

feat(cli): `stores import csv` preserve header order in `_results.csv`

Signed-off-by: spbsoluble <1661003+spbsoluble@users.noreply.github.com>

Author: spbsoluble

cmd/helpers.go

@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"time"
 
@@ -132,7 +133,7 @@ func csvToMap(filename string) ([]map[string]string, error) {
 
 			// Populate the map with data from the row
 			for i, column := range header {
-				rowMap[column] = row[i]
+				rowMap[column] = stripAllBOMs(row[i])
 			}
 
 			// Append the map to the data slice
@@ -282,27 +283,32 @@ func logGlobals() {
 
 }
 
-func mapToCSV(data []map[string]string, filename string) error {
-	file, err := os.Create(filename)
-	if err != nil {
-		return err
+func mapToCSV(data []map[string]string, filename string, inputHeader []string) error {
+	file, fErr := os.Create(filename)
+	if fErr != nil {
+		return fErr
 	}
 	defer file.Close()
 
 	writer := csv.NewWriter(file)
 	defer writer.Flush()
 
 	// Write the header using keys from the first map
-	var header []string
-	if len(data) > 0 {
+	var header = inputHeader
+	if len(header) <= 0 && len(data) > 0 {
 		for key := range data[0] {
-			header = append(header, key)
-		}
-		if err := writer.Write(header); err != nil {
-			return err
+			header = append(header, stripAllBOMs(key))
 		}
 	}
 
+	errorColFound := slices.Contains(header, "Errors")
+	if !errorColFound {
+		header = append(header, "Errors")
+	}
+	if hErr := writer.Write(header); hErr != nil {
+		return hErr
+	}
+
 	// Write map data to CSV
 	for _, row := range data {
 		var record []string

cmd/storesBulkOperations.go

@@ -311,12 +311,14 @@ If you do not wish to include credentials in your CSV file they can be provided
 		}
 
 		log.Info().Msgf("Processing CSV rows from file '%s'", filePath)
+		var inputHeader []string
 		for idx, row := range inFile {
 			log.Debug().Msgf("Processing row '%d'", idx)
 			originalMap = append(originalMap, row)
 
 			if idx == 0 {
 				// skip header row
+				inputHeader = row
 				log.Debug().Msgf("Skipping header row")
 				continue
 			}
@@ -411,7 +413,7 @@ If you do not wish to include credentials in your CSV file they can be provided
 		log.Info().Msgf("Writing results to file '%s'", outPath)
 
 		//writeCsvFile(outPath, originalMap)
-		mapToCSV(inputMap, outPath)
+		mapToCSV(inputMap, outPath, inputHeader)
 		log.Info().Int("totalRows", totalRows).
 			Int("totalSuccesses", totalSuccess).
 			Int("errorCount", errorCount).