Handle empty cell names

Author: timvaillancourt

pkg/vitess/api_client.go

@@ -24,11 +24,18 @@ type Tablet struct {
 
 // HasValidCell returns a bool reflecting if a tablet type is in a valid cell
 func (t Tablet) HasValidCell(validCells []string) bool {
-	if len(validCells) == 0 {
+	cells := make([]string, 0)
+	for _, cell := range validCells {
+		cell = strings.TrimSpace(cell)
+		if cell != "" {
+			cells = append(cells, cell)
+		}
+	}
+	if len(cells) == 0 {
 		return true
 	}
-	for _, cell := range validCells {
-		if t.Alias.GetCell() == strings.TrimSpace(cell) {
+	for _, cell := range cells {
+		if cell == "" || t.Alias.GetCell() == cell {
 			return true
 		}
 	}

pkg/vitess/api_client_test.go

@@ -89,12 +89,13 @@ func TestParseTablets(t *testing.T) {
 	})
 
 	t.Run("with-cell", func(t *testing.T) {
-		tablets, err := ParseTablets(config.VitessConfigurationSettings{
+		settings := config.VitessConfigurationSettings{
 			API:      vitessApi.URL,
 			Cells:    []string{"cell2"},
 			Keyspace: "test",
 			Shard:    "00",
-		})
+		}
+		tablets, err := ParseTablets(settings)
 		if err != nil {
 			t.Fatalf("Expected no error, got %q", err)
 		}
@@ -106,8 +107,15 @@ func TestParseTablets(t *testing.T) {
 		if tablets[0].MysqlHostname != "replica1" {
 			t.Fatalf("Expected hostname %q, got %q", "replica1", tablets[0].MysqlHostname)
 		}
-		if tablets[0].Alias.Cell != "cell2" {
-			t.Fatalf("Expected vitess cell %s, got %s", "cell2", tablets[0].Alias.Cell)
+		if tablets[0].Alias.GetCell() != "cell2" {
+			t.Fatalf("Expected vitess cell %s, got %s", "cell2", tablets[0].Alias.GetCell())
+		}
+
+		// empty cell names should cause no filtering
+		settings.Cells = []string{"", ""}
+		tablets, _ = ParseTablets(settings)
+		if len(tablets) != 2 {
+			t.Fatalf("Expected 2 tablet, got %d", len(tablets))
 		}
 	})