Merge pull request #7285 from tinyspeck/am_fix_findallshardsinkeyspace

[vtctld] Fix accidentally-broken legacy vtctl output format
vitessio · Jan 12, 2021 · 13ba0c8 · 13ba0c8
2 parents 5d863a7 + 606ae89
commit 13ba0c8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go
@@ -2561,7 +2561,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 {