[v11] Make proxy routing logic reusable

lib/proxy/clusterdial/dial.go

@@ -17,22 +17,23 @@ package clusterdial
 import (
 	"net"
 
-	"github.com/gravitational/teleport/lib/proxy"
-	"github.com/gravitational/teleport/lib/reversetunnel"
 	"github.com/gravitational/trace"
+
+	"github.com/gravitational/teleport/lib/proxy/peer"
+	"github.com/gravitational/teleport/lib/reversetunnel"
 )
 
-// ClusterDialerFunc is a function that implements a proxy.ClusterDialer.
-type ClusterDialerFunc func(clusterName string, request proxy.DialParams) (net.Conn, error)
+// ClusterDialerFunc is a function that implements a peer.ClusterDialer.
+type ClusterDialerFunc func(clusterName string, request peer.DialParams) (net.Conn, error)
 
 // Dial dials makes a dial request to the given cluster.
-func (f ClusterDialerFunc) Dial(clusterName string, request proxy.DialParams) (net.Conn, error) {
+func (f ClusterDialerFunc) Dial(clusterName string, request peer.DialParams) (net.Conn, error) {
 	return f(clusterName, request)
 }
 
 // NewClusterDialer implements proxy.ClusterDialer for a reverse tunnel server.
 func NewClusterDialer(server reversetunnel.Server) ClusterDialerFunc {
-	return ClusterDialerFunc(func(clusterName string, request proxy.DialParams) (net.Conn, error) {
+	return func(clusterName string, request peer.DialParams) (net.Conn, error) {
 		site, err := server.GetSite(clusterName)
 		if err != nil {
 			return nil, trace.Wrap(err)
@@ -51,5 +52,5 @@ func NewClusterDialer(server reversetunnel.Server) ClusterDialerFunc {
 			return nil, trace.Wrap(err)
 		}
 		return conn, nil
-	})
+	}
 }

lib/proxy/auth.go → lib/proxy/peer/auth.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/client.go → lib/proxy/peer/client.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/client_test.go → lib/proxy/peer/client_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"crypto/tls"

lib/proxy/clientmetrics.go → lib/proxy/peer/clientmetrics.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"github.com/gravitational/trace"

lib/proxy/conn.go → lib/proxy/peer/conn.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/conn_test.go → lib/proxy/peer/conn_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/helpers_test.go → lib/proxy/peer/helpers_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"crypto/rand"

lib/proxy/interceptor.go → lib/proxy/peer/interceptor.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/reporter.go → lib/proxy/peer/reporter.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"time"

lib/proxy/server.go → lib/proxy/peer/server.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"crypto/tls"

lib/proxy/server_test.go → lib/proxy/peer/server_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"testing"

lib/proxy/servermetrics.go → lib/proxy/peer/servermetrics.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"github.com/gravitational/trace"

lib/proxy/service.go → lib/proxy/peer/service.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"net"

lib/proxy/service_test.go → lib/proxy/peer/service_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"

lib/proxy/stats.go → lib/proxy/peer/stats.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package proxy
+package peer
 
 import (
 	"context"
@@ -51,7 +51,7 @@ func (s *statsHandler) TagConn(ctx context.Context, info *stats.ConnTagInfo) con
 	return ctx
 }
 
-// HandleRPC implements per-Connection stats reporting.
+// HandleConn implements per-Connection stats reporting.
 func (s *statsHandler) HandleConn(ctx context.Context, connStats stats.ConnStats) {
 	// client connection stats are monitored by the monitor() function in client.go
 	if connStats.IsClient() {