From 621ba65276d7ab7ce65095c2b0988fd8df1700db Mon Sep 17 00:00:00 2001
From: Michael Demmer <mdemmer@slack-corp.com>
Date: Wed, 24 Apr 2024 18:10:05 -0700
Subject: [PATCH] unrelated but just move some code around

---
 go/vt/vtgateproxy/discovery.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/go/vt/vtgateproxy/discovery.go b/go/vt/vtgateproxy/discovery.go
index 4b533cc0002..a4b48340bfd 100644
--- a/go/vt/vtgateproxy/discovery.go
+++ b/go/vt/vtgateproxy/discovery.go
@@ -57,6 +57,19 @@ import (
 // type: Only select from hosts of this type (required)
 //
 
+// Resolver(https://godoc.org/google.golang.org/grpc/resolver#Resolver).
+type JSONGateResolver struct {
+	target     resolver.Target
+	clientConn resolver.ClientConn
+	poolType   string
+}
+
+func (r *JSONGateResolver) ResolveNow(o resolver.ResolveNowOptions) {}
+
+func (r *JSONGateResolver) Close() {
+	log.Infof("Closing resolver for target %s", r.target.URL.String())
+}
+
 type JSONGateResolverBuilder struct {
 	jsonPath      string
 	addressField  string
@@ -80,13 +93,6 @@ type targetHost struct {
 	Affinity string
 }
 
-// Resolver(https://godoc.org/google.golang.org/grpc/resolver#Resolver).
-type JSONGateResolver struct {
-	target     resolver.Target
-	clientConn resolver.ClientConn
-	poolType   string
-}
-
 var (
 	parseCount  = stats.NewCountersWithSingleLabel("JsonDiscoveryParseCount", "Count of results of JSON host file parsing (changed, unchanged, error)", "result")
 	targetCount = stats.NewGaugesWithSingleLabel("JsonDiscoveryTargetCount", "Count of hosts returned from discovery by pool type", "pool")
@@ -403,12 +409,6 @@ func (b *JSONGateResolverBuilder) debugTargets() any {
 	}
 }
 
-func (r *JSONGateResolver) ResolveNow(o resolver.ResolveNowOptions) {}
-
-func (r *JSONGateResolver) Close() {
-	log.Infof("Closing resolver for target %s", r.target.URL.String())
-}
-
 const (
 	// targetsTemplate is a HTML template to display the gate resolver's target hosts.
 	targetsTemplate = `