Merge pull request vitessio#7285 from tinyspeck/am_fix_findallshardsi…

…nkeyspace [vtctld] Fix accidentally-broken legacy vtctl output format
tinyspeck · Jan 12, 2021 · 86c518c · 86c518c
1 parent bb3c5c1
commit 86c518c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go
@@ -2224,7 +2224,14 @@ func commandFindAllShardsInKeyspace(ctx context.Context, wr *wrangler.Wrangler,
 		return err
 	}
 
-	return printJSON(wr.Logger(), result.Shards)
+	// reformat data into structure of old interface
+	legacyShardMap := make(map[string]*topodatapb.Shard, len(result.Shards))
+
+	for _, shard := range result.Shards {
+		legacyShardMap[shard.Name] = shard.Shard
+	}
+
+	return printJSON(wr.Logger(), legacyShardMap)
 }
 
 func commandValidate(ctx context.Context, wr *wrangler.Wrangler, subFlags *flag.FlagSet, args []string) error {