VindexUnknown -> UnknownVindex

Signed-off-by: Max Englander <max@planetscale.com>

go/cmd/vtctldclient/command/vschemas.go

@@ -118,7 +118,7 @@ func commandApplyVSchema(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	fmt.Printf("New VSchema object:\n%s\nIf this is not what you expected, check the input data (as JSON parsing will skip unexpected fields).\n", vsData)
-	for vdxName, ups := range res.VindexUnknownParams {
+	for vdxName, ups := range res.UnknownVindexParams {
 		for _, param := range ups.Params {
 			fmt.Printf("Unknown param in vindex %s: %s\n", vdxName, param)
 		}

go/vt/vtctl/grpcvtctldserver/server.go

@@ -371,7 +371,7 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV
 	}
 
 	// Attach unknown Vindex params to the response.
-	vindexUnknownParams := make(map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList)
+	unknownVindexParams := make(map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList)
 	var vdxNames []string
 	for name := range ksVs.Vindexes {
 		vdxNames = append(vdxNames, name)
@@ -384,14 +384,14 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV
 			if len(ups) == 0 {
 				continue
 			}
-			vindexUnknownParams[name] = &vtctldatapb.ApplyVSchemaResponse_ParamList{Params: ups}
+			unknownVindexParams[name] = &vtctldatapb.ApplyVSchemaResponse_ParamList{Params: ups}
 		}
 	}
 
 	if req.DryRun { // we return what was passed in and parsed, rather than current
 		return &vtctldatapb.ApplyVSchemaResponse{
 			VSchema:             vs,
-			VindexUnknownParams: vindexUnknownParams,
+			UnknownVindexParams: unknownVindexParams,
 		}, nil
 	}
 
@@ -413,7 +413,7 @@ func (s *VtctldServer) ApplyVSchema(ctx context.Context, req *vtctldatapb.ApplyV
 	}
 	return &vtctldatapb.ApplyVSchemaResponse{
 		VSchema:             updatedVS,
-		VindexUnknownParams: vindexUnknownParams,
+		UnknownVindexParams: unknownVindexParams,
 	}, nil
 }
 

go/vt/vtctl/grpcvtctldserver/server_test.go

@@ -428,7 +428,7 @@ func TestApplyVSchema(t *testing.T) {
 						},
 					},
 				},
-				VindexUnknownParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{
+				UnknownVindexParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{
 					"lookup1": {
 						Params: []string{"goodbye", "hello"},
 					},
@@ -499,7 +499,7 @@ func TestApplyVSchema(t *testing.T) {
 						},
 					},
 				},
-				VindexUnknownParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{
+				UnknownVindexParams: map[string]*vtctldatapb.ApplyVSchemaResponse_ParamList{
 					"lookup1": {
 						Params: []string{"goodbye", "hello"},
 					},

proto/vtctldata.proto

@@ -374,7 +374,7 @@ message ApplyVSchemaRequest {
 
 message ApplyVSchemaResponse {
   vschema.Keyspace v_schema = 1;
-  map<string, ParamList> vindex_unknown_params = 2;
+  map<string, ParamList> unknown_vindex_params = 2;
 
   message ParamList {
     repeated string params = 1;