Add cmd/skytest, successed direct test

binchencoder · binchencoder · commit 9a6e80e2cda1 · 2022-03-25T17:08:41.000+08:00
diff --git a/internal/skylb/skylb_builder.go b/internal/skylb/skylb_builder.go
@@ -21,18 +21,19 @@ type skylbResolver struct {
 // Build
 func (b *skylbBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (
 	resolver.Resolver, error) {
-	if target.Scheme != skyRs.SkyLBScheme {
+	if target.URL.Scheme != skyRs.SkyLBScheme {
 		return nil, ErrUnsupportSchema
 	}
 
-	u, err := url.Parse(target.Endpoint)
+	_, err := url.Parse(target.Endpoint)
 	if err != nil {
 		panic(ErrInvalidTarget)
 	}
 
-	values := u.Query()
+	url := target.URL
+	values := url.Query()
 	servSpec := &pb.ServiceSpec{
-		ServiceName: u.Host,
+		ServiceName: url.Host,
 		Namespace:   values.Get("ns"),
 		PortName:    values.Get("pn"),
 	}
diff --git a/resolver/target_test.go b/resolver/target_test.go
@@ -2,10 +2,13 @@ package resolver
 
 import (
 	"fmt"
+	"net/url"
+	"strings"
 	"testing"
 
 	pb "github.com/binchencoder/skylb-apiv2/proto"
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/grpc/resolver"
 )
 
 func TestDirectTarget(t *testing.T) {
@@ -23,3 +26,33 @@ func TestSkyLBTarget(t *testing.T) {
 	fmt.Println(target)
 	assert.Equal(t, "skylb://serviceName?ns=namespace&pn=portName", target)
 }
+
+func TestParseTarget(t *testing.T) {
+	target := SkyLBTarget(&pb.ServiceSpec{
+		Namespace:   "namespace",
+		ServiceName: "serviceName",
+		PortName:    "portName",
+	})
+
+	u, _ := url.Parse(target)
+	// For targets of the form "[scheme]://[authority]/endpoint, the endpoint
+	// value returned from url.Parse() contains a leading "/". Although this is
+	// in accordance with RFC 3986, we do not want to break existing resolver
+	// implementations which expect the endpoint without the leading "/". So, we
+	// end up stripping the leading "/" here. But this will result in an
+	// incorrect parsing for something like "unix:///path/to/socket". Since we
+	// own the "unix" resolver, we can workaround in the unix resolver by using
+	// the `URL` field instead of the `Endpoint` field.
+	endpoint := u.Path
+	if endpoint == "" {
+		endpoint = u.Opaque
+	}
+	endpoint = strings.TrimPrefix(endpoint, "/")
+	resTarget := resolver.Target{
+		Scheme:    u.Scheme,
+		Authority: u.Host,
+		Endpoint:  endpoint,
+		URL:       *u,
+	}
+	fmt.Printf("target: %s, parsedTarget: %+v \n", target, resTarget)
+}
