handle empty strings in copy-labels list

planetscale · May 21, 2024 · 566b9d1 · 566b9d1
1 parent 389b69f
commit 566b9d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -200,7 +200,7 @@ func main() {
 	log.WithFields(log.Fields{"tags": defaultTags}).Infoln("Default Tags")
 
 	if copyLabelsString != "" {
-		copyLabels = strings.Split(copyLabelsString, ",")
+		copyLabels = parseCopyLabels(copyLabelsString)
 		log.Infof("Copying PVC labels to tags: %v", copyLabels)
 	}
 
@@ -367,5 +367,8 @@ func parseCopyLabels(copyLabelsString string) []string {
 	if copyLabelsString == "" {
 		return []string{}
 	}
-	return strings.Split(copyLabelsString, ",")
+	// remove empty strings from final list, eg: "foo,,bar" -> ["foo" "bar"]:
+	return strings.FieldsFunc(copyLabelsString, func(c rune) bool {
+		return c == ','
+	})
 }
diff --git a/main_test.go b/main_test.go
@@ -95,11 +95,21 @@ func Test_parseCopyLabels(t *testing.T) {
 			copyLabelsString: "foo,bar",
 			want:             []string{"foo", "bar"},
 		},
+		{
+			name:             "empty values in list",
+			copyLabelsString: "foo,bar",
+			want:             []string{"foo", "bar"},
+		},
 		{
 			name:             "copy no labels",
 			copyLabelsString: "",
 			want:             []string{},
 		},
+		{
+			name:             "empty values in list",
+			copyLabelsString: "foo,,bar",
+			want:             []string{"foo", "bar"},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {