Merge b1888ba into 0a0b1fd

pkg/cache/cache_test.go

@@ -26,12 +26,12 @@ import (
 type level1 struct {
 }
 
-func (l *level1) Name(ctx context.Context) string {
+func (l *level1) Name(ctx context.Context, _ *Node) string {
 	return ctx.Value("key1").(string)
 }
 
 func (l *level1) Init(ctx context.Context, parent *Node) (node *Node, err error) {
-	p := l.Name(ctx)
+	p := l.Name(ctx, parent)
 	if p == "err" {
 		return nil, fmt.Errorf("wrong logic")
 	}
@@ -51,7 +51,7 @@ type level2 struct {
 	changed string
 }
 
-func (l *level2) Name(ctx context.Context) string {
+func (l *level2) Name(ctx context.Context, _ *Node) string {
 	return ctx.Value("key2").(string)
 }
 
@@ -60,7 +60,7 @@ func (l *level2) Init(ctx context.Context, parent *Node) (node *Node, err error)
 		return
 	}
 
-	p := l.Name(ctx)
+	p := l.Name(ctx, parent)
 	if p == "err" {
 		return nil, fmt.Errorf("wrong logic")
 	}

pkg/cache/filter.go

@@ -19,6 +19,6 @@ package cache
 import "golang.org/x/net/context"
 
 type Filter interface {
-	Name(ctx context.Context) string
+	Name(ctx context.Context, parent *Node) string
 	Init(ctx context.Context, parent *Node) (*Node, error)
 }

pkg/cache/tree.go

@@ -77,7 +77,7 @@ func (t *Tree) Remove(ctx context.Context) {
 		return
 	}
 
-	t.roots.Delete(t.filters[0].Name(ctx))
+	t.roots.Delete(t.filters[0].Name(ctx, nil))
 }
 
 func (t *Tree) getOrCreateRoot(ctx context.Context) (node *Node, err error) {
@@ -86,7 +86,7 @@ func (t *Tree) getOrCreateRoot(ctx context.Context) (node *Node, err error) {
 	}
 
 	filter := t.filters[0]
-	name := filter.Name(ctx)
+	name := filter.Name(ctx, nil)
 	item, err := t.roots.Fetch(name, t.Config.TTL(), func() (interface{}, error) {
 		node, err := t.getOrCreateNode(ctx, 0, nil)
 		if err != nil {
@@ -108,7 +108,7 @@ func (t *Tree) getOrCreateRoot(ctx context.Context) (node *Node, err error) {
 
 func (t *Tree) getOrCreateNode(ctx context.Context, idx int, parent *Node) (node *Node, err error) {
 	filter := t.filters[idx]
-	name := t.nodeFullName(filter.Name(ctx), parent)
+	name := t.nodeFullName(filter.Name(ctx, parent), parent)
 
 	if parent == nil {
 		// new a temp node

pkg/client/sc/apis.go

@@ -25,17 +25,20 @@ import (
 	scerr "github.com/apache/servicecomb-service-center/server/error"
 	"github.com/apache/servicecomb-service-center/server/plugin/pkg/registry"
 	"github.com/apache/servicecomb-service-center/version"
+	"golang.org/x/net/context"
 	"io/ioutil"
 	"net/http"
 )
 
 const (
-	apiVersionURL  = "/version"
-	apiDumpURL     = "/v4/default/admin/dump"
-	apiClustersURL = "/v4/default/admin/clusters"
-	apiHealthURL   = "/v4/default/registry/health"
-	apiSchemasURL  = "/v4/%s/registry/microservices/%s/schemas"
-	apiSchemaURL   = "/v4/%s/registry/microservices/%s/schemas/%s"
+	apiVersionURL   = "/version"
+	apiDumpURL      = "/v4/default/admin/dump"
+	apiClustersURL  = "/v4/default/admin/clusters"
+	apiHealthURL    = "/v4/default/registry/health"
+	apiSchemasURL   = "/v4/%s/registry/microservices/%s/schemas"
+	apiSchemaURL    = "/v4/%s/registry/microservices/%s/schemas/%s"
+	apiInstancesURL = "/v4/%s/registry/microservices/%s/instances"
+	apiInstanceURL  = "/v4/%s/registry/microservices/%s/instances/%s"
 )
 
 func (c *SCClient) toError(body []byte) *scerr.Error {
@@ -47,8 +50,8 @@ func (c *SCClient) toError(body []byte) *scerr.Error {
 	return message
 }
 
-func (c *SCClient) GetScVersion() (*version.VersionSet, *scerr.Error) {
-	resp, err := c.RestDo(http.MethodGet, apiVersionURL, c.CommonHeaders(), nil)
+func (c *SCClient) GetScVersion(ctx context.Context) (*version.VersionSet, *scerr.Error) {
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet, apiVersionURL, c.CommonHeaders(ctx), nil)
 	if err != nil {
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
@@ -66,18 +69,17 @@ func (c *SCClient) GetScVersion() (*version.VersionSet, *scerr.Error) {
 	v := &version.VersionSet{}
 	err = json.Unmarshal(body, v)
 	if err != nil {
-		fmt.Println(string(body))
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
 
 	return v, nil
 }
 
-func (c *SCClient) GetScCache() (*model.Cache, *scerr.Error) {
-	headers := c.CommonHeaders()
+func (c *SCClient) GetScCache(ctx context.Context) (*model.Cache, *scerr.Error) {
+	headers := c.CommonHeaders(ctx)
 	// only default domain has admin permission
 	headers.Set("X-Domain-Name", "default")
-	resp, err := c.RestDo(http.MethodGet, apiDumpURL, headers, nil)
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet, apiDumpURL, headers, nil)
 	if err != nil {
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
@@ -95,18 +97,17 @@ func (c *SCClient) GetScCache() (*model.Cache, *scerr.Error) {
 	dump := &model.DumpResponse{}
 	err = json.Unmarshal(body, dump)
 	if err != nil {
-		fmt.Println(string(body))
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
 
 	return dump.Cache, nil
 }
 
-func (c *SCClient) GetSchemasByServiceId(domainProject, serviceId string) ([]*pb.Schema, *scerr.Error) {
+func (c *SCClient) GetSchemasByServiceId(ctx context.Context, domainProject, serviceId string) ([]*pb.Schema, *scerr.Error) {
 	domain, project := core.FromDomainProject(domainProject)
-	headers := c.CommonHeaders()
+	headers := c.CommonHeaders(ctx)
 	headers.Set("X-Domain-Name", domain)
-	resp, err := c.RestDo(http.MethodGet,
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet,
 		fmt.Sprintf(apiSchemasURL, project, serviceId)+"?withSchema=1",
 		headers, nil)
 	if err != nil {
@@ -126,18 +127,17 @@ func (c *SCClient) GetSchemasByServiceId(domainProject, serviceId string) ([]*pb
 	schemas := &pb.GetAllSchemaResponse{}
 	err = json.Unmarshal(body, schemas)
 	if err != nil {
-		fmt.Println(util.BytesToStringWithNoCopy(body))
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
 
 	return schemas.Schemas, nil
 }
 
-func (c *SCClient) GetSchemaBySchemaId(domainProject, serviceId, schemaId string) (*pb.Schema, *scerr.Error) {
+func (c *SCClient) GetSchemaBySchemaId(ctx context.Context, domainProject, serviceId, schemaId string) (*pb.Schema, *scerr.Error) {
 	domain, project := core.FromDomainProject(domainProject)
-	headers := c.CommonHeaders()
+	headers := c.CommonHeaders(ctx)
 	headers.Set("X-Domain-Name", domain)
-	resp, err := c.RestDo(http.MethodGet,
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet,
 		fmt.Sprintf(apiSchemaURL, project, serviceId, schemaId),
 		headers, nil)
 	if err != nil {
@@ -157,7 +157,6 @@ func (c *SCClient) GetSchemaBySchemaId(domainProject, serviceId, schemaId string
 	schema := &pb.GetSchemaResponse{}
 	err = json.Unmarshal(body, schema)
 	if err != nil {
-		fmt.Println(util.BytesToStringWithNoCopy(body))
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
 
@@ -168,11 +167,11 @@ func (c *SCClient) GetSchemaBySchemaId(domainProject, serviceId, schemaId string
 	}, nil
 }
 
-func (c *SCClient) GetClusters() (registry.Clusters, *scerr.Error) {
-	headers := c.CommonHeaders()
+func (c *SCClient) GetClusters(ctx context.Context) (registry.Clusters, *scerr.Error) {
+	headers := c.CommonHeaders(ctx)
 	// only default domain has admin permission
 	headers.Set("X-Domain-Name", "default")
-	resp, err := c.RestDo(http.MethodGet, apiClustersURL, headers, nil)
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet, apiClustersURL, headers, nil)
 	if err != nil {
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
@@ -190,18 +189,17 @@ func (c *SCClient) GetClusters() (registry.Clusters, *scerr.Error) {
 	clusters := &model.ClustersResponse{}
 	err = json.Unmarshal(body, clusters)
 	if err != nil {
-		fmt.Println(string(body))
 		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
 	}
 
 	return clusters.Clusters, nil
 }
 
-func (c *SCClient) HealthCheck() *scerr.Error {
-	headers := c.CommonHeaders()
+func (c *SCClient) HealthCheck(ctx context.Context) *scerr.Error {
+	headers := c.CommonHeaders(ctx)
 	// only default domain has admin permission
 	headers.Set("X-Domain-Name", "default")
-	resp, err := c.RestDo(http.MethodGet, apiHealthURL, headers, nil)
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet, apiHealthURL, headers, nil)
 	if err != nil {
 		return scerr.NewError(scerr.ErrUnavailableBackend, err.Error())
 	}
@@ -217,3 +215,65 @@ func (c *SCClient) HealthCheck() *scerr.Error {
 	}
 	return nil
 }
+
+func (c *SCClient) GetInstancesByServiceId(ctx context.Context, domainProject, providerId, consumerId string) ([]*pb.MicroServiceInstance, *scerr.Error) {
+	domain, project := core.FromDomainProject(domainProject)
+	headers := c.CommonHeaders(ctx)
+	headers.Set("X-Domain-Name", domain)
+	headers.Set("X-ConsumerId", consumerId)
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet,
+		fmt.Sprintf(apiInstancesURL, project, providerId),
+		headers, nil)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, c.toError(body)
+	}
+
+	instancesResp := &pb.GetInstancesResponse{}
+	err = json.Unmarshal(body, instancesResp)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+
+	return instancesResp.Instances, nil
+}
+
+func (c *SCClient) GetInstanceByInstanceId(ctx context.Context, domainProject, providerId, instanceId, consumerId string) (*pb.MicroServiceInstance, *scerr.Error) {
+	domain, project := core.FromDomainProject(domainProject)
+	headers := c.CommonHeaders(ctx)
+	headers.Set("X-Domain-Name", domain)
+	headers.Set("X-ConsumerId", consumerId)
+	resp, err := c.RestDoWithContext(ctx, http.MethodGet,
+		fmt.Sprintf(apiInstanceURL, project, providerId, instanceId),
+		headers, nil)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+	defer resp.Body.Close()
+
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, c.toError(body)
+	}
+
+	instanceResp := &pb.GetOneInstanceResponse{}
+	err = json.Unmarshal(body, instanceResp)
+	if err != nil {
+		return nil, scerr.NewError(scerr.ErrInternal, err.Error())
+	}
+
+	return instanceResp.Instance, nil
+}

pkg/client/sc/client.go

@@ -16,6 +16,7 @@
 package sc
 
 import (
+	"golang.org/x/net/context"
 	"net/http"
 )
 
@@ -32,8 +33,9 @@ type SCClient struct {
 	Cfg Config
 }
 
-func (c *SCClient) CommonHeaders() http.Header {
+func (c *SCClient) CommonHeaders(ctx context.Context) http.Header {
 	var headers = make(http.Header)
+	// TODO overwrote by context values
 	if len(c.Cfg.Token) > 0 {
 		headers.Set("X-Auth-Token", c.Cfg.Token)
 	}

pkg/client/sc/client_lb.go

@@ -19,6 +19,7 @@ import (
 	"github.com/apache/servicecomb-service-center/pkg/lb"
 	"github.com/apache/servicecomb-service-center/pkg/rest"
 	"github.com/apache/servicecomb-service-center/pkg/util"
+	"golang.org/x/net/context"
 	"net/http"
 )
 
@@ -44,9 +45,9 @@ func (c *LBClient) Next() string {
 	return c.LB.Next()
 }
 
-func (c *LBClient) RestDo(method string, api string, headers http.Header, body []byte) (resp *http.Response, err error) {
+func (c *LBClient) RestDoWithContext(ctx context.Context, method string, api string, headers http.Header, body []byte) (resp *http.Response, err error) {
 	for i := 0; i < c.Retries; i++ {
-		resp, err = c.HttpDo(method, c.Next()+api, headers, body)
+		resp, err = c.HttpDoWithContext(ctx, method, c.Next()+api, headers, body)
 		if err != nil {
 			util.GetBackoff().Delay(i)
 			continue

pkg/rest/client.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"github.com/apache/servicecomb-service-center/pkg/tlsutil"
 	"github.com/apache/servicecomb-service-center/pkg/util"
+	"golang.org/x/net/context"
 	"net/http"
 	"net/url"
 	"os"
@@ -64,7 +65,7 @@ type URLClient struct {
 	Cfg URLClientOption
 }
 
-func (client *URLClient) HttpDo(method string, rawURL string, headers http.Header, body []byte) (resp *http.Response, err error) {
+func (client *URLClient) HttpDoWithContext(ctx context.Context, method string, rawURL string, headers http.Header, body []byte) (resp *http.Response, err error) {
 	if strings.HasPrefix(rawURL, "https") {
 		if transport, ok := client.Client.Transport.(*http.Transport); ok {
 			transport.TLSClientConfig = client.TLS
@@ -93,6 +94,7 @@ func (client *URLClient) HttpDo(method string, rawURL string, headers http.Heade
 	if err != nil {
 		return nil, errors.New(fmt.Sprintf("create request failed: %s", err.Error()))
 	}
+	req = req.WithContext(ctx)
 	req.Header = headers
 
 	resp, err = client.Client.Do(req)
@@ -122,6 +124,10 @@ func (client *URLClient) HttpDo(method string, rawURL string, headers http.Heade
 	return resp, nil
 }
 
+func (client *URLClient) HttpDo(method string, rawURL string, headers http.Header, body []byte) (resp *http.Response, err error) {
+	return client.HttpDoWithContext(context.Background(), method, rawURL, headers, body)
+}
+
 func setOptionDefaultValue(o *URLClientOption) URLClientOption {
 	if o == nil {
 		return defaultURLClientOption

pkg/util/util.go

@@ -147,3 +147,11 @@ func ResetTimer(timer *time.Timer, d time.Duration) {
 	}
 	timer.Reset(d)
 }
+
+func StringTRUE(s string) bool {
+	s = strings.ToLower(strings.TrimSpace(s))
+	if s == "1" || s == "true" {
+		return true
+	}
+	return false
+}

scctl/pkg/plugin/diagnose/diagnose.go

@@ -65,7 +65,7 @@ func DiagnoseCommandFunc(_ *cobra.Command, args []string) {
 	}
 
 	// query sc
-	cache, scErr := scClient.GetScCache()
+	cache, scErr := scClient.GetScCache(context.Background())
 	if scErr != nil {
 		cmd.StopAndExit(cmd.ExitError, scErr)
 	}

scctl/pkg/plugin/get/cluster/cluster_cmd.go

@@ -21,6 +21,7 @@ import (
 	"github.com/apache/servicecomb-service-center/scctl/pkg/plugin/get"
 	"github.com/apache/servicecomb-service-center/scctl/pkg/writer"
 	"github.com/spf13/cobra"
+	"golang.org/x/net/context"
 )
 
 func init() {
@@ -43,7 +44,7 @@ func ClusterCommandFunc(_ *cobra.Command, args []string) {
 	if err != nil {
 		cmd.StopAndExit(cmd.ExitError, err)
 	}
-	clusters, scErr := scClient.GetClusters()
+	clusters, scErr := scClient.GetClusters(context.Background())
 	if scErr != nil {
 		cmd.StopAndExit(cmd.ExitError, scErr)
 	}