v15 tweaks

Signed-off-by: Tim Vaillancourt <[email protected]>

go/vt/topotools/tablet.go

@@ -36,7 +36,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"maps"
 
 	"google.golang.org/protobuf/proto"
 
@@ -61,14 +60,28 @@ func ConfigureTabletHook(hk *hook.Hook, tabletAlias *topodatapb.TabletAlias) {
 	hk.ExtraEnv["TABLET_ALIAS"] = topoproto.TabletAliasString(tabletAlias)
 }
 
+// isMapsEqual simulates maps.Equal() from go1.23+.
+func isMapsEqual(a, b map[string]string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for key, valA := range a {
+		valB, ok := b[key]
+		if !ok || valB != valA {
+			return false
+		}
+	}
+	return true
+}
+
 // ChangeTags changes the tags of the tablet. Make this external, since these
 // transitions need to be forced from time to time.
 //
 // If successful, the updated tablet record is returned.
 func ChangeTags(ctx context.Context, ts *topo.Server, tabletAlias *topodatapb.TabletAlias, tabletTags map[string]string, replace bool) (map[string]string, error) {
 	var result map[string]string
 	_, err := ts.UpdateTabletFields(ctx, tabletAlias, func(tablet *topodatapb.Tablet) error {
-		if replace && maps.Equal(tablet.Tags, tabletTags) {
+		if replace && isMapsEqual(tablet.Tags, tabletTags) {
 			result = tablet.Tags
 			return topo.NewError(topo.NoUpdateNeeded, topoproto.TabletAliasString(tabletAlias))
 		}

go/vt/vtctl/grpcvtctldserver/server_test.go

@@ -42,7 +42,6 @@ import (
 	"vitess.io/vitess/go/vt/topo/topoproto"
 	"vitess.io/vitess/go/vt/vtctl/grpcvtctldserver/testutil"
 	"vitess.io/vitess/go/vt/vtctl/localvtctldclient"
-	"vitess.io/vitess/go/vt/vtenv"
 	"vitess.io/vitess/go/vt/vttablet/tmclient"
 	"vitess.io/vitess/go/vt/vttablet/tmclienttest"
 
@@ -1152,11 +1151,11 @@ func TestChangeTabletTags(t *testing.T) {
 
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
-			ts := memorytopo.NewServer(ctx, tt.cells...)
+			ts := memorytopo.NewServer(tt.cells...)
 			vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, &testutil.TabletManagerClient{
 				TopoServer: ts,
 			}, func(ts *topo.Server) vtctlservicepb.VtctldServer {
-				return NewVtctldServer(vtenv.NewTestEnv(), ts)
+				return NewVtctldServer(ts)
 			})
 
 			testutil.AddTablets(ctx, t, ts, &testutil.AddTabletOptions{
@@ -1182,11 +1181,11 @@ func TestChangeTabletTags(t *testing.T) {
 
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		ts := memorytopo.NewServer(ctx, "zone1")
+		ts := memorytopo.NewServer("zone1")
 		vtctld := testutil.NewVtctldServerWithTabletManagerClient(t, ts, &testutil.TabletManagerClient{
 			TopoServer: nil,
 		}, func(ts *topo.Server) vtctlservicepb.VtctldServer {
-			return NewVtctldServer(vtenv.NewTestEnv(), ts)
+			return NewVtctldServer(ts)
 		})
 
 		testutil.AddTablet(ctx, t, ts, &topodatapb.Tablet{