Modify uploader config map key

Signed-off-by: Ming Qiu <mqiu@vmware.com>

pkg/uploader/util/uploader_config.go

@@ -25,28 +25,28 @@ import (
 )
 
 const (
-	parallelFilesUpload = "ParallelFilesUpload"
+	ParallelFilesUpload = "ParallelFilesUpload"
-	writeSparseFiles    = "WriteSparseFiles"
+	WriteSparseFiles    = "WriteSparseFiles"
 )
 
 func StoreBackupConfig(config *velerov1api.UploaderConfigForBackup) map[string]string {
 	data := make(map[string]string)
-	data[parallelFilesUpload] = strconv.Itoa(config.ParallelFilesUpload)
+	data[ParallelFilesUpload] = strconv.Itoa(config.ParallelFilesUpload)
 	return data
 }
 
 func StoreRestoreConfig(config *velerov1api.UploaderConfigForRestore) map[string]string {
 	data := make(map[string]string)
 	if config.WriteSparseFiles != nil {
-		data[writeSparseFiles] = strconv.FormatBool(*config.WriteSparseFiles)
+		data[WriteSparseFiles] = strconv.FormatBool(*config.WriteSparseFiles)
 	} else {
-		data[writeSparseFiles] = strconv.FormatBool(false)
+		data[WriteSparseFiles] = strconv.FormatBool(false)
 	}
 	return data
 }
 
 func GetParallelFilesUpload(uploaderCfg map[string]string) (int, error) {
-	parallelFilesUpload, ok := uploaderCfg[parallelFilesUpload]
+	parallelFilesUpload, ok := uploaderCfg[ParallelFilesUpload]
 	if ok {
 		parallelFilesUploadInt, err := strconv.Atoi(parallelFilesUpload)
 		if err != nil {
@@ -58,7 +58,7 @@ func GetParallelFilesUpload(uploaderCfg map[string]string) (int, error) {
 }
 
 func GetWriteSparseFiles(uploaderCfg map[string]string) (bool, error) {
-	writeSparseFiles, ok := uploaderCfg[writeSparseFiles]
+	writeSparseFiles, ok := uploaderCfg[WriteSparseFiles]
 	if ok {
 		writeSparseFilesBool, err := strconv.ParseBool(writeSparseFiles)
 		if err != nil {

pkg/uploader/util/uploader_config_test.go

@@ -31,7 +31,7 @@ func TestStoreBackupConfig(t *testing.T) {
 	}
 
 	expectedData := map[string]string{
-		parallelFilesUpload: "3",
+		ParallelFilesUpload: "3",
 	}
 
 	result := StoreBackupConfig(config)
@@ -42,19 +42,52 @@ func TestStoreBackupConfig(t *testing.T) {
 }
 
 func TestStoreRestoreConfig(t *testing.T) {
-	boolTrue := true
+	var (
-	config := &velerov1api.UploaderConfigForRestore{
+		boolTrue  = true
-		WriteSparseFiles: &boolTrue,
+		boolFalse = false
+	)
+	testCases := []struct {
+		name         string
+		config       *velerov1api.UploaderConfigForRestore
+		expectedData map[string]string
+	}{
+		{
+			name: "WriteSparseFiles is true",
+			config: &velerov1api.UploaderConfigForRestore{
+				WriteSparseFiles: &boolTrue,
+			},
+			expectedData: map[string]string{
+				WriteSparseFiles: "true",
+			},
+		},
+		{
+			name: "WriteSparseFiles is false",
+			config: &velerov1api.UploaderConfigForRestore{
+				WriteSparseFiles: &boolFalse,
+			},
+			expectedData: map[string]string{
+				WriteSparseFiles: "false",
+			},
+		},
+		{
+			name: "WriteSparseFiles is nil",
+			config: &velerov1api.UploaderConfigForRestore{
+				WriteSparseFiles: nil,
+			},
+			expectedData: map[string]string{
+				WriteSparseFiles: "false", // Assuming default value is false for nil case
+			},
+		},
 	}
 
-	expectedData := map[string]string{
+	for _, tc := range testCases {
-		writeSparseFiles: "true",
+		t.Run(tc.name, func(t *testing.T) {
-	}
+			result := StoreRestoreConfig(tc.config)
 
-	result := StoreRestoreConfig(config)
+			if !reflect.DeepEqual(result, tc.expectedData) {
-
+				t.Errorf("Expected: %v, but got: %v", tc.expectedData, result)
-	if !reflect.DeepEqual(result, expectedData) {
+			}
-		t.Errorf("Expected: %v, but got: %v", expectedData, result)
+		})
 	}
 }
 
@@ -67,7 +100,7 @@ func TestGetParallelFilesUpload(t *testing.T) {
 	}{
 		{
 			name:           "Valid ParallelFilesUpload",
-			uploaderCfg:    map[string]string{parallelFilesUpload: "5"},
+			uploaderCfg:    map[string]string{ParallelFilesUpload: "5"},
 			expectedResult: 5,
 			expectedError:  nil,
 		},
@@ -79,7 +112,7 @@ func TestGetParallelFilesUpload(t *testing.T) {
 		},
 		{
 			name:           "Invalid ParallelFilesUpload (not a number)",
-			uploaderCfg:    map[string]string{parallelFilesUpload: "invalid"},
+			uploaderCfg:    map[string]string{ParallelFilesUpload: "invalid"},
 			expectedResult: 0,
 			expectedError:  errors.Wrap(errors.New("strconv.Atoi: parsing \"invalid\": invalid syntax"), "failed to parse ParallelFilesUpload config"),
 		},
@@ -109,19 +142,19 @@ func TestGetWriteSparseFiles(t *testing.T) {
 	}{
 		{
 			name:           "Valid WriteSparseFiles (true)",
-			uploaderCfg:    map[string]string{writeSparseFiles: "true"},
+			uploaderCfg:    map[string]string{WriteSparseFiles: "true"},
 			expectedResult: true,
 			expectedError:  nil,
 		},
 		{
 			name:           "Valid WriteSparseFiles (false)",
-			uploaderCfg:    map[string]string{writeSparseFiles: "false"},
+			uploaderCfg:    map[string]string{WriteSparseFiles: "false"},
 			expectedResult: false,
 			expectedError:  nil,
 		},
 		{
 			name:           "Invalid WriteSparseFiles (not a boolean)",
-			uploaderCfg:    map[string]string{writeSparseFiles: "invalid"},
+			uploaderCfg:    map[string]string{WriteSparseFiles: "invalid"},
 			expectedResult: false,
 			expectedError:  errors.Wrap(errors.New("strconv.ParseBool: parsing \"invalid\": invalid syntax"), "failed to parse WriteSparseFiles config"),
 		},