[vtctld] Migrate topo management RPCs

go/cmd/vtctldclient/cli/awk.go

@@ -20,6 +20,13 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"
+
+	"vitess.io/vitess/go/vt/logutil"
+	"vitess.io/vitess/go/vt/topo"
+	"vitess.io/vitess/go/vt/topo/topoproto"
+
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 )
 
 // MarshalMapAWK returns a string representation of a string->string map in an
@@ -38,3 +45,29 @@ func MarshalMapAWK(m map[string]string) string {
 
 	return "[" + strings.Join(pairs, " ") + "]"
 }
+
+// MarshalTabletAWK marshals a tablet into an AWK-friendly line.
+func MarshalTabletAWK(t *topodatapb.Tablet) string {
+	ti := topo.TabletInfo{
+		Tablet: t,
+	}
+
+	keyspace := t.Keyspace
+	if keyspace == "" {
+		keyspace = "<null>"
+	}
+
+	shard := t.Shard
+	if shard == "" {
+		shard = "<null>"
+	}
+
+	mtst := "<null>"
+	// special case for old primary that hasn't been updated in the topo
+	// yet.
+	if t.MasterTermStartTime != nil && t.MasterTermStartTime.Seconds > 0 {
+		mtst = logutil.ProtoToTime(t.MasterTermStartTime).Format(time.RFC3339)
+	}
+
+	return fmt.Sprintf("%v %v %v %v %v %v %v %v", topoproto.TabletAliasString(t.Alias), keyspace, shard, topoproto.TabletTypeLString(t.Type), ti.Addr(), ti.MysqlAddr(), MarshalMapAWK(t.Tags), mtst)
+}

go/cmd/vtctldclient/cli/pflag.go

@@ -0,0 +1,93 @@
+/*
+Copyright 2021 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cli
+
+import (
+	"github.com/spf13/pflag"
+
+	"vitess.io/vitess/go/flagutil"
+	"vitess.io/vitess/go/vt/key"
+	"vitess.io/vitess/go/vt/topo/topoproto"
+
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+)
+
+// StringMapValue augements flagutil.StringMapValue so it can be used as a
+// pflag.Value.
+type StringMapValue struct {
+	flagutil.StringMapValue
+}
+
+// Type is part of the pflag.Value interface.
+func (v *StringMapValue) Type() string {
+	return "cli.StringMapValue"
+}
+
+// KeyspaceIDTypeFlag adds the pflag.Value interface to a
+// topodatapb.KeyspaceIdType.
+type KeyspaceIDTypeFlag topodatapb.KeyspaceIdType
+
+var _ pflag.Value = (*KeyspaceIDTypeFlag)(nil)
+
+// Set is part of the pflag.Value interface.
+func (v *KeyspaceIDTypeFlag) Set(arg string) error {
+	t, err := key.ParseKeyspaceIDType(arg)
+	if err != nil {
+		return err
+	}
+
+	*v = KeyspaceIDTypeFlag(t)
+
+	return nil
+}
+
+// String is part of the pflag.Value interface.
+func (v *KeyspaceIDTypeFlag) String() string {
+	return key.KeyspaceIDTypeString(topodatapb.KeyspaceIdType(*v))
+}
+
+// Type is part of the pflag.Value interface.
+func (v *KeyspaceIDTypeFlag) Type() string {
+	return "cli.KeyspaceIdTypeFlag"
+}
+
+// KeyspaceTypeFlag adds the pflag.Value interface to a topodatapb.KeyspaceType.
+type KeyspaceTypeFlag topodatapb.KeyspaceType
+
+var _ pflag.Value = (*KeyspaceTypeFlag)(nil)
+
+// Set is part of the pflag.Value interface.
+func (v *KeyspaceTypeFlag) Set(arg string) error {
+	kt, err := topoproto.ParseKeyspaceType(arg)
+	if err != nil {
+		return err
+	}
+
+	*v = KeyspaceTypeFlag(kt)
+
+	return nil
+}
+
+// String is part of the pflag.Value interface.
+func (v *KeyspaceTypeFlag) String() string {
+	return topoproto.KeyspaceTypeString(topodatapb.KeyspaceType(*v))
+}
+
+// Type is part of the pflag.Value interface.
+func (v *KeyspaceTypeFlag) Type() string {
+	return "cli.KeyspaceTypeFlag"
+}

go/cmd/vtctldclient/cli/shards.go

@@ -0,0 +1,43 @@
+/*
+Copyright 20201 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cli
+
+import (
+	"vitess.io/vitess/go/vt/topo/topoproto"
+
+	vtctldatapb "vitess.io/vitess/go/vt/proto/vtctldata"
+)
+
+// ParseKeyspaceShards takes a list of positional arguments and converts them to
+// vtctldatapb.Shard objects.
+func ParseKeyspaceShards(args []string) ([]*vtctldatapb.Shard, error) {
+	shards := make([]*vtctldatapb.Shard, 0, len(args))
+
+	for _, arg := range args {
+		keyspace, shard, err := topoproto.ParseKeyspaceShard(arg)
+		if err != nil {
+			return nil, err
+		}
+
+		shards = append(shards, &vtctldatapb.Shard{
+			Keyspace: keyspace,
+			Name:     shard,
+		})
+	}
+
+	return shards, nil
+}

go/cmd/vtctldclient/cli/tablets.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2021 The Vitess Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cli
+
+import (
+	"vitess.io/vitess/go/vt/topo/topoproto"
+
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
+)
+
+// TabletAliasesFromPosArgs takes a list of positional (non-flag) arguments and
+// converts them to tablet aliases.
+func TabletAliasesFromPosArgs(args []string) ([]*topodatapb.TabletAlias, error) {
+	aliases := make([]*topodatapb.TabletAlias, 0, len(args))
+
+	for _, arg := range args {
+		alias, err := topoproto.ParseTabletAlias(arg)
+		if err != nil {
+			return nil, err
+		}
+
+		aliases = append(aliases, alias)
+	}
+
+	return aliases, nil
+}