revert to set NodesOnly and fix max index set

agent/consul/internal_endpoint.go

@@ -233,9 +233,8 @@ func (m *Internal) ServiceDump(args *structs.ServiceDumpRequest, reply *structs.
 					if idx > maxIndex {
 						maxIndex = idx
 					}
-					reply.Index = maxIndex
 				}
-
+				reply.Index = maxIndex
 				raw, err := filter.Execute(reply.Nodes)
 				if err != nil {
 					return fmt.Errorf("could not filter local service dump: %w", err)

agent/proxycfg/mesh_gateway.go

@@ -295,7 +295,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u UpdateEvent, sn
 					QueryOptions:   structs.QueryOptions{Token: s.token},
 					ServiceKind:    structs.ServiceKindMeshGateway,
 					UseServiceKind: true,
-					NodesOnly:      false,
+					NodesOnly:      true,
 					Source:         *s.source,
 					EnterpriseMeta: *entMeta,
 				}, fmt.Sprintf("mesh-gateway:%s", gk.String()), s.ch)

agent/proxycfg/state.go

@@ -544,7 +544,7 @@ func watchMeshGateway(ctx context.Context, opts gatewayWatchOpts) error {
 		QueryOptions:   structs.QueryOptions{Token: opts.token},
 		ServiceKind:    structs.ServiceKindMeshGateway,
 		UseServiceKind: true,
-		NodesOnly:      false,
+		NodesOnly:      true,
 		Source:         opts.source,
 		EnterpriseMeta: *structs.DefaultEnterpriseMetaInPartition(opts.key.Partition),
 	}, correlationId, opts.notifyCh)