move tunnel/resolver into network

network/mucp/mucp.go

@@ -18,14 +18,14 @@ import (
 	pb "github.com/micro/go-micro/v3/network/mucp/proto"
 	"github.com/micro/go-micro/v3/proxy"
 	"github.com/micro/go-micro/v3/registry/noop"
-	"github.com/micro/go-micro/v3/resolver/dns"
+	"github.com/micro/go-micro/v3/network/resolver/dns"
 	"github.com/micro/go-micro/v3/router"
 	"github.com/micro/go-micro/v3/server"
 	smucp "github.com/micro/go-micro/v3/server/mucp"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	bun "github.com/micro/go-micro/v3/tunnel/broker"
-	tun "github.com/micro/go-micro/v3/tunnel/transport"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	bun "github.com/micro/go-micro/v3/network/tunnel/broker"
+	tun "github.com/micro/go-micro/v3/network/tunnel/transport"
 	"github.com/micro/go-micro/v3/util/backoff"
 )
 

network/options.go

@@ -6,8 +6,8 @@ import (
 	"github.com/micro/go-micro/v3/proxy/mucp"
 	"github.com/micro/go-micro/v3/router"
 	regRouter "github.com/micro/go-micro/v3/router/registry"
-	"github.com/micro/go-micro/v3/tunnel"
-	tmucp "github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	tmucp "github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type Option func(*Options)

network/resolver/dns/dns.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"net"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 	"github.com/miekg/dns"
 )
 

network/resolver/dnssrv/dnssrv.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a DNS network resolve

network/resolver/http/http.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a HTTP network resolver

network/resolver/noop/noop.go

@@ -2,7 +2,7 @@
 package noop
 
 import (
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 type Resolver struct{}

network/resolver/registry/registry.go

@@ -4,7 +4,7 @@ package registry
 import (
 	"github.com/micro/go-micro/v3/registry"
 	"github.com/micro/go-micro/v3/registry/mdns"
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver is a registry network resolver

network/resolver/static/static.go

@@ -2,7 +2,7 @@
 package static
 
 import (
-	"github.com/micro/go-micro/v3/resolver"
+	"github.com/micro/go-micro/v3/network/resolver"
 )
 
 // Resolver returns a static list of nodes. In the event the node list

network/tunnel/broker/broker.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/micro/go-micro/v3/broker"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	"github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type tunBroker struct {

network/tunnel/mucp/crypto.go

@@ -6,7 +6,7 @@ import (
 	"crypto/rand"
 	"crypto/sha256"
 
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 	"github.com/oxtoacart/bpool"
 )
 

network/tunnel/mucp/listener.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/micro/go-micro/v3/logger"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 type tunListener struct {

network/tunnel/mucp/mucp.go

@@ -10,7 +10,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 var (

network/tunnel/mucp/mucp_test.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 func testBrokenTunAccept(t *testing.T, tun tunnel.Tunnel, wait chan bool, wg *sync.WaitGroup) {

network/tunnel/mucp/session.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/micro/go-micro/v3/logger"
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 // session is our pseudo session for transport.Socket

network/tunnel/transport/listener.go

@@ -2,7 +2,7 @@ package transport
 
 import (
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel"
 )
 
 type tunListener struct {

network/tunnel/transport/transport.go

@@ -5,8 +5,8 @@ import (
 	"context"
 
 	"github.com/micro/go-micro/v3/transport"
-	"github.com/micro/go-micro/v3/tunnel"
-	"github.com/micro/go-micro/v3/tunnel/mucp"
+	"github.com/micro/go-micro/v3/network/tunnel"
+	"github.com/micro/go-micro/v3/network/tunnel/mucp"
 )
 
 type tunTransport struct {