servicecomb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] little-cui closed pull request #293: SCB-362 Govern service should not show the shared micro-services
Date Fri, 02 Mar 2018 02:42:54 GMT
little-cui closed pull request #293: SCB-362 Govern service should not show the shared micro-services
URL: https://github.com/apache/incubator-servicecomb-service-center/pull/293
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pkg/validate/url.go b/pkg/validate/url.go
index 1f7f8e0e..f41eaa4e 100644
--- a/pkg/validate/url.go
+++ b/pkg/validate/url.go
@@ -54,7 +54,7 @@ func IsURL(str string) bool {
 }
 
 func IsRequestURI(uri string) bool {
-	if uri == "" || len(uri) >= 2048 || len(uri) <= 3 || strings.HasPrefix(uri, ".") {
+	if uri == "" || len(uri) >= 2048 || strings.HasPrefix(uri, ".") {
 		return false
 	}
 	if strings.HasSuffix(uri, ";") || strings.HasSuffix(uri, "&") || strings.HasSuffix(uri, "?") || strings.HasSuffix(uri, "+") || strings.HasSuffix(uri, "@") || strings.Contains(uri, "//") {
diff --git a/server/core/proto/services.pb.go b/server/core/proto/services.pb.go
index c073b68b..bac1bf42 100644
--- a/server/core/proto/services.pb.go
+++ b/server/core/proto/services.pb.go
@@ -2469,7 +2469,9 @@ func (m *CreateDependenciesResponse) GetResponse() *Response {
 }
 
 type GetDependenciesRequest struct {
-	ServiceId string `protobuf:"bytes,1,opt,name=serviceId" json:"serviceId,omitempty"`
+	ServiceId  string `protobuf:"bytes,1,opt,name=serviceId" json:"serviceId,omitempty"`
+	SameDomain bool   `protobuf:"varint,2,opt,name=sameDomain" json:"sameDomain,omitempty"`
+	NoSelf     bool   `protobuf:"varint,3,opt,name=noSelf" json:"noSelf,omitempty"`
 }
 
 func (m *GetDependenciesRequest) Reset()                    { *m = GetDependenciesRequest{} }
@@ -2484,6 +2486,20 @@ func (m *GetDependenciesRequest) GetServiceId() string {
 	return ""
 }
 
+func (m *GetDependenciesRequest) GetSameDomain() bool {
+	if m != nil {
+		return m.SameDomain
+	}
+	return false
+}
+
+func (m *GetDependenciesRequest) GetNoSelf() bool {
+	if m != nil {
+		return m.NoSelf
+	}
+	return false
+}
+
 type GetConDependenciesResponse struct {
 	Response  *Response       `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
 	Providers []*MicroService `protobuf:"bytes,2,rep,name=providers" json:"providers,omitempty"`
@@ -4202,219 +4218,220 @@ var _GovernServiceCtrl_serviceDesc = grpc.ServiceDesc{
 func init() { proto1.RegisterFile("services.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 3412 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xdb, 0x8f, 0x1c, 0xc5,
-	0xd5, 0x57, 0xcd, 0xce, 0xec, 0xec, 0x9c, 0xbd, 0xd8, 0x5b, 0xde, 0xf5, 0xb6, 0x07, 0x3e, 0x3e,
-	0xab, 0x85, 0xf4, 0xf1, 0x80, 0xf6, 0x83, 0xe5, 0x03, 0xfc, 0x19, 0x1b, 0xb3, 0x17, 0xb3, 0x5e,
-	0x83, 0xb1, 0xe9, 0x59, 0xec, 0x00, 0x49, 0x50, 0xef, 0x4c, 0xed, 0x4c, 0xe3, 0x99, 0xee, 0xa6,
-	0xbb, 0x67, 0xcd, 0x48, 0x91, 0x22, 0x10, 0x24, 0x24, 0x24, 0x10, 0x94, 0xe4, 0x89, 0x87, 0x44,
-	0x49, 0x78, 0x4c, 0xa4, 0x44, 0x91, 0x50, 0x84, 0x12, 0x45, 0x89, 0xf2, 0x06, 0x8f, 0x51, 0x9e,
-	0x92, 0xf7, 0x48, 0x79, 0xcb, 0x1f, 0x90, 0xa8, 0x2e, 0xdd, 0x5d, 0x7d, 0xd9, 0x75, 0x5f, 0xb6,
-	0x41, 0x79, 0xda, 0xae, 0xea, 0xa9, 0x53, 0xa7, 0xea, 0x5c, 0xea, 0x9c, 0x5f, 0x9d, 0x6d, 0x58,
-	0x70, 0x89, 0x73, 0x60, 0x74, 0x89, 0xbb, 0x6a, 0x3b, 0x96, 0x67, 0xe1, 0xff, 0xe9, 0x5a, 0xa3,
-	0xd5, 0xc1, 0x58, 0xbf, 0x43, 0x8c, 0x55, 0x5b, 0xd7, 0xdd, 0xd5, 0xae, 0x4b, 0x56, 0xc5, 0x6f,
-	0x1c, 0xd2, 0x37, 0x5c, 0xcf, 0x99, 0xac, 0xea, 0xb6, 0xa1, 0x7e, 0x1d, 0x96, 0xae, 0x59, 0x3d,
-	0x63, 0x7f, 0xd2, 0xe9, 0x0e, 0xc8, 0x48, 0x77, 0x35, 0xf2, 0xda, 0x98, 0xb8, 0x1e, 0xbe, 0x17,
-	0x5a, 0xe2, 0xe7, 0x3b, 0x3d, 0x05, 0x9d, 0x45, 0x0f, 0xb4, 0xb4, 0xb0, 0x03, 0xef, 0x40, 0xd3,
-	0xe5, 0xbf, 0x57, 0x6a, 0x67, 0xa7, 0x1e, 0x98, 0x5d, 0xfb, 0xdf, 0xd5, 0x8c, 0x13, 0xae, 0xf2,
-	0x79, 0x34, 0x7f, 0xbc, 0x7a, 0x13, 0xa6, 0x79, 0x17, 0x6e, 0xc3, 0x0c, 0xef, 0x0c, 0x66, 0x0c,
-	0xda, 0x58, 0x81, 0xa6, 0x3b, 0x1e, 0x8d, 0x74, 0x67, 0xa2, 0xd4, 0xd8, 0x2b, 0xbf, 0x89, 0x4f,
-	0xc3, 0x34, 0xff, 0x95, 0x32, 0xc5, 0x5e, 0x88, 0x96, 0xba, 0x0f, 0xcb, 0xb1, 0x85, 0xb9, 0xb6,
-	0x65, 0xba, 0x04, 0x5f, 0x83, 0x19, 0x47, 0x3c, 0xb3, 0x69, 0x66, 0xd7, 0x1e, 0xce, 0xcc, 0xbc,
-	0x4f, 0x44, 0x0b, 0x48, 0xa8, 0xaf, 0xc1, 0xa9, 0x2b, 0x44, 0x77, 0xbc, 0x3d, 0xa2, 0x7b, 0x1d,
-	0xe2, 0xf9, 0xfb, 0xf7, 0x12, 0xb4, 0x0c, 0xd3, 0xf5, 0x74, 0xb3, 0x4b, 0x5c, 0x05, 0xb1, 0x3d,
-	0xba, 0x90, 0x79, 0x1a, 0x99, 0xe0, 0xe5, 0x21, 0x19, 0x11, 0xd3, 0xd3, 0x42, 0x72, 0x6a, 0x27,
-	0x3a, 0xa5, 0xf8, 0xc5, 0x5d, 0x44, 0x76, 0x1f, 0x80, 0x4f, 0x61, 0xa7, 0x27, 0x36, 0x51, 0xea,
-	0x51, 0x3f, 0x41, 0xb0, 0x14, 0x5d, 0x48, 0x25, 0xfb, 0x85, 0x77, 0xe5, 0x8d, 0xe1, 0xca, 0xf3,
-	0x58, 0x66, 0x7a, 0x3b, 0x62, 0xe4, 0x95, 0x3d, 0xcd, 0x8d, 0x6c, 0xc9, 0x08, 0xe6, 0x23, 0xef,
-	0xca, 0x6d, 0x06, 0x7d, 0x4f, 0x1c, 0xe7, 0x1a, 0x71, 0x5d, 0xbd, 0x4f, 0x84, 0x62, 0x49, 0x3d,
-	0xea, 0x26, 0xb4, 0x3a, 0x5e, 0x87, 0x93, 0xc3, 0x4b, 0xd0, 0xe8, 0x5a, 0x63, 0xd3, 0x63, 0xd3,
-	0x4c, 0x69, 0xbc, 0x81, 0xcf, 0xc2, 0xac, 0x65, 0x0e, 0x0d, 0x93, 0x6c, 0xb2, 0x77, 0x35, 0xf6,
-	0x4e, 0xee, 0x52, 0x55, 0x80, 0x8e, 0xe7, 0x73, 0x9d, 0x4e, 0x45, 0xfd, 0x2f, 0x68, 0x74, 0xbc,
-	0x75, 0xdb, 0x3e, 0xe4, 0xf5, 0x3f, 0x11, 0xa5, 0xa1, 0x7b, 0x86, 0xeb, 0x19, 0x5d, 0x17, 0x3f,
-	0x07, 0x33, 0xbe, 0x1f, 0x10, 0xa2, 0x5a, 0xcb, 0x6e, 0x97, 0xfe, 0x7a, 0xb4, 0x80, 0x06, 0x7e,
-	0x3e, 0x2a, 0x2b, 0x4a, 0xf0, 0x91, 0x1c, 0x04, 0xfd, 0xb5, 0x49, 0x82, 0xc2, 0x1b, 0x50, 0xd7,
-	0x6d, 0xdb, 0x65, 0x7b, 0x3a, 0xbb, 0xb6, 0x9a, 0x83, 0xda, 0xba, 0x6d, 0x6b, 0x6c, 0xac, 0xfa,
-	0x0e, 0x82, 0xd3, 0xdb, 0xc4, 0xe7, 0xd7, 0xdd, 0x31, 0xf7, 0x2d, 0xdf, 0xec, 0x14, 0x68, 0x5a,
-	0xb6, 0x67, 0x58, 0x26, 0x37, 0xba, 0x96, 0xe6, 0x37, 0xe9, 0x06, 0xea, 0xb6, 0x1d, 0x48, 0x9b,
-	0x37, 0xa8, 0x94, 0xc4, 0x6c, 0xcf, 0xe9, 0x23, 0x5f, 0xd2, 0x72, 0x17, 0x55, 0x24, 0xb6, 0xd7,
-	0xd7, 0xcd, 0xe1, 0x44, 0xa9, 0x9f, 0x45, 0x0f, 0xcc, 0x68, 0x61, 0x87, 0xfa, 0xd3, 0x1a, 0xac,
-	0x24, 0x58, 0xa9, 0xc6, 0x70, 0x7a, 0xb0, 0xa8, 0x0f, 0x87, 0xfe, 0x4c, 0x5b, 0xc4, 0xd3, 0x8d,
-	0x61, 0x6e, 0x03, 0x12, 0xc3, 0xf9, 0x68, 0x2d, 0x49, 0x10, 0x77, 0x00, 0xdc, 0x40, 0xa1, 0x84,
-	0x94, 0xf2, 0xc8, 0xdc, 0x1f, 0xaa, 0x49, 0x64, 0xd4, 0xcf, 0x10, 0x9c, 0xb8, 0x66, 0x74, 0x1d,
-	0x4b, 0x4c, 0xf6, 0x0c, 0x61, 0x7e, 0xdb, 0x23, 0xa6, 0x2e, 0x34, 0xba, 0xa5, 0x89, 0x16, 0x95,
-	0xa0, 0xed, 0x58, 0xaf, 0x92, 0xae, 0xe7, 0x7b, 0x7a, 0xd1, 0x0c, 0x25, 0x38, 0x75, 0x84, 0x04,
-	0xeb, 0x49, 0x09, 0x2a, 0xd0, 0x3c, 0x20, 0x8e, 0x6b, 0x58, 0xa6, 0xd2, 0xe0, 0x14, 0x45, 0x93,
-	0x8e, 0x25, 0xe6, 0x81, 0xe1, 0x58, 0x26, 0x75, 0xa0, 0xca, 0x34, 0x1f, 0x2b, 0x75, 0xb1, 0x39,
-	0x87, 0x86, 0xee, 0x2a, 0x4d, 0x31, 0x27, 0x6d, 0xa8, 0x9f, 0x36, 0x61, 0x4e, 0x5e, 0xcf, 0x5d,
-	0xbc, 0x4d, 0x51, 0xd5, 0x93, 0x18, 0xaf, 0x27, 0x18, 0xef, 0x11, 0xb7, 0xeb, 0x18, 0x4c, 0xb9,
-	0xc5, 0xb2, 0xe4, 0x2e, 0x3a, 0xe7, 0x90, 0x1c, 0x90, 0xa1, 0x58, 0x14, 0x6f, 0xb0, 0x63, 0x54,
-	0x9c, 0xdb, 0x4d, 0x6e, 0x1e, 0xa2, 0x89, 0xaf, 0x42, 0xc3, 0xd6, 0xbd, 0x81, 0xab, 0x00, 0xd3,
-	0xa8, 0xff, 0xcb, 0xab, 0x51, 0x37, 0x74, 0x6f, 0xa0, 0x71, 0x12, 0xec, 0x48, 0xf6, 0x74, 0x6f,
-	0xec, 0x2a, 0x33, 0xe2, 0x48, 0x66, 0x2d, 0x4c, 0x00, 0x6c, 0xc7, 0xb2, 0x89, 0xe3, 0x19, 0xc4,
-	0x55, 0x5a, 0x6c, 0xa2, 0xcb, 0x99, 0x27, 0x92, 0x37, 0x7c, 0xf5, 0x46, 0x40, 0xe7, 0xb2, 0xe9,
-	0x39, 0x13, 0x4d, 0x22, 0x4c, 0x85, 0xe1, 0x19, 0x23, 0xe2, 0x7a, 0xfa, 0xc8, 0x56, 0x66, 0xb9,
-	0x30, 0x82, 0x0e, 0x7c, 0x13, 0x5a, 0xb6, 0x63, 0x1d, 0x18, 0x3d, 0xe2, 0xb8, 0xca, 0x1c, 0xe3,
-	0xe1, 0x5c, 0x21, 0x1e, 0x9e, 0x21, 0x13, 0x2d, 0x24, 0x15, 0x6a, 0xca, 0xbc, 0xa4, 0x29, 0x74,
-	0xc9, 0xcf, 0x6e, 0x74, 0x3c, 0x47, 0xf7, 0x48, 0x7f, 0xa2, 0x2c, 0x94, 0x59, 0x72, 0x48, 0x47,
-	0x2c, 0x39, 0xec, 0xc0, 0x2a, 0xcc, 0x8d, 0xac, 0xde, 0x6e, 0xb0, 0xea, 0x13, 0x8c, 0x87, 0x48,
-	0x5f, 0x5c, 0xd9, 0x4f, 0x26, 0x95, 0xfd, 0x3e, 0x00, 0x3e, 0x3d, 0x71, 0x36, 0x26, 0xca, 0x22,
-	0x3f, 0xf5, 0xc2, 0x1e, 0xfc, 0x25, 0x68, 0xed, 0x3b, 0xfa, 0x88, 0xdc, 0xb1, 0x9c, 0xdb, 0x0a,
-	0x66, 0xae, 0xe1, 0x7c, 0xe6, 0xb5, 0x3c, 0x4d, 0x47, 0xde, 0xb2, 0x9c, 0xdb, 0x42, 0x74, 0x13,
-	0x2d, 0x24, 0xd6, 0xbe, 0x08, 0x27, 0x62, 0x12, 0xc5, 0x27, 0x61, 0xea, 0x36, 0x99, 0x08, 0x63,
-	0xa2, 0x8f, 0x74, 0x87, 0x0f, 0xf4, 0xe1, 0x98, 0xf8, 0x66, 0xc4, 0x1a, 0xe7, 0x6b, 0xe7, 0x10,
-	0x1d, 0x1e, 0xdb, 0x9d, 0x3c, 0xc3, 0xd5, 0x75, 0x58, 0x4c, 0x70, 0x87, 0x31, 0xd4, 0x4d, 0x6a,
-	0x97, 0x9c, 0x02, 0x7b, 0x96, 0x0d, 0xb2, 0x16, 0x31, 0x48, 0xf5, 0xaf, 0x08, 0x66, 0xfd, 0xf3,
-	0x73, 0x3c, 0x24, 0xd4, 0x04, 0x9c, 0xf1, 0x30, 0xf4, 0x06, 0xa2, 0x45, 0x63, 0x5c, 0xfa, 0xb4,
-	0x3b, 0xb1, 0x7d, 0x3e, 0x82, 0x36, 0xd5, 0x5b, 0xdd, 0xf3, 0x1c, 0x63, 0x6f, 0xec, 0xf9, 0xee,
-	0x20, 0xec, 0x60, 0x7e, 0x51, 0xf7, 0x3c, 0xe2, 0x04, 0xce, 0x40, 0x34, 0x33, 0x38, 0x83, 0x88,
-	0x45, 0x4c, 0xc7, 0x2d, 0x22, 0xae, 0x3c, 0xcd, 0xa4, 0xf2, 0xa8, 0xef, 0x21, 0x38, 0xbd, 0xde,
-	0xeb, 0x5d, 0x77, 0x5e, 0xb0, 0x7b, 0xba, 0x47, 0xe4, 0xa5, 0xca, 0x4b, 0x42, 0x47, 0x2d, 0xa9,
-	0x76, 0xc4, 0x92, 0xa6, 0x8e, 0x5c, 0x52, 0x3d, 0xb1, 0x24, 0xf5, 0x77, 0xe1, 0x86, 0x53, 0xd7,
-	0x43, 0xc5, 0x45, 0x9d, 0x8f, 0x2f, 0x2e, 0xfa, 0x8c, 0xbf, 0x0a, 0x33, 0xc2, 0x2d, 0x4c, 0xc4,
-	0x41, 0xb9, 0x51, 0xc4, 0xad, 0xf9, 0xce, 0x46, 0xd8, 0x5d, 0x40, 0xb3, 0xfd, 0x04, 0xcc, 0x47,
-	0x5e, 0xe5, 0x52, 0xba, 0x73, 0x30, 0x13, 0x44, 0x0a, 0x18, 0xea, 0x5d, 0xab, 0xc7, 0xb7, 0xaf,
-	0xa1, 0xb1, 0x67, 0xba, 0x39, 0x23, 0x11, 0x7f, 0x0a, 0x5d, 0x13, 0x4d, 0xf5, 0x2f, 0x08, 0x4e,
-	0x6d, 0x13, 0xef, 0xf2, 0xeb, 0xd4, 0x2e, 0x69, 0x78, 0x25, 0x62, 0x1f, 0x0c, 0x75, 0x2f, 0x14,
-	0x02, 0x7b, 0xae, 0xe0, 0xe8, 0x89, 0x1c, 0x75, 0x8d, 0xf8, 0x51, 0x27, 0xe7, 0x70, 0xd3, 0xb1,
-	0x1c, 0x2e, 0xe6, 0x80, 0x9a, 0x09, 0x07, 0xa4, 0xfe, 0x06, 0xc1, 0x52, 0x74, 0x65, 0xd5, 0x84,
-	0x52, 0x91, 0x35, 0xd4, 0x8e, 0x5a, 0xc3, 0xd4, 0xe1, 0x79, 0x68, 0x3d, 0x92, 0x87, 0xaa, 0xbf,
-	0x9c, 0x82, 0xa5, 0x4d, 0x87, 0x48, 0xc6, 0x21, 0xc4, 0x72, 0x1d, 0x9a, 0x82, 0xb6, 0x60, 0xfd,
-	0xd1, 0x42, 0xfe, 0x5f, 0xf3, 0xa9, 0xe0, 0x17, 0xa0, 0x41, 0x0d, 0xcc, 0xcf, 0x9e, 0x2e, 0x65,
-	0x26, 0x97, 0x6e, 0xc0, 0x1a, 0xa7, 0x86, 0x5f, 0x86, 0xba, 0xa7, 0xf7, 0x69, 0xcc, 0x47, 0xa9,
-	0x6e, 0x67, 0xa6, 0x9a, 0xb6, 0xe8, 0xd5, 0x5d, 0xbd, 0x2f, 0x4e, 0x66, 0x46, 0x14, 0xbf, 0x2c,
-	0x67, 0x12, 0x75, 0x36, 0xc3, 0xc5, 0x42, 0xdb, 0x90, 0x92, 0x53, 0xb4, 0x1f, 0x87, 0x56, 0x30,
-	0x5f, 0x2e, 0x1b, 0x7c, 0x0b, 0xc1, 0x72, 0x8c, 0xfd, 0x2f, 0x40, 0xe1, 0xd4, 0xab, 0xb0, 0xb4,
-	0x45, 0x86, 0x24, 0xa1, 0x39, 0x77, 0x8d, 0x2a, 0xf7, 0x2d, 0xa7, 0xcb, 0x97, 0x35, 0xa3, 0xf1,
-	0x86, 0xba, 0x0f, 0xcb, 0x31, 0x5a, 0xd5, 0xc0, 0x1e, 0x0f, 0xc3, 0x62, 0x98, 0xf7, 0x64, 0x62,
-	0x58, 0xfd, 0x35, 0x02, 0x2c, 0x8f, 0xa9, 0x66, 0xab, 0x25, 0x73, 0xab, 0x1d, 0x87, 0xb9, 0xa9,
-	0x4b, 0x32, 0xd7, 0x3e, 0x3e, 0xa6, 0x7e, 0xcc, 0x9d, 0x70, 0xd8, 0x5d, 0xcd, 0x6a, 0x9e, 0x97,
-	0x32, 0x7a, 0x6e, 0xee, 0x05, 0x97, 0x13, 0x90, 0x51, 0xff, 0x81, 0xe0, 0x4c, 0xc4, 0x09, 0xd0,
-	0x33, 0x2c, 0x23, 0xee, 0xe7, 0x44, 0x22, 0x78, 0xce, 0x90, 0x96, 0x99, 0xa1, 0x43, 0x67, 0x3d,
-	0x2a, 0x9c, 0x2f, 0x19, 0x1b, 0xaa, 0xb7, 0xa1, 0x9d, 0x36, 0x6f, 0x35, 0x56, 0xf1, 0x98, 0x0c,
-	0x4c, 0x50, 0xe7, 0xea, 0x66, 0x36, 0x8d, 0x95, 0xc4, 0xc0, 0x6a, 0x34, 0xea, 0x6a, 0xf4, 0xf4,
-	0xc8, 0x9d, 0xe8, 0x49, 0x47, 0x86, 0xfa, 0x11, 0x02, 0x25, 0x79, 0x9e, 0x64, 0xd2, 0xa4, 0x30,
-	0x40, 0xae, 0x45, 0x02, 0xe4, 0x0e, 0xd4, 0xe9, 0x93, 0x40, 0x1e, 0x4a, 0x9f, 0x6d, 0x8c, 0x98,
-	0xfa, 0x6a, 0x4c, 0xe3, 0x39, 0x9b, 0xd5, 0xa8, 0xc0, 0x77, 0x79, 0xa4, 0x9c, 0x5b, 0x07, 0x2a,
-	0x3a, 0xd6, 0xd5, 0x37, 0x11, 0xac, 0x24, 0xf8, 0xa9, 0x46, 0xb5, 0x14, 0x68, 0x6a, 0x4c, 0x8a,
-	0x7c, 0x0d, 0x2d, 0xcd, 0x6f, 0xaa, 0x1d, 0x38, 0x13, 0x3d, 0x95, 0xb2, 0x6f, 0x8b, 0x02, 0x4d,
-	0x27, 0x4a, 0x54, 0x34, 0xa9, 0x65, 0xa7, 0x11, 0xad, 0x46, 0xac, 0x8f, 0xc2, 0x72, 0x68, 0xa0,
-	0x34, 0xda, 0xc8, 0x66, 0xd8, 0xff, 0x8a, 0x40, 0x95, 0x7c, 0x5c, 0x35, 0x9b, 0xff, 0x15, 0x11,
-	0xbe, 0x71, 0xed, 0xd9, 0xc9, 0x4c, 0x2a, 0x9d, 0xbb, 0x78, 0x00, 0x57, 0x3c, 0xc6, 0x7a, 0x05,
-	0x56, 0x22, 0xba, 0xb9, 0xab, 0xf7, 0xb3, 0x09, 0x5e, 0x4c, 0x52, 0x4b, 0x99, 0x64, 0x4a, 0x9a,
-	0x44, 0x35, 0x62, 0x3e, 0x88, 0x4d, 0x50, 0x8d, 0x12, 0x7c, 0x8a, 0x60, 0x39, 0xb4, 0xa5, 0xcc,
-	0x5a, 0x80, 0xbf, 0x1c, 0x91, 0xcd, 0x95, 0x3c, 0x96, 0x9d, 0x9c, 0xeb, 0xf8, 0x44, 0xd3, 0x97,
-	0x3d, 0x55, 0x85, 0xba, 0xa9, 0x3e, 0x0b, 0x4a, 0xc4, 0x52, 0xb3, 0xef, 0x1c, 0x86, 0xfa, 0x6d,
-	0x32, 0xf1, 0x4d, 0x9f, 0x3d, 0x53, 0x6f, 0x9e, 0x42, 0xad, 0x1a, 0xce, 0x27, 0x30, 0x7b, 0x85,
-	0xe8, 0x43, 0x6f, 0xb0, 0x39, 0x20, 0xdd, 0xdb, 0x94, 0x9d, 0x91, 0x9f, 0xa8, 0xb7, 0x34, 0xf6,
-	0xcc, 0x90, 0x07, 0xcb, 0xe1, 0x68, 0x75, 0x43, 0x63, 0xcf, 0x34, 0x85, 0x34, 0x4c, 0x8f, 0x38,
-	0x07, 0xfa, 0x90, 0x29, 0x6b, 0x43, 0x0b, 0xda, 0x54, 0x1e, 0x0c, 0x7b, 0x61, 0x09, 0x64, 0x43,
-	0xe3, 0x0d, 0x2a, 0xb7, 0xb1, 0x33, 0x14, 0x09, 0x35, 0x7d, 0x54, 0xff, 0x5e, 0x87, 0xa5, 0xb4,
-	0xcc, 0x27, 0x76, 0x79, 0x85, 0x12, 0x97, 0x57, 0x47, 0x67, 0xb7, 0xf7, 0x42, 0x8b, 0x98, 0x3d,
-	0xdb, 0x32, 0x4c, 0x8f, 0xe7, 0x7a, 0x2d, 0x2d, 0xec, 0xa0, 0x8c, 0x0f, 0x2c, 0xd7, 0x93, 0xa0,
-	0xf4, 0xa0, 0x2d, 0xc1, 0xba, 0x8d, 0x08, 0xac, 0x3b, 0x8a, 0x04, 0x85, 0xd3, 0x4c, 0xc7, 0xaf,
-	0x95, 0x4a, 0xee, 0x8e, 0x84, 0x77, 0x6f, 0xc2, 0xec, 0x20, 0x14, 0x09, 0x83, 0x11, 0xf2, 0x84,
-	0x31, 0x92, 0x38, 0x35, 0x99, 0x50, 0x14, 0x24, 0x9b, 0x89, 0x83, 0x64, 0xaf, 0xc0, 0x42, 0x4f,
-	0xf7, 0xf4, 0x4d, 0x42, 0xc5, 0xb8, 0x63, 0xee, 0x5b, 0x4a, 0x8b, 0x4d, 0xfc, 0x78, 0xe6, 0x89,
-	0xb7, 0x22, 0xc3, 0xb5, 0x18, 0xb9, 0x04, 0x0a, 0x07, 0x29, 0x10, 0xae, 0x84, 0xca, 0xcc, 0x46,
-	0x50, 0x99, 0xb2, 0x41, 0xf2, 0x1e, 0x2c, 0x44, 0xd9, 0x4b, 0x85, 0x3f, 0x69, 0xcc, 0x46, 0xfa,
-	0x21, 0xfa, 0x29, 0x5a, 0xf8, 0x7e, 0x98, 0xd7, 0x0f, 0x74, 0x63, 0xa8, 0xef, 0x0d, 0xc9, 0x4b,
-	0x96, 0xe9, 0xfb, 0xe7, 0x68, 0xa7, 0x7a, 0x0b, 0x56, 0xd2, 0x64, 0xfd, 0x0c, 0x99, 0x94, 0xd3,
-	0x68, 0xd5, 0x83, 0x15, 0x4d, 0x80, 0xd4, 0x01, 0x3a, 0x20, 0x9c, 0xcb, 0x8b, 0xd4, 0x0e, 0x79,
-	0x97, 0xf0, 0x06, 0x25, 0x51, 0x87, 0x80, 0x9c, 0xfa, 0x2d, 0x04, 0x4a, 0x72, 0xda, 0x6a, 0xce,
-	0xf6, 0xbb, 0xdd, 0xdd, 0xbf, 0x08, 0x67, 0x5e, 0x30, 0x9d, 0x43, 0xf6, 0xa0, 0x5c, 0x59, 0x00,
-	0x4d, 0x9f, 0x52, 0x48, 0x57, 0xe3, 0x6d, 0x6f, 0xc0, 0xc9, 0xa0, 0x04, 0xe1, 0x78, 0xd8, 0xdf,
-	0x83, 0x45, 0x89, 0x62, 0x35, 0x5c, 0xff, 0x0a, 0xc1, 0xd2, 0xd3, 0x86, 0xd9, 0xf3, 0x77, 0x27,
-	0x38, 0xda, 0x1e, 0x84, 0xc5, 0xae, 0x65, 0xba, 0xe3, 0x11, 0x71, 0x3a, 0xb1, 0x25, 0x24, 0x5f,
-	0x14, 0x86, 0x6a, 0xcf, 0xc2, 0xac, 0xf0, 0x02, 0x34, 0x00, 0xf6, 0xb1, 0x72, 0xa9, 0x8b, 0x01,
-	0xc3, 0x34, 0xfc, 0x68, 0xf0, 0x43, 0x94, 0x3e, 0xab, 0x7f, 0x44, 0xb0, 0x1c, 0x63, 0xba, 0x1a,
-	0xdd, 0x7d, 0x39, 0x59, 0xef, 0x71, 0x6c, 0xc8, 0x9f, 0xfa, 0x31, 0x62, 0x61, 0xf9, 0x75, 0x93,
-	0xc4, 0xb5, 0x3e, 0xdf, 0xde, 0x3f, 0x08, 0x8b, 0xfe, 0x4d, 0x5e, 0x27, 0xe6, 0x68, 0x92, 0x2f,
-	0xf0, 0x2a, 0x60, 0xbf, 0x73, 0x27, 0x54, 0x3e, 0x2e, 0x9a, 0x94, 0x37, 0xc1, 0xfe, 0xd7, 0xa5,
-	0xfd, 0xff, 0x03, 0x4f, 0x0c, 0x22, 0x9c, 0x57, 0x23, 0x00, 0xd9, 0x07, 0xd6, 0x8e, 0xd7, 0x07,
-	0xbe, 0xcd, 0x41, 0xb0, 0x92, 0x8a, 0x9f, 0x6f, 0xf3, 0xb1, 0x04, 0x53, 0x4b, 0x9b, 0xb9, 0x14,
-	0xe5, 0xe3, 0x3f, 0x50, 0x97, 0x5d, 0xb8, 0x87, 0xe7, 0x31, 0xfe, 0xcb, 0x0e, 0x0b, 0xaf, 0x8e,
-	0xc5, 0x0f, 0x4a, 0xb1, 0xdb, 0x94, 0x1c, 0xbb, 0xa9, 0x23, 0xb8, 0x37, 0x7d, 0xd2, 0x6a, 0x5c,
-	0xe5, 0x7b, 0x35, 0x1f, 0x8d, 0xf3, 0xe7, 0xcb, 0x01, 0x3e, 0xde, 0x6d, 0x8d, 0x6e, 0x24, 0x0e,
-	0xe5, 0xd7, 0x18, 0x9d, 0x9c, 0xe0, 0x64, 0x1a, 0x5b, 0x55, 0xa2, 0x93, 0xc3, 0xb8, 0xd0, 0x2b,
-	0x85, 0x27, 0x2f, 0xc0, 0xd2, 0x2d, 0xdd, 0xeb, 0x0e, 0xe2, 0xce, 0xf2, 0x7e, 0x98, 0x77, 0xc9,
-	0x70, 0x3f, 0x6e, 0xab, 0xd1, 0x4e, 0xf5, 0xa3, 0x1a, 0x2c, 0xc7, 0x86, 0x57, 0x63, 0x66, 0xa7,
-	0x61, 0x5a, 0xef, 0x7a, 0x52, 0x9c, 0xc9, 0x5b, 0xf8, 0x2a, 0xdf, 0x58, 0x0e, 0x0d, 0x16, 0x2f,
-	0xda, 0x60, 0x22, 0x91, 0xbd, 0x62, 0xfd, 0x78, 0xbd, 0xe2, 0xb3, 0x70, 0x72, 0x9b, 0x78, 0xa2,
-	0xce, 0x35, 0x93, 0x66, 0xcb, 0x37, 0x8e, 0xb5, 0xe8, 0x8d, 0xa3, 0xda, 0x61, 0x2e, 0x76, 0x7d,
-	0x38, 0xcc, 0x43, 0xf0, 0x3e, 0x80, 0x3b, 0x86, 0x37, 0xe0, 0x43, 0xc4, 0x05, 0x91, 0xd4, 0xa3,
-	0xfe, 0x18, 0xf1, 0xeb, 0x1b, 0x41, 0xb2, 0x32, 0x31, 0xba, 0x21, 0x03, 0x41, 0x65, 0x2e, 0xd3,
-	0x36, 0xf6, 0xd4, 0x11, 0x37, 0xa9, 0x22, 0x5d, 0x88, 0x74, 0xaa, 0xbf, 0xe0, 0x3e, 0x5d, 0x5a,
-	0x78, 0x35, 0x5c, 0x6e, 0x4b, 0x5c, 0x16, 0xaa, 0x64, 0xf6, 0x0b, 0x8e, 0xaf, 0xc3, 0x29, 0x01,
-	0x4b, 0x1c, 0x93, 0xe4, 0x49, 0x70, 0x2d, 0x58, 0xe5, 0x06, 0xa8, 0x6f, 0x20, 0x38, 0x25, 0x57,
-	0x4a, 0x97, 0x66, 0xfc, 0xb0, 0x92, 0xec, 0x23, 0x2e, 0xcf, 0x49, 0xb4, 0x0a, 0xbd, 0x3a, 0x34,
-	0xe7, 0xf4, 0x7a, 0xaf, 0xb7, 0x45, 0x6c, 0x62, 0xf6, 0x88, 0xd9, 0x35, 0xc2, 0x88, 0xe5, 0x15,
-	0x98, 0xeb, 0x49, 0xdd, 0xa2, 0x62, 0xfb, 0x89, 0xec, 0x97, 0xe0, 0x22, 0xaa, 0x09, 0x68, 0x4f,
-	0xb4, 0x08, 0x41, 0x75, 0xc0, 0x50, 0xf8, 0xe8, 0xd4, 0xd5, 0x2c, 0xf2, 0x6b, 0x70, 0x86, 0xdf,
-	0x69, 0x7f, 0x21, 0xeb, 0xfc, 0x1b, 0x02, 0x9c, 0xfc, 0x11, 0xde, 0x85, 0x19, 0x3f, 0xf0, 0x13,
-	0x6b, 0x2c, 0xee, 0xbf, 0x03, 0x4a, 0xd1, 0x5a, 0xbe, 0xda, 0xf1, 0xd5, 0xf2, 0xb5, 0x61, 0xc6,
-	0x3a, 0x20, 0x8e, 0x63, 0xf4, 0x78, 0xc6, 0x35, 0xa3, 0x05, 0x6d, 0x9a, 0x10, 0xa7, 0x6d, 0x6f,
-	0x95, 0xf7, 0x89, 0x69, 0x82, 0x3c, 0xfa, 0xda, 0xe1, 0xf7, 0x08, 0xda, 0xdb, 0xc4, 0xdb, 0xb4,
-	0xcc, 0xcf, 0x81, 0x4b, 0xdc, 0x49, 0x8a, 0xa1, 0xe0, 0x2d, 0x75, 0x48, 0xc7, 0x5f, 0xc2, 0x0d,
-	0xc7, 0xfa, 0x9c, 0x96, 0xe0, 0x6b, 0x55, 0xd9, 0x25, 0x04, 0x74, 0xd4, 0x9f, 0x4c, 0xc3, 0x7c,
-	0xa4, 0xe0, 0x1a, 0xbf, 0x08, 0x73, 0x23, 0xe9, 0xc7, 0xe5, 0x0a, 0x82, 0x22, 0xa4, 0x2a, 0xcd,
-	0x4d, 0xf0, 0xf3, 0x30, 0x2b, 0xbc, 0xbb, 0xb9, 0x6f, 0xf9, 0xb1, 0x75, 0xee, 0x93, 0x52, 0xa6,
-	0x11, 0xde, 0x43, 0xd7, 0x4b, 0xdf, 0x43, 0x47, 0x15, 0xb0, 0x71, 0x3c, 0x0a, 0x18, 0x55, 0x89,
-	0xe9, 0xe3, 0x51, 0x09, 0xbc, 0x2b, 0xb2, 0xd7, 0x26, 0xa3, 0xf7, 0x54, 0xb1, 0xba, 0xfd, 0x44,
-	0x75, 0xd5, 0x1a, 0x2c, 0xc9, 0xba, 0x70, 0x93, 0x63, 0x3f, 0xae, 0x32, 0xc3, 0x72, 0xe4, 0xd4,
-	0x77, 0xf8, 0x1a, 0x34, 0x59, 0x85, 0x7e, 0xd7, 0x15, 0x48, 0x76, 0xa1, 0x2a, 0x7f, 0x9f, 0x46,
-	0xf1, 0x4b, 0xa8, 0x4f, 0x10, 0x28, 0xe1, 0x1d, 0xa4, 0xf8, 0xc7, 0x84, 0x8a, 0xac, 0xfc, 0x46,
-	0xbc, 0x36, 0xa8, 0xe8, 0x3f, 0x4e, 0x04, 0xc5, 0x41, 0x57, 0x01, 0x6f, 0x91, 0x61, 0xac, 0x38,
-	0x88, 0x86, 0xdf, 0x81, 0x2f, 0xf6, 0xff, 0x11, 0x45, 0xea, 0x39, 0xa4, 0x74, 0x4b, 0x8b, 0xd2,
-	0x72, 0x6d, 0x06, 0xc4, 0x47, 0xff, 0x15, 0x09, 0xc5, 0xff, 0x15, 0xe9, 0x2e, 0xd8, 0xf8, 0x6f,
-	0x11, 0x8b, 0x4a, 0xab, 0x2e, 0x53, 0xba, 0x95, 0x28, 0x53, 0xca, 0x1e, 0x52, 0x24, 0xd7, 0x2c,
-	0x15, 0x2b, 0xad, 0xc1, 0x02, 0x4d, 0x02, 0xec, 0x10, 0x23, 0x88, 0x55, 0x91, 0xa2, 0x64, 0x15,
-	0xe9, 0xeb, 0x70, 0x22, 0x18, 0x53, 0x5d, 0x82, 0x6a, 0xdb, 0x61, 0x49, 0x82, 0x68, 0xad, 0xfd,
-	0xf9, 0x9e, 0xa0, 0x28, 0x79, 0xd3, 0x73, 0x86, 0xf8, 0x2d, 0x04, 0x0d, 0xf2, 0xba, 0xe1, 0x7a,
-	0xf8, 0x42, 0x9e, 0xfb, 0xf8, 0x78, 0x65, 0x6f, 0xfb, 0x62, 0xc1, 0xd1, 0x82, 0xdd, 0x6f, 0x22,
-	0x98, 0xee, 0xb2, 0x98, 0x05, 0x5f, 0x2c, 0x55, 0xd6, 0xd9, 0x7e, 0xb2, 0xe8, 0x70, 0x89, 0x93,
-	0x1e, 0xcb, 0x69, 0x72, 0x70, 0x92, 0x56, 0x1b, 0x99, 0x83, 0x93, 0xf4, 0x72, 0xc8, 0x37, 0x10,
-	0x4c, 0xf7, 0x19, 0xfe, 0x8a, 0xcf, 0x17, 0xa8, 0x95, 0xf0, 0xd9, 0x78, 0xa2, 0xd0, 0x58, 0xc1,
-	0xc3, 0x3b, 0x08, 0x66, 0xfb, 0x61, 0x0d, 0x21, 0x2e, 0x42, 0xcc, 0xb7, 0x8b, 0xf6, 0x85, 0x62,
-	0x83, 0x05, 0x2b, 0x1f, 0x22, 0x38, 0x39, 0x66, 0x40, 0x54, 0x88, 0x66, 0xe1, 0x8d, 0xf2, 0x95,
-	0x7d, 0xed, 0xcd, 0x52, 0x34, 0x04, 0x77, 0xdf, 0x41, 0xd0, 0xd4, 0x7b, 0x3d, 0x76, 0x99, 0x71,
-	0xa9, 0x40, 0xf5, 0x84, 0x5c, 0x6e, 0xd4, 0x7e, 0xaa, 0x38, 0x01, 0x89, 0x9d, 0x3e, 0xf1, 0x72,
-	0xb2, 0x93, 0x5e, 0x18, 0x98, 0x83, 0x9d, 0xc3, 0x0a, 0x04, 0xbf, 0x8f, 0x00, 0xb8, 0xec, 0x18,
-	0x47, 0xeb, 0xc5, 0x76, 0x5c, 0x2a, 0xdd, 0x6b, 0x6f, 0x94, 0x21, 0x21, 0xb8, 0xfa, 0x21, 0x02,
-	0xe0, 0xa6, 0xce, 0xb8, 0xda, 0x28, 0x68, 0xaf, 0xf2, 0x56, 0x6d, 0x96, 0xa2, 0x21, 0xf8, 0xfa,
-	0x36, 0xd7, 0x25, 0x1a, 0xac, 0xe0, 0x27, 0xcb, 0x55, 0xe2, 0xb4, 0x2f, 0x15, 0x1e, 0x2f, 0x31,
-	0xd3, 0x27, 0x5e, 0x4e, 0x66, 0x52, 0x0b, 0xd1, 0xda, 0x97, 0x4a, 0x96, 0x7c, 0xe1, 0xef, 0x21,
-	0x68, 0x71, 0x3d, 0xda, 0xd5, 0xfb, 0xf8, 0xa9, 0x62, 0x3a, 0x10, 0x96, 0x77, 0xb5, 0xd7, 0x4b,
-	0x50, 0x90, 0x54, 0x9b, 0x2b, 0x11, 0xdb, 0xa2, 0xf5, 0x62, 0x0a, 0x20, 0xef, 0xd2, 0x46, 0x19,
-	0x12, 0x82, 0xab, 0x6f, 0x20, 0x98, 0xef, 0xfb, 0xe8, 0x29, 0x0b, 0xd2, 0xfe, 0x3f, 0xd7, 0xde,
-	0xcb, 0x30, 0x5b, 0xfb, 0x7c, 0x91, 0xa1, 0x82, 0x91, 0xf7, 0x11, 0x9c, 0xec, 0x4b, 0x18, 0x29,
-	0xe3, 0x25, 0xd7, 0x41, 0x10, 0xc7, 0x95, 0xf3, 0x85, 0x1a, 0x49, 0x70, 0xf6, 0x5d, 0x04, 0x73,
-	0x3d, 0x09, 0xb4, 0xcc, 0xc1, 0x4d, 0x0a, 0x78, 0xda, 0xbe, 0x58, 0x70, 0xb4, 0xc4, 0xcd, 0x48,
-	0xc2, 0x15, 0x73, 0x70, 0x93, 0x82, 0x88, 0xe6, 0xe0, 0x26, 0x15, 0xcc, 0x7c, 0x0f, 0xc1, 0xbc,
-	0xcc, 0x8d, 0x8b, 0x8b, 0x11, 0x74, 0xf3, 0xc7, 0x40, 0xe9, 0x5f, 0xc2, 0xf8, 0x19, 0x82, 0xff,
-	0xd6, 0xa3, 0xa0, 0xe4, 0xd3, 0x96, 0x23, 0xa7, 0xae, 0x6e, 0xbe, 0xe3, 0x36, 0x05, 0xa8, 0xca,
-	0x77, 0xdc, 0xa6, 0x42, 0x3d, 0x3f, 0x47, 0xa0, 0x76, 0x13, 0x90, 0x5b, 0x82, 0xd3, 0x8d, 0x9c,
-	0xb1, 0x69, 0x1a, 0xb3, 0x9b, 0xa5, 0x68, 0x08, 0x7e, 0x7f, 0x84, 0x60, 0xa5, 0xcf, 0x90, 0x2b,
-	0x86, 0x24, 0xc8, 0xbf, 0xc9, 0x17, 0x2e, 0x94, 0xe3, 0xf0, 0x08, 0xf0, 0x4c, 0x70, 0x98, 0xc0,
-	0x69, 0x3f, 0x7f, 0x0e, 0x0f, 0x43, 0x28, 0xdf, 0x45, 0xb0, 0xd0, 0x93, 0x1d, 0x70, 0x9e, 0xe8,
-	0x38, 0x99, 0x91, 0xb7, 0x2f, 0x14, 0x1b, 0xcc, 0xb9, 0x59, 0xfb, 0x6c, 0x16, 0x4e, 0xc5, 0xd0,
-	0x31, 0x96, 0xdf, 0xbd, 0x8f, 0x68, 0x5e, 0xc9, 0x6b, 0xa3, 0x72, 0x1c, 0x98, 0x87, 0x54, 0xab,
-	0xe5, 0x38, 0x30, 0x0f, 0x2d, 0x3c, 0xa3, 0x51, 0xd7, 0x38, 0xa8, 0xd7, 0xca, 0x13, 0xc1, 0x1f,
-	0x56, 0x3f, 0x96, 0x27, 0x82, 0x3f, 0xbc, 0x50, 0xec, 0x4d, 0x04, 0xad, 0x81, 0x5f, 0x88, 0x95,
-	0xe3, 0xb8, 0x8c, 0x97, 0x83, 0xe5, 0x38, 0x2e, 0x93, 0x75, 0x5f, 0x6f, 0x23, 0xa8, 0xef, 0x1b,
-	0x66, 0x2f, 0x87, 0xdf, 0x4d, 0xab, 0xeb, 0xca, 0xe1, 0x77, 0xd3, 0x2b, 0xac, 0xe8, 0xb1, 0xd4,
-	0x97, 0xca, 0x55, 0xf2, 0x1d, 0xd9, 0x09, 0x76, 0x2e, 0x16, 0x1c, 0x2d, 0xb8, 0xf9, 0x00, 0xc1,
-	0x42, 0x3f, 0x52, 0x89, 0x94, 0x2f, 0x14, 0x4d, 0x16, 0x5f, 0xe5, 0x0b, 0x45, 0xd3, 0x4a, 0xa0,
-	0x3e, 0x44, 0x30, 0xc7, 0x43, 0x51, 0x5e, 0x8f, 0x82, 0xb7, 0x0a, 0xd6, 0x71, 0x44, 0x6a, 0x68,
-	0xda, 0x97, 0x4b, 0x52, 0x11, 0xdc, 0x7d, 0x84, 0x40, 0x19, 0x27, 0xaa, 0x36, 0x44, 0xd2, 0xbc,
-	0x79, 0x0c, 0x15, 0x27, 0xed, 0xad, 0x72, 0x44, 0x42, 0x7c, 0xa1, 0x71, 0x47, 0xf7, 0xba, 0x83,
-	0x1c, 0x0a, 0x9f, 0x56, 0x1f, 0x92, 0x43, 0xe1, 0x53, 0xeb, 0x43, 0x1e, 0x42, 0x4c, 0xe5, 0x07,
-	0xd2, 0xd7, 0xa5, 0x70, 0xb1, 0x8f, 0x61, 0xe5, 0x57, 0xf9, 0xb4, 0x4f, 0x5a, 0xad, 0xfd, 0x69,
-	0x0a, 0x16, 0xb7, 0xad, 0x03, 0xe2, 0x98, 0x32, 0x5a, 0xf7, 0x01, 0x8f, 0xa6, 0xa3, 0x37, 0x36,
-	0x65, 0xc0, 0xa1, 0xf5, 0x02, 0x63, 0x63, 0x00, 0xf8, 0x0f, 0x10, 0x9c, 0xe8, 0x47, 0xbf, 0x2f,
-	0x54, 0x08, 0x72, 0x90, 0x3f, 0x92, 0x54, 0x08, 0x72, 0x88, 0x7e, 0xda, 0xe8, 0x2d, 0xce, 0xd6,
-	0xba, 0x6d, 0x0f, 0x8d, 0xae, 0xce, 0x3f, 0xb0, 0xf4, 0x78, 0xae, 0xcc, 0x21, 0x44, 0x74, 0xdb,
-	0xe7, 0xf2, 0x0f, 0xe4, 0x6c, 0x6c, 0x3c, 0x04, 0x59, 0xbf, 0x73, 0xf7, 0x52, 0x83, 0x7d, 0x17,
-	0x6f, 0x6f, 0x9a, 0xfd, 0x79, 0xe4, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x02, 0xfe, 0x5d, 0x79,
-	0x30, 0x4f, 0x00, 0x00,
+	// 3437 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5c, 0xcf, 0x6f, 0x24, 0x47,
+	0xf5, 0x57, 0x8d, 0x67, 0x3c, 0x9e, 0x37, 0xb6, 0x77, 0x5d, 0x6b, 0xaf, 0x7b, 0x27, 0xf9, 0xe6,
+	0xbb, 0x6a, 0x45, 0x22, 0x87, 0xc8, 0x24, 0x0e, 0x49, 0x96, 0xcd, 0x6e, 0x36, 0xfe, 0xb1, 0xf1,
+	0x7a, 0x93, 0xcd, 0x6e, 0x7a, 0x9c, 0x5d, 0x92, 0x00, 0x51, 0x7b, 0xa6, 0x3c, 0xd3, 0xd9, 0x99,
+	0xee, 0x4e, 0x77, 0x8f, 0x37, 0x23, 0x21, 0xa1, 0x44, 0x09, 0x04, 0x02, 0x09, 0x11, 0x70, 0xca,
+	0x01, 0x04, 0xe4, 0x08, 0x12, 0x08, 0x29, 0x42, 0x11, 0x08, 0x81, 0xb8, 0x25, 0x47, 0xc4, 0x09,
+	0xee, 0x48, 0xdc, 0xf8, 0x03, 0x40, 0xf5, 0xa3, 0xbb, 0xab, 0x7f, 0xd8, 0x9e, 0xee, 0x76, 0x6f,
+	0xc4, 0xc9, 0x5d, 0xd5, 0x53, 0xaf, 0xde, 0xab, 0xf7, 0xa3, 0x5e, 0x7d, 0xea, 0xb9, 0x61, 0xde,
+	0x25, 0xce, 0xbe, 0xd1, 0x21, 0xee, 0x8a, 0xed, 0x58, 0x9e, 0x85, 0xbf, 0xd0, 0xb1, 0x86, 0x2b,
+	0xfd, 0x91, 0x7e, 0x87, 0x18, 0x2b, 0xb6, 0xae, 0xbb, 0x2b, 0x1d, 0x97, 0xac, 0x88, 0xdf, 0x38,
+	0xa4, 0x67, 0xb8, 0x9e, 0x33, 0x5e, 0xd1, 0x6d, 0x43, 0xfd, 0x26, 0x2c, 0x5e, 0xb3, 0xba, 0xc6,
+	0xde, 0xb8, 0xdd, 0xe9, 0x93, 0xa1, 0xee, 0x6a, 0xe4, 0xb5, 0x11, 0x71, 0x3d, 0x7c, 0x2f, 0x34,
+	0xc4, 0xcf, 0xb7, 0xbb, 0x0a, 0x3a, 0x8b, 0x1e, 0x68, 0x68, 0x61, 0x07, 0xde, 0x86, 0xba, 0xcb,
+	0x7f, 0xaf, 0x54, 0xce, 0x4e, 0x3d, 0xd0, 0x5c, 0xfd, 0xe2, 0xca, 0x84, 0x13, 0xae, 0xf0, 0x79,
+	0x34, 0x7f, 0xbc, 0x7a, 0x13, 0xa6, 0x79, 0x17, 0x6e, 0xc1, 0x0c, 0xef, 0x0c, 0x66, 0x0c, 0xda,
+	0x58, 0x81, 0xba, 0x3b, 0x1a, 0x0e, 0x75, 0x67, 0xac, 0x54, 0xd8, 0x2b, 0xbf, 0x89, 0x4f, 0xc3,
+	0x34, 0xff, 0x95, 0x32, 0xc5, 0x5e, 0x88, 0x96, 0xba, 0x07, 0x4b, 0x31, 0xc1, 0x5c, 0xdb, 0x32,
+	0x5d, 0x82, 0xaf, 0xc1, 0x8c, 0x23, 0x9e, 0xd9, 0x34, 0xcd, 0xd5, 0x87, 0x27, 0x66, 0xde, 0x27,
+	0xa2, 0x05, 0x24, 0xd4, 0xd7, 0xe0, 0xd4, 0x15, 0xa2, 0x3b, 0xde, 0x2e, 0xd1, 0xbd, 0x36, 0xf1,
+	0xfc, 0xf5, 0x7b, 0x09, 0x1a, 0x86, 0xe9, 0x7a, 0xba, 0xd9, 0x21, 0xae, 0x82, 0xd8, 0x1a, 0x5d,
+	0x98, 0x78, 0x1a, 0x99, 0xe0, 0xe5, 0x01, 0x19, 0x12, 0xd3, 0xd3, 0x42, 0x72, 0x6a, 0x3b, 0x3a,
+	0xa5, 0xf8, 0xc5, 0x11, 0x2a, 0xbb, 0x0f, 0xc0, 0xa7, 0xb0, 0xdd, 0x15, 0x8b, 0x28, 0xf5, 0xa8,
+	0x9f, 0x20, 0x58, 0x8c, 0x0a, 0x52, 0xca, 0x7a, 0xe1, 0x1d, 0x79, 0x61, 0xb8, 0xf1, 0x3c, 0x36,
+	0x31, 0xbd, 0x6d, 0x31, 0xf2, 0xca, 0xae, 0xe6, 0x46, 0x96, 0x64, 0x08, 0x73, 0x91, 0x77, 0xc5,
+	0x16, 0x83, 0xbe, 0x27, 0x8e, 0x73, 0x8d, 0xb8, 0xae, 0xde, 0x23, 0xc2, 0xb0, 0xa4, 0x1e, 0x75,
+	0x03, 0x1a, 0x6d, 0xaf, 0xcd, 0xc9, 0xe1, 0x45, 0xa8, 0x75, 0xac, 0x91, 0xe9, 0xb1, 0x69, 0xa6,
+	0x34, 0xde, 0xc0, 0x67, 0xa1, 0x69, 0x99, 0x03, 0xc3, 0x24, 0x1b, 0xec, 0x5d, 0x85, 0xbd, 0x93,
+	0xbb, 0x54, 0x15, 0xa0, 0xed, 0xf9, 0x5c, 0xa7, 0x53, 0x51, 0xff, 0x0f, 0x6a, 0x6d, 0x6f, 0xcd,
+	0xb6, 0x0f, 0x78, 0xfd, 0x6f, 0x44, 0x69, 0xe8, 0x9e, 0xe1, 0x7a, 0x46, 0xc7, 0xc5, 0xcf, 0xc1,
+	0x8c, 0x1f, 0x07, 0x84, 0xaa, 0x56, 0x27, 0xf7, 0x4b, 0x5f, 0x1e, 0x2d, 0xa0, 0x81, 0x9f, 0x8f,
+	0xea, 0x8a, 0x12, 0x7c, 0x24, 0x03, 0x41, 0x5f, 0x36, 0x49, 0x51, 0x78, 0x1d, 0xaa, 0xba, 0x6d,
+	0xbb, 0x6c, 0x4d, 0x9b, 0xab, 0x2b, 0x19, 0xa8, 0xad, 0xd9, 0xb6, 0xc6, 0xc6, 0xaa, 0xef, 0x20,
+	0x38, 0xbd, 0x45, 0x7c, 0x7e, 0xdd, 0x6d, 0x73, 0xcf, 0xf2, 0xdd, 0x4e, 0x81, 0xba, 0x65, 0x7b,
+	0x86, 0x65, 0x72, 0xa7, 0x6b, 0x68, 0x7e, 0x93, 0x2e, 0xa0, 0x6e, 0xdb, 0x81, 0xb6, 0x79, 0x83,
+	0x6a, 0x49, 0xcc, 0xf6, 0x9c, 0x3e, 0xf4, 0x35, 0x2d, 0x77, 0x51, 0x43, 0x62, 0x6b, 0x7d, 0xdd,
+	0x1c, 0x8c, 0x95, 0xea, 0x59, 0xf4, 0xc0, 0x8c, 0x16, 0x76, 0xa8, 0x3f, 0xaf, 0xc0, 0x72, 0x82,
+	0x95, 0x72, 0x1c, 0xa7, 0x0b, 0x0b, 0xfa, 0x60, 0xe0, 0xcf, 0xb4, 0x49, 0x3c, 0xdd, 0x18, 0x64,
+	0x76, 0x20, 0x31, 0x9c, 0x8f, 0xd6, 0x92, 0x04, 0x71, 0x1b, 0xc0, 0x0d, 0x0c, 0x4a, 0x68, 0x29,
+	0x8b, 0xce, 0xfd, 0xa1, 0x9a, 0x44, 0x46, 0xfd, 0x0c, 0xc1, 0x89, 0x6b, 0x46, 0xc7, 0xb1, 0xc4,
+	0x64, 0xcf, 0x10, 0x16, 0xb7, 0x3d, 0x62, 0xea, 0xc2, 0xa2, 0x1b, 0x9a, 0x68, 0x51, 0x0d, 0xda,
+	0x8e, 0xf5, 0x2a, 0xe9, 0x78, 0x7e, 0xa4, 0x17, 0xcd, 0x50, 0x83, 0x53, 0x87, 0x68, 0xb0, 0x9a,
+	0xd4, 0xa0, 0x02, 0xf5, 0x7d, 0xe2, 0xb8, 0x86, 0x65, 0x2a, 0x35, 0x4e, 0x51, 0x34, 0xe9, 0x58,
+	0x62, 0xee, 0x1b, 0x8e, 0x65, 0xd2, 0x00, 0xaa, 0x4c, 0xf3, 0xb1, 0x52, 0x17, 0x9b, 0x73, 0x60,
+	0xe8, 0xae, 0x52, 0x17, 0x73, 0xd2, 0x86, 0xfa, 0x69, 0x1d, 0x66, 0x65, 0x79, 0x8e, 0x88, 0x36,
+	0x79, 0x4d, 0x4f, 0x62, 0xbc, 0x9a, 0x60, 0xbc, 0x4b, 0xdc, 0x8e, 0x63, 0x30, 0xe3, 0x16, 0x62,
+	0xc9, 0x5d, 0x74, 0xce, 0x01, 0xd9, 0x27, 0x03, 0x21, 0x14, 0x6f, 0xb0, 0x6d, 0x54, 0xec, 0xdb,
+	0x75, 0xee, 0x1e, 0xa2, 0x89, 0xaf, 0x42, 0xcd, 0xd6, 0xbd, 0xbe, 0xab, 0x00, 0xb3, 0xa8, 0x2f,
+	0x65, 0xb5, 0xa8, 0x1b, 0xba, 0xd7, 0xd7, 0x38, 0x09, 0xb6, 0x25, 0x7b, 0xba, 0x37, 0x72, 0x95,
+	0x19, 0xb1, 0x25, 0xb3, 0x16, 0x26, 0x00, 0xb6, 0x63, 0xd9, 0xc4, 0xf1, 0x0c, 0xe2, 0x2a, 0x0d,
+	0x36, 0xd1, 0xe5, 0x89, 0x27, 0x92, 0x17, 0x7c, 0xe5, 0x46, 0x40, 0xe7, 0xb2, 0xe9, 0x39, 0x63,
+	0x4d, 0x22, 0x4c, 0x95, 0xe1, 0x19, 0x43, 0xe2, 0x7a, 0xfa, 0xd0, 0x56, 0x9a, 0x5c, 0x19, 0x41,
+	0x07, 0xbe, 0x09, 0x0d, 0xdb, 0xb1, 0xf6, 0x8d, 0x2e, 0x71, 0x5c, 0x65, 0x96, 0xf1, 0x70, 0x2e,
+	0x17, 0x0f, 0xcf, 0x90, 0xb1, 0x16, 0x92, 0x0a, 0x2d, 0x65, 0x4e, 0xb2, 0x14, 0x2a, 0xf2, 0xb3,
+	0xeb, 0x6d, 0xcf, 0xd1, 0x3d, 0xd2, 0x1b, 0x2b, 0xf3, 0x45, 0x44, 0x0e, 0xe9, 0x08, 0x91, 0xc3,
+	0x0e, 0xac, 0xc2, 0xec, 0xd0, 0xea, 0xee, 0x04, 0x52, 0x9f, 0x60, 0x3c, 0x44, 0xfa, 0xe2, 0xc6,
+	0x7e, 0x32, 0x69, 0xec, 0xf7, 0x01, 0xf0, 0xe9, 0x89, 0xb3, 0x3e, 0x56, 0x16, 0xf8, 0xae, 0x17,
+	0xf6, 0xe0, 0xaf, 0x40, 0x63, 0xcf, 0xd1, 0x87, 0xe4, 0x8e, 0xe5, 0xdc, 0x56, 0x30, 0x0b, 0x0d,
+	0xe7, 0x27, 0x96, 0xe5, 0x69, 0x3a, 0xf2, 0x96, 0xe5, 0xdc, 0x16, 0xaa, 0x1b, 0x6b, 0x21, 0xb1,
+	0xd6, 0x45, 0x38, 0x11, 0xd3, 0x28, 0x3e, 0x09, 0x53, 0xb7, 0xc9, 0x58, 0x38, 0x13, 0x7d, 0xa4,
+	0x2b, 0xbc, 0xaf, 0x0f, 0x46, 0xc4, 0x77, 0x23, 0xd6, 0x38, 0x5f, 0x39, 0x87, 0xe8, 0xf0, 0xd8,
+	0xea, 0x64, 0x19, 0xae, 0xae, 0xc1, 0x42, 0x82, 0x3b, 0x8c, 0xa1, 0x6a, 0x52, 0xbf, 0xe4, 0x14,
+	0xd8, 0xb3, 0xec, 0x90, 0x95, 0x88, 0x43, 0xaa, 0x7f, 0x47, 0xd0, 0xf4, 0xf7, 0xcf, 0xd1, 0x80,
+	0x50, 0x17, 0x70, 0x46, 0x83, 0x30, 0x1a, 0x88, 0x16, 0xcd, 0x71, 0xe9, 0xd3, 0xce, 0xd8, 0xf6,
+	0xf9, 0x08, 0xda, 0xd4, 0x6e, 0x75, 0xcf, 0x73, 0x8c, 0xdd, 0x91, 0xe7, 0x87, 0x83, 0xb0, 0x83,
+	0xc5, 0x45, 0xdd, 0xf3, 0x88, 0x13, 0x04, 0x03, 0xd1, 0x9c, 0x20, 0x18, 0x44, 0x3c, 0x62, 0x3a,
+	0xee, 0x11, 0x71, 0xe3, 0xa9, 0x27, 0x8d, 0x47, 0x7d, 0x0f, 0xc1, 0xe9, 0xb5, 0x6e, 0xf7, 0xba,
+	0xf3, 0x82, 0xdd, 0xd5, 0x3d, 0x22, 0x8b, 0x2a, 0x8b, 0x84, 0x0e, 0x13, 0xa9, 0x72, 0x88, 0x48,
+	0x53, 0x87, 0x8a, 0x54, 0x4d, 0x88, 0xa4, 0xfe, 0x21, 0x5c, 0x70, 0x1a, 0x7a, 0xa8, 0xba, 0x68,
+	0xf0, 0xf1, 0xd5, 0x45, 0x9f, 0xf1, 0xd7, 0x61, 0x46, 0x84, 0x85, 0xb1, 0xd8, 0x28, 0xd7, 0xf3,
+	0x84, 0x35, 0x3f, 0xd8, 0x08, 0xbf, 0x0b, 0x68, 0xb6, 0x9e, 0x80, 0xb9, 0xc8, 0xab, 0x4c, 0x46,
+	0x77, 0x0e, 0x66, 0x82, 0x4c, 0x01, 0x43, 0xb5, 0x63, 0x75, 0xf9, 0xf2, 0xd5, 0x34, 0xf6, 0x4c,
+	0x17, 0x67, 0x28, 0xf2, 0x4f, 0x61, 0x6b, 0xa2, 0xa9, 0xfe, 0x0d, 0xc1, 0xa9, 0x2d, 0xe2, 0x5d,
+	0x7e, 0x9d, 0xfa, 0x25, 0x4d, 0xaf, 0x44, 0xee, 0x83, 0xa1, 0xea, 0x85, 0x4a, 0x60, 0xcf, 0x25,
+	0x6c, 0x3d, 0x91, 0xad, 0xae, 0x16, 0xdf, 0xea, 0xe4, 0x33, 0xdc, 0x74, 0xec, 0x0c, 0x17, 0x0b,
+	0x40, 0xf5, 0x44, 0x00, 0x52, 0x7f, 0x87, 0x60, 0x31, 0x2a, 0x59, 0x39, 0xa9, 0x54, 0x44, 0x86,
+	0xca, 0x61, 0x32, 0x4c, 0x1d, 0x7c, 0x0e, 0xad, 0x46, 0xce, 0xa1, 0xea, 0xaf, 0xa7, 0x60, 0x71,
+	0xc3, 0x21, 0x92, 0x73, 0x08, 0xb5, 0x5c, 0x87, 0xba, 0xa0, 0x2d, 0x58, 0x7f, 0x34, 0x57, 0xfc,
+	0xd7, 0x7c, 0x2a, 0xf8, 0x05, 0xa8, 0x51, 0x07, 0xf3, 0x4f, 0x4f, 0x97, 0x26, 0x26, 0x97, 0xee,
+	0xc0, 0x1a, 0xa7, 0x86, 0x5f, 0x86, 0xaa, 0xa7, 0xf7, 0x68, 0xce, 0x47, 0xa9, 0x6e, 0x4d, 0x4c,
+	0x35, 0x4d, 0xe8, 0x95, 0x1d, 0xbd, 0x27, 0x76, 0x66, 0x46, 0x14, 0xbf, 0x2c, 0x9f, 0x24, 0xaa,
+	0x6c, 0x86, 0x8b, 0xb9, 0x96, 0x21, 0xe5, 0x4c, 0xd1, 0x7a, 0x1c, 0x1a, 0xc1, 0x7c, 0x99, 0x7c,
+	0xf0, 0x2d, 0x04, 0x4b, 0x31, 0xf6, 0x3f, 0x07, 0x83, 0x53, 0xaf, 0xc2, 0xe2, 0x26, 0x19, 0x90,
+	0x84, 0xe5, 0x1c, 0x99, 0x55, 0xee, 0x59, 0x4e, 0x87, 0x8b, 0x35, 0xa3, 0xf1, 0x86, 0xba, 0x07,
+	0x4b, 0x31, 0x5a, 0xe5, 0xc0, 0x1e, 0x0f, 0xc3, 0x42, 0x78, 0xee, 0x99, 0x88, 0x61, 0xf5, 0xb7,
+	0x08, 0xb0, 0x3c, 0xa6, 0x9c, 0xa5, 0x96, 0xdc, 0xad, 0x72, 0x1c, 0xee, 0xa6, 0x2e, 0xca, 0x5c,
+	0xfb, 0xf8, 0x98, 0xfa, 0x31, 0x0f, 0xc2, 0x61, 0x77, 0x39, 0xd2, 0x3c, 0x2f, 0x9d, 0xe8, 0xb9,
+	0xbb, 0xe7, 0x14, 0x27, 0x20, 0xa3, 0xfe, 0x0b, 0xc1, 0x99, 0x48, 0x10, 0xa0, 0x7b, 0xd8, 0x84,
+	0xb8, 0x9f, 0x13, 0xc9, 0xe0, 0x39, 0x43, 0xda, 0xc4, 0x0c, 0x1d, 0x38, 0xeb, 0x61, 0xe9, 0x7c,
+	0xc1, 0xdc, 0x50, 0xbd, 0x0d, 0xad, 0xb4, 0x79, 0xcb, 0xf1, 0x8a, 0xc7, 0x64, 0x60, 0x82, 0x06,
+	0x57, 0x77, 0x62, 0xd7, 0x58, 0x4e, 0x0c, 0x2c, 0xc7, 0xa2, 0xae, 0x46, 0x77, 0x8f, 0xcc, 0x07,
+	0x3d, 0x69, 0xcb, 0x50, 0x3f, 0x42, 0xa0, 0x24, 0xf7, 0x93, 0x89, 0x2c, 0x29, 0x4c, 0x90, 0x2b,
+	0x91, 0x04, 0xb9, 0x0d, 0x55, 0xfa, 0x24, 0x90, 0x87, 0xc2, 0x7b, 0x1b, 0x23, 0xa6, 0xbe, 0x1a,
+	0xb3, 0x78, 0xce, 0x66, 0x39, 0x26, 0xf0, 0x7d, 0x9e, 0x29, 0x67, 0xb6, 0x81, 0x92, 0xb6, 0x75,
+	0xf5, 0x4d, 0x04, 0xcb, 0x09, 0x7e, 0xca, 0x31, 0x2d, 0x05, 0xea, 0x1a, 0xd3, 0x22, 0x97, 0xa1,
+	0xa1, 0xf9, 0x4d, 0xb5, 0x0d, 0x67, 0xa2, 0xbb, 0xd2, 0xe4, 0xcb, 0xa2, 0x40, 0xdd, 0x89, 0x12,
+	0x15, 0x4d, 0xea, 0xd9, 0x69, 0x44, 0xcb, 0x51, 0xeb, 0xa3, 0xb0, 0x14, 0x3a, 0x28, 0xcd, 0x36,
+	0x26, 0x73, 0xec, 0xff, 0x44, 0xa0, 0x4a, 0x3e, 0xae, 0x9c, 0xc5, 0xff, 0x9a, 0x48, 0xdf, 0xb8,
+	0xf5, 0x6c, 0x4f, 0x4c, 0x2a, 0x9d, 0xbb, 0x78, 0x02, 0x97, 0x3f, 0xc7, 0x7a, 0x05, 0x96, 0x23,
+	0xb6, 0xb9, 0xa3, 0xf7, 0x26, 0x53, 0xbc, 0x98, 0xa4, 0x92, 0x32, 0xc9, 0x94, 0x34, 0x89, 0x6a,
+	0xc4, 0x62, 0x10, 0x9b, 0xa0, 0x1c, 0x23, 0xf8, 0x14, 0xc1, 0x52, 0xe8, 0x4b, 0x13, 0x5b, 0x01,
+	0xfe, 0x6a, 0x44, 0x37, 0x57, 0xb2, 0x78, 0x76, 0x72, 0xae, 0xe3, 0x53, 0x4d, 0x4f, 0x8e, 0x54,
+	0x25, 0xda, 0xa6, 0xfa, 0x2c, 0x28, 0x11, 0x4f, 0x9d, 0x7c, 0xe5, 0x30, 0x54, 0x6f, 0x93, 0xb1,
+	0xef, 0xfa, 0xec, 0x99, 0x46, 0xf3, 0x14, 0x6a, 0xe5, 0x70, 0x3e, 0x86, 0xe6, 0x15, 0xa2, 0x0f,
+	0xbc, 0xfe, 0x46, 0x9f, 0x74, 0x6e, 0x53, 0x76, 0x86, 0xfe, 0x41, 0xbd, 0xa1, 0xb1, 0x67, 0x86,
+	0x3c, 0x58, 0x0e, 0x47, 0xab, 0x6b, 0x1a, 0x7b, 0xa6, 0x47, 0x48, 0xc3, 0xf4, 0x88, 0xb3, 0xaf,
+	0x0f, 0x98, 0xb1, 0xd6, 0xb4, 0xa0, 0x4d, 0xf5, 0xc1, 0xb0, 0x17, 0x76, 0x80, 0xac, 0x69, 0xbc,
+	0x41, 0xf5, 0x36, 0x72, 0x06, 0xe2, 0x40, 0x4d, 0x1f, 0xd5, 0x7f, 0x56, 0x61, 0x31, 0xed, 0xe4,
+	0x13, 0xbb, 0xbc, 0x42, 0x89, 0xcb, 0xab, 0xc3, 0x4f, 0xb7, 0xf7, 0x42, 0x83, 0x98, 0x5d, 0xdb,
+	0x32, 0x4c, 0x8f, 0x9f, 0xf5, 0x1a, 0x5a, 0xd8, 0x41, 0x19, 0xef, 0x5b, 0xae, 0x27, 0x41, 0xe9,
+	0x41, 0x5b, 0x82, 0x75, 0x6b, 0x11, 0x58, 0x77, 0x18, 0x49, 0x0a, 0xa7, 0x99, 0x8d, 0x5f, 0x2b,
+	0x74, 0xb8, 0x3b, 0x14, 0xde, 0xbd, 0x09, 0xcd, 0x7e, 0xa8, 0x12, 0x06, 0x23, 0x64, 0x49, 0x63,
+	0x24, 0x75, 0x6a, 0x32, 0xa1, 0x28, 0x48, 0x36, 0x13, 0x07, 0xc9, 0x5e, 0x81, 0xf9, 0xae, 0xee,
+	0xe9, 0x1b, 0x84, 0xaa, 0x71, 0xdb, 0xdc, 0xb3, 0x94, 0x06, 0x9b, 0xf8, 0xf1, 0x89, 0x27, 0xde,
+	0x8c, 0x0c, 0xd7, 0x62, 0xe4, 0x12, 0x28, 0x1c, 0xa4, 0x40, 0xb8, 0x12, 0x2a, 0xd3, 0x8c, 0xa0,
+	0x32, 0x45, 0x93, 0xe4, 0x5d, 0x98, 0x8f, 0xb2, 0x97, 0x0a, 0x7f, 0xd2, 0x9c, 0x8d, 0xf4, 0x42,
+	0xf4, 0x53, 0xb4, 0xf0, 0xfd, 0x30, 0xa7, 0xef, 0xeb, 0xc6, 0x40, 0xdf, 0x1d, 0x90, 0x97, 0x2c,
+	0xd3, 0x8f, 0xcf, 0xd1, 0x4e, 0xf5, 0x16, 0x2c, 0xa7, 0xe9, 0xfa, 0x19, 0x32, 0x2e, 0x66, 0xd1,
+	0xaa, 0x07, 0xcb, 0x9a, 0x00, 0xa9, 0x03, 0x74, 0x40, 0x04, 0x97, 0x17, 0xa9, 0x1f, 0xf2, 0x2e,
+	0x11, 0x0d, 0x0a, 0xa2, 0x0e, 0x01, 0x39, 0xf5, 0x3b, 0x08, 0x94, 0xe4, 0xb4, 0xe5, 0xec, 0xed,
+	0x47, 0xdd, 0xdd, 0xbf, 0x08, 0x67, 0x5e, 0x30, 0x9d, 0x03, 0xd6, 0xa0, 0x58, 0x59, 0x00, 0x3d,
+	0x3e, 0xa5, 0x90, 0x2e, 0x27, 0xda, 0xde, 0x80, 0x93, 0x41, 0x09, 0xc2, 0xf1, 0xb0, 0xbf, 0x0b,
+	0x0b, 0x12, 0xc5, 0x72, 0xb8, 0xfe, 0x0d, 0x82, 0xc5, 0xa7, 0x0d, 0xb3, 0xeb, 0xaf, 0x4e, 0xb0,
+	0xb5, 0x3d, 0x08, 0x0b, 0x1d, 0xcb, 0x74, 0x47, 0x43, 0xe2, 0xb4, 0x63, 0x22, 0x24, 0x5f, 0xe4,
+	0x86, 0x6a, 0xcf, 0x42, 0x53, 0x44, 0x01, 0x9a, 0x00, 0xfb, 0x58, 0xb9, 0xd4, 0xc5, 0x80, 0x61,
+	0x9a, 0x7e, 0xd4, 0xf8, 0x26, 0x4a, 0x9f, 0xd5, 0x3f, 0x23, 0x58, 0x8a, 0x31, 0x5d, 0x8e, 0xed,
+	0xbe, 0x9c, 0xac, 0xf7, 0x38, 0x36, 0xe4, 0x4f, 0xfd, 0x18, 0xb1, 0xb4, 0xfc, 0xba, 0x49, 0xe2,
+	0x56, 0x9f, 0x6d, 0xed, 0x1f, 0x84, 0x05, 0xff, 0x26, 0xaf, 0x1d, 0x0b, 0x34, 0xc9, 0x17, 0x78,
+	0x05, 0xb0, 0xdf, 0xb9, 0x1d, 0x1a, 0x1f, 0x57, 0x4d, 0xca, 0x9b, 0x60, 0xfd, 0xab, 0xd2, 0xfa,
+	0xff, 0x89, 0x1f, 0x0c, 0x22, 0x9c, 0x97, 0xa3, 0x00, 0x39, 0x06, 0x56, 0x8e, 0x37, 0x06, 0xbe,
+	0xcd, 0x41, 0xb0, 0x82, 0x86, 0x9f, 0x6d, 0xf1, 0xb1, 0x04, 0x53, 0x4b, 0x8b, 0xb9, 0x18, 0xe5,
+	0xe3, 0x7f, 0xd0, 0x96, 0x5d, 0xb8, 0x87, 0x9f, 0x63, 0xfc, 0x97, 0x6d, 0x96, 0x5e, 0x1d, 0x4b,
+	0x1c, 0x94, 0x72, 0xb7, 0x29, 0x39, 0x77, 0x53, 0x87, 0x70, 0x6f, 0xfa, 0xa4, 0xe5, 0x84, 0xca,
+	0xf7, 0x2a, 0x3e, 0x1a, 0xe7, 0xcf, 0x97, 0x01, 0x7c, 0x3c, 0x4a, 0x46, 0x37, 0x92, 0x87, 0xf2,
+	0x6b, 0x8c, 0x76, 0x46, 0x70, 0x32, 0x8d, 0xad, 0x32, 0xd1, 0xc9, 0x41, 0x5c, 0xe9, 0xa5, 0xc2,
+	0x93, 0x17, 0x60, 0xf1, 0x96, 0xee, 0x75, 0xfa, 0xf1, 0x60, 0x79, 0x3f, 0xcc, 0xb9, 0x64, 0xb0,
+	0x17, 0xf7, 0xd5, 0x68, 0xa7, 0xfa, 0x51, 0x05, 0x96, 0x62, 0xc3, 0xcb, 0x71, 0xb3, 0xd3, 0x30,
+	0xad, 0x77, 0x3c, 0x29, 0xcf, 0xe4, 0x2d, 0x7c, 0x95, 0x2f, 0x2c, 0x87, 0x06, 0xf3, 0x17, 0x6d,
+	0x30, 0x95, 0xc8, 0x51, 0xb1, 0x7a, 0xbc, 0x51, 0xf1, 0x59, 0x38, 0xb9, 0x45, 0x3c, 0x51, 0xe7,
+	0x3a, 0x91, 0x65, 0xcb, 0x37, 0x8e, 0x95, 0xe8, 0x8d, 0xa3, 0xda, 0x66, 0x21, 0x76, 0x6d, 0x30,
+	0xc8, 0x42, 0xf0, 0x3e, 0x80, 0x3b, 0x86, 0xd7, 0xe7, 0x43, 0xc4, 0x05, 0x91, 0xd4, 0xa3, 0xfe,
+	0x14, 0xf1, 0xeb, 0x1b, 0x41, 0xb2, 0x34, 0x35, 0xba, 0x21, 0x03, 0x41, 0x65, 0x2e, 0xb3, 0x36,
+	0xf6, 0xd4, 0x16, 0x37, 0xa9, 0xe2, 0xb8, 0x10, 0xe9, 0x54, 0x7f, 0xc5, 0x63, 0xba, 0x24, 0x78,
+	0x39, 0x5c, 0x6e, 0x49, 0x5c, 0xe6, 0xaa, 0x64, 0xf6, 0x0b, 0x8e, 0xaf, 0xc3, 0x29, 0x01, 0x4b,
+	0x1c, 0x93, 0xe6, 0x49, 0x70, 0x2d, 0x58, 0xe6, 0x02, 0xa8, 0x6f, 0x20, 0x38, 0x25, 0x57, 0x4a,
+	0x17, 0x66, 0xfc, 0xa0, 0x92, 0xec, 0x43, 0x2e, 0xcf, 0x49, 0xb4, 0x0a, 0xbd, 0x3c, 0x34, 0xe7,
+	0xf4, 0x5a, 0xb7, 0xbb, 0x49, 0x6c, 0x62, 0x76, 0x89, 0xd9, 0x31, 0xc2, 0x8c, 0xe5, 0x15, 0x98,
+	0xed, 0x4a, 0xdd, 0xa2, 0x62, 0xfb, 0x89, 0xc9, 0x2f, 0xc1, 0x45, 0x56, 0x13, 0xd0, 0x1e, 0x6b,
+	0x11, 0x82, 0x6a, 0x9f, 0xa1, 0xf0, 0xd1, 0xa9, 0xcb, 0x11, 0xf2, 0x1b, 0x70, 0x86, 0xdf, 0x69,
+	0x7f, 0x2e, 0x72, 0xfe, 0x03, 0x01, 0x4e, 0xfe, 0x08, 0xef, 0xc0, 0x8c, 0x9f, 0xf8, 0x09, 0x19,
+	0xf3, 0xc7, 0xef, 0x80, 0x52, 0xb4, 0x96, 0xaf, 0x72, 0x7c, 0xb5, 0x7c, 0x2d, 0x98, 0xb1, 0xf6,
+	0x89, 0xe3, 0x18, 0x5d, 0x7e, 0xe2, 0x9a, 0xd1, 0x82, 0x36, 0x3d, 0x10, 0xa7, 0x2d, 0x6f, 0x39,
+	0xba, 0x34, 0xd9, 0x21, 0x21, 0x4d, 0x91, 0x47, 0xc6, 0x7f, 0x57, 0x1f, 0x92, 0x4d, 0x6b, 0xa8,
+	0x1b, 0xa6, 0x1f, 0xff, 0xc3, 0x1e, 0xea, 0xa1, 0xa6, 0xd5, 0x26, 0x83, 0x3d, 0x21, 0x9e, 0x68,
+	0xa9, 0x7f, 0x44, 0xd0, 0xda, 0x22, 0xde, 0x86, 0x65, 0xde, 0x05, 0xe9, 0x70, 0x3b, 0xa9, 0xbe,
+	0x9c, 0xb7, 0xdb, 0x21, 0x1d, 0x5f, 0x84, 0x1b, 0x8e, 0x75, 0x97, 0x44, 0xf0, 0xad, 0xb1, 0xa8,
+	0x08, 0x01, 0x1d, 0xf5, 0x67, 0xd3, 0x30, 0x17, 0x29, 0xd4, 0xc6, 0x2f, 0xc2, 0xec, 0x50, 0xfa,
+	0x71, 0xb1, 0x42, 0xa2, 0x08, 0xa9, 0x52, 0xcf, 0x34, 0xf8, 0x79, 0x68, 0x8a, 0x5d, 0xc1, 0xdc,
+	0xb3, 0xfc, 0x9c, 0x3c, 0xf3, 0x0e, 0x2b, 0xd3, 0x08, 0xef, 0xaf, 0xab, 0x85, 0xef, 0xaf, 0xa3,
+	0x06, 0x58, 0x3b, 0x1e, 0x03, 0x8c, 0x9a, 0xc4, 0xf4, 0xf1, 0x98, 0x04, 0xde, 0x11, 0xa7, 0xde,
+	0x3a, 0xa3, 0xf7, 0x54, 0xbe, 0x7a, 0xff, 0x44, 0x55, 0xd6, 0x2a, 0x2c, 0xca, 0xb6, 0x70, 0x93,
+	0x63, 0x46, 0xae, 0x32, 0xc3, 0xce, 0xd6, 0xa9, 0xef, 0xf0, 0x35, 0xa8, 0xb3, 0xca, 0xfe, 0x8e,
+	0x2b, 0x10, 0xf0, 0x5c, 0xff, 0x1d, 0xe0, 0xd3, 0xc8, 0x7f, 0x79, 0xf5, 0x09, 0x02, 0x25, 0xbc,
+	0xbb, 0x14, 0xff, 0xd0, 0x50, 0x92, 0x97, 0xdf, 0x88, 0xd7, 0x14, 0xe5, 0xfd, 0x87, 0x8b, 0xa0,
+	0xa8, 0xe8, 0x2a, 0xe0, 0x4d, 0x32, 0x88, 0x15, 0x15, 0xb1, 0xb0, 0xed, 0xc7, 0x70, 0xff, 0x1f,
+	0x58, 0xa4, 0x9e, 0x03, 0x4a, 0xbe, 0xb4, 0x28, 0x2d, 0xd7, 0x66, 0x00, 0x7e, 0xf4, 0x5f, 0x98,
+	0x50, 0xfc, 0x5f, 0x98, 0x8e, 0xc0, 0xd4, 0x7f, 0x8f, 0x58, 0x36, 0x5b, 0x76, 0x79, 0xd3, 0xad,
+	0x44, 0x79, 0xd3, 0xe4, 0xa9, 0x48, 0x52, 0x66, 0xa9, 0xc8, 0x69, 0x15, 0xe6, 0xe9, 0xe1, 0xc1,
+	0x0e, 0xb1, 0x85, 0x58, 0xf5, 0x29, 0x4a, 0x56, 0x9f, 0xbe, 0x0e, 0x27, 0x82, 0x31, 0xe5, 0x1d,
+	0x6c, 0x6d, 0x3b, 0x2c, 0x65, 0x10, 0xad, 0xd5, 0xbf, 0xde, 0x13, 0x14, 0x33, 0x6f, 0x78, 0xce,
+	0x00, 0xbf, 0x85, 0xa0, 0x46, 0x5e, 0x37, 0x5c, 0x0f, 0x5f, 0xc8, 0x72, 0x8f, 0x1f, 0xaf, 0x08,
+	0x6e, 0x5d, 0xcc, 0x39, 0x5a, 0xb0, 0xfb, 0x6d, 0x04, 0xd3, 0x1d, 0x96, 0xeb, 0xe0, 0x8b, 0x85,
+	0xca, 0x41, 0x5b, 0x4f, 0xe6, 0x1d, 0x2e, 0x71, 0xd2, 0x65, 0x67, 0xa1, 0x0c, 0x9c, 0xa4, 0xd5,
+	0x54, 0x66, 0xe0, 0x24, 0xbd, 0x8c, 0xf2, 0x0d, 0x04, 0xd3, 0x3d, 0x86, 0xdb, 0xe2, 0xf3, 0x39,
+	0x6a, 0x2c, 0x7c, 0x36, 0x9e, 0xc8, 0x35, 0x56, 0xf0, 0xf0, 0x0e, 0x82, 0x66, 0x2f, 0xac, 0x3d,
+	0xc4, 0x79, 0x88, 0xf9, 0x7e, 0xd1, 0xba, 0x90, 0x6f, 0xb0, 0x60, 0xe5, 0x43, 0x04, 0x27, 0x47,
+	0x0c, 0xc0, 0x0a, 0x51, 0x30, 0xbc, 0x5e, 0xbc, 0x22, 0xb0, 0xb5, 0x51, 0x88, 0x86, 0xe0, 0xee,
+	0x7b, 0x08, 0xea, 0x7a, 0xb7, 0xcb, 0x2e, 0x41, 0x2e, 0xe5, 0xa8, 0xba, 0x90, 0xcb, 0x94, 0x5a,
+	0x4f, 0xe5, 0x27, 0x20, 0xb1, 0xd3, 0x23, 0x5e, 0x46, 0x76, 0xd2, 0x0b, 0x0a, 0x33, 0xb0, 0x73,
+	0x50, 0x61, 0xe1, 0x0f, 0x11, 0x00, 0xd7, 0x1d, 0xe3, 0x68, 0x2d, 0xdf, 0x8a, 0x4b, 0x25, 0x7f,
+	0xad, 0xf5, 0x22, 0x24, 0x04, 0x57, 0x3f, 0x46, 0x00, 0xdc, 0xd5, 0x19, 0x57, 0xeb, 0x39, 0xfd,
+	0x55, 0x5e, 0xaa, 0x8d, 0x42, 0x34, 0x04, 0x5f, 0xdf, 0xe5, 0xb6, 0x44, 0x93, 0x15, 0xfc, 0x64,
+	0xb1, 0x0a, 0x9e, 0xd6, 0xa5, 0xdc, 0xe3, 0x25, 0x66, 0x7a, 0xc4, 0xcb, 0xc8, 0x4c, 0x6a, 0x01,
+	0x5b, 0xeb, 0x52, 0xc1, 0x52, 0x31, 0xfc, 0x03, 0x04, 0x0d, 0x6e, 0x47, 0x3b, 0x7a, 0x0f, 0x3f,
+	0x95, 0xcf, 0x06, 0xc2, 0xb2, 0xb0, 0xd6, 0x5a, 0x01, 0x0a, 0x92, 0x69, 0x73, 0x23, 0x62, 0x4b,
+	0xb4, 0x96, 0xcf, 0x00, 0xe4, 0x55, 0x5a, 0x2f, 0x42, 0x42, 0x70, 0xf5, 0x2d, 0x04, 0x73, 0x3d,
+	0x1f, 0x75, 0x65, 0x49, 0xda, 0x97, 0x33, 0xad, 0xbd, 0x0c, 0xcf, 0xb5, 0xce, 0xe7, 0x19, 0x2a,
+	0x18, 0x79, 0x1f, 0xc1, 0xc9, 0x9e, 0x84, 0xad, 0x32, 0x5e, 0x32, 0x6d, 0x04, 0x71, 0x3c, 0x3a,
+	0x5b, 0xaa, 0x91, 0x04, 0x75, 0xdf, 0x45, 0x30, 0xdb, 0x95, 0xc0, 0xce, 0x0c, 0xdc, 0xa4, 0x80,
+	0xae, 0xad, 0x8b, 0x39, 0x47, 0x4b, 0xdc, 0x0c, 0x25, 0x3c, 0x32, 0x03, 0x37, 0x29, 0x48, 0x6a,
+	0x06, 0x6e, 0x52, 0x41, 0xd0, 0xf7, 0x10, 0xcc, 0xc9, 0xdc, 0xb8, 0x38, 0x1f, 0x41, 0x37, 0x7b,
+	0x0e, 0x94, 0xfe, 0x05, 0x8d, 0x5f, 0x20, 0xf8, 0x7f, 0x3d, 0x0a, 0x66, 0x3e, 0x6d, 0x39, 0xf2,
+	0xd1, 0xd5, 0xcd, 0xb6, 0xdd, 0xa6, 0x00, 0x5c, 0xd9, 0xb6, 0xdb, 0x54, 0xa8, 0xe7, 0x97, 0x08,
+	0xd4, 0x4e, 0x02, 0xaa, 0x4b, 0x70, 0xba, 0x9e, 0x31, 0x37, 0x4d, 0x63, 0x76, 0xa3, 0x10, 0x0d,
+	0xc1, 0xef, 0x4f, 0x10, 0x2c, 0xf7, 0x18, 0x72, 0xc5, 0x90, 0x04, 0xf9, 0x37, 0xd9, 0xd2, 0x85,
+	0x62, 0x1c, 0x1e, 0x02, 0x9e, 0x09, 0x0e, 0x13, 0xf8, 0xee, 0xdd, 0xe7, 0xf0, 0x20, 0x84, 0xf2,
+	0x5d, 0x04, 0xf3, 0x5d, 0x39, 0x00, 0x67, 0xc9, 0x8e, 0x93, 0x27, 0xf2, 0xd6, 0x85, 0x7c, 0x83,
+	0x39, 0x37, 0xab, 0x9f, 0x35, 0xe1, 0x54, 0x0c, 0x1d, 0x63, 0xe7, 0xbb, 0xf7, 0x11, 0x3d, 0x57,
+	0xf2, 0x9a, 0xaa, 0x0c, 0x1b, 0xe6, 0x01, 0x55, 0x6e, 0x19, 0x36, 0xcc, 0x03, 0x0b, 0xd6, 0x68,
+	0xd6, 0x35, 0x0a, 0xea, 0xbc, 0xb2, 0x64, 0xf0, 0x07, 0xd5, 0x9d, 0x65, 0xc9, 0xe0, 0x0f, 0x2e,
+	0x30, 0x7b, 0x13, 0x41, 0xa3, 0xef, 0x17, 0x70, 0x65, 0xd8, 0x2e, 0xe3, 0x65, 0x64, 0x19, 0xb6,
+	0xcb, 0x64, 0xbd, 0xd8, 0xdb, 0x08, 0xaa, 0x7b, 0x86, 0xd9, 0xcd, 0x10, 0x77, 0xd3, 0xea, 0xc1,
+	0x32, 0xc4, 0xdd, 0xf4, 0xca, 0x2c, 0xba, 0x2d, 0xf5, 0xa4, 0x32, 0x97, 0x6c, 0x5b, 0x76, 0x82,
+	0x9d, 0x8b, 0x39, 0x47, 0x0b, 0x6e, 0x3e, 0x40, 0x30, 0xdf, 0x8b, 0x54, 0x30, 0x65, 0x4b, 0x45,
+	0x93, 0x45, 0x5b, 0xd9, 0x52, 0xd1, 0xb4, 0xd2, 0xa9, 0x0f, 0x11, 0xcc, 0xf2, 0x54, 0x94, 0xd7,
+	0xb1, 0xe0, 0xcd, 0x9c, 0xf5, 0x1f, 0x91, 0xda, 0x9b, 0xd6, 0xe5, 0x82, 0x54, 0x04, 0x77, 0x1f,
+	0x21, 0x50, 0x46, 0x89, 0x6a, 0x0f, 0x71, 0x68, 0xde, 0x38, 0x86, 0x4a, 0x95, 0xd6, 0x66, 0x31,
+	0x22, 0x21, 0xbe, 0x50, 0xbb, 0xa3, 0x7b, 0x9d, 0x7e, 0x06, 0x83, 0x4f, 0xab, 0x2b, 0xc9, 0x60,
+	0xf0, 0xa9, 0x75, 0x25, 0x0f, 0x21, 0x66, 0xf2, 0x7d, 0xe9, 0xab, 0x54, 0x38, 0xdf, 0x47, 0xb4,
+	0xb2, 0x9b, 0x7c, 0xda, 0xa7, 0xb0, 0x56, 0xff, 0x32, 0x05, 0x0b, 0x5b, 0xd6, 0x3e, 0x71, 0x4c,
+	0x19, 0xad, 0xfb, 0x80, 0x67, 0xd3, 0xd1, 0x1b, 0x9b, 0x22, 0xe0, 0xd0, 0x5a, 0x8e, 0xb1, 0x31,
+	0x00, 0xfc, 0x47, 0x08, 0x4e, 0xf4, 0xa2, 0xdf, 0x25, 0xca, 0x05, 0x39, 0xc8, 0x1f, 0x57, 0xca,
+	0x05, 0x39, 0x44, 0x3f, 0x89, 0xf4, 0x16, 0x67, 0x6b, 0xcd, 0xb6, 0x07, 0x46, 0x47, 0xe7, 0x1f,
+	0x66, 0x7a, 0x3c, 0xd3, 0xc9, 0x21, 0x44, 0x74, 0x5b, 0xe7, 0xb2, 0x0f, 0xe4, 0x6c, 0xac, 0x3f,
+	0x04, 0x93, 0x7e, 0x1f, 0xef, 0xa5, 0x1a, 0xfb, 0x9e, 0xde, 0xee, 0x34, 0xfb, 0xf3, 0xc8, 0x7f,
+	0x03, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xfa, 0x1b, 0xbf, 0x68, 0x4f, 0x00, 0x00,
 }
diff --git a/server/core/proto/services.proto b/server/core/proto/services.proto
index eed61105..8be3423b 100644
--- a/server/core/proto/services.proto
+++ b/server/core/proto/services.proto
@@ -532,6 +532,8 @@ message CreateDependenciesResponse {
 
 message GetDependenciesRequest {
     string serviceId = 1;
+    bool sameDomain = 2;
+    bool noSelf = 3;
 }
 
 message GetConDependenciesResponse {
diff --git a/server/core/swagger/v3.yaml b/server/core/swagger/v3.yaml
index 068ba19d..ba187221 100644
--- a/server/core/swagger/v3.yaml
+++ b/server/core/swagger/v3.yaml
@@ -812,6 +812,16 @@ paths:
           description: ???????1 ??0 ??
           type: integer
           default: 0
+        - name: noSelf
+          in: query
+          description: ????????????
+          type: integer
+          default: 0
+        - name: sameDomain
+          in: query
+          description: ?????????????
+          type: integer
+          default: 0
       tags:
         - dependency
       responses:
@@ -848,6 +858,16 @@ paths:
           description: ???????1 ??0 ??
           type: integer
           default: 0
+        - name: noSelf
+          in: query
+          description: ????????????
+          type: integer
+          default: 0
+        - name: sameDomain
+          in: query
+          description: ?????????????
+          type: integer
+          default: 0
       tags:
         - dependency
       responses:
diff --git a/server/core/swagger/v4.yaml b/server/core/swagger/v4.yaml
index c8638cc6..e450eb74 100644
--- a/server/core/swagger/v4.yaml
+++ b/server/core/swagger/v4.yaml
@@ -906,6 +906,16 @@ paths:
           description: ???????1 ??0 ??
           type: integer
           default: 0
+        - name: noSelf
+          in: query
+          description: ????????????
+          type: integer
+          default: 0
+        - name: sameDomain
+          in: query
+          description: ?????????????
+          type: integer
+          default: 0
       tags:
         - dependency
       responses:
@@ -945,6 +955,16 @@ paths:
           description: ???????1 ??0 ??
           type: integer
           default: 0
+        - name: noSelf
+          in: query
+          description: ????????????
+          type: integer
+          default: 0
+        - name: sameDomain
+          in: query
+          description: ?????????????
+          type: integer
+          default: 0
       tags:
         - dependency
       responses:
diff --git a/server/govern/controller_v4.go b/server/govern/controller_v4.go
index 59a8e25d..04cb637f 100644
--- a/server/govern/controller_v4.go
+++ b/server/govern/controller_v4.go
@@ -99,7 +99,9 @@ func (governService *GovernServiceControllerV4) GetGraph(w http.ResponseWriter,
 		nodes[index].Version = service.Version
 
 		proRequest := &pb.GetDependenciesRequest{
-			ServiceId: service.ServiceId,
+			ServiceId:  service.ServiceId,
+			SameDomain: true,
+			NoSelf:     true,
 		}
 		proResp, err := core.ServiceAPI.GetConsumerDependencies(ctx, proRequest)
 		if err != nil {
diff --git a/server/govern/service.go b/server/govern/service.go
index b2d74eb3..5cc5290e 100644
--- a/server/govern/service.go
+++ b/server/govern/service.go
@@ -313,19 +313,21 @@ func getServiceDetailUtil(ctx context.Context, serviceDetailOpt ServiceDetailOpt
 		case "dependencies":
 			service := serviceDetailOpt.service
 			dr := serviceUtil.NewDependencyRelation(ctx, domainProject, service, service)
-			consumers, err := dr.GetDependencyConsumers()
+			consumers, err := dr.GetDependencyConsumers(
+				serviceUtil.WithoutSelfDependency(),
+				serviceUtil.WithSameDomainProject())
 			if err != nil {
 				util.Logger().Errorf(err, "Get service's all consumers for govern service failed.")
 				return nil, err
 			}
-			consumers = skipSelfDependency(consumers, serviceId)
-
-			providers, err := dr.GetDependencyProviders()
+			providers, err := dr.GetDependencyProviders(
+				serviceUtil.WithoutSelfDependency(),
+				serviceUtil.WithSameDomainProject())
 			if err != nil {
 				util.Logger().Errorf(err, "Get service's all providers for govern service failed.")
 				return nil, err
 			}
-			providers = skipSelfDependency(providers, serviceId)
+
 			serviceDetail.Consumers = consumers
 			serviceDetail.Providers = providers
 		case "":
@@ -337,15 +339,6 @@ func getServiceDetailUtil(ctx context.Context, serviceDetailOpt ServiceDetailOpt
 	return serviceDetail, nil
 }
 
-func skipSelfDependency(services []*pb.MicroService, serviceId string) []*pb.MicroService {
-	for key, service := range services {
-		if service.ServiceId == serviceId {
-			services = append(services[:key], services[key+1:]...)
-		}
-	}
-	return services
-}
-
 func statistics(ctx context.Context) (*pb.Statistics, error) {
 	result := &pb.Statistics{
 		Services:  &pb.StService{},
diff --git a/server/rest/controller/v4/dependency_controller.go b/server/rest/controller/v4/dependency_controller.go
index 8f2dd6b4..bafdd8b7 100644
--- a/server/rest/controller/v4/dependency_controller.go
+++ b/server/rest/controller/v4/dependency_controller.go
@@ -81,7 +81,9 @@ func (this *DependencyService) CreateDependenciesForMicroServices(w http.Respons
 
 func (this *DependencyService) GetConProDependencies(w http.ResponseWriter, r *http.Request) {
 	request := &pb.GetDependenciesRequest{
-		ServiceId: r.URL.Query().Get(":consumerId"),
+		ServiceId:  r.URL.Query().Get(":consumerId"),
+		SameDomain: r.URL.Query().Get("sameDomain") == "1",
+		NoSelf:     r.URL.Query().Get("noSelf") == "1",
 	}
 	resp, _ := core.ServiceAPI.GetConsumerDependencies(r.Context(), request)
 	respInternal := resp.Response
@@ -91,7 +93,9 @@ func (this *DependencyService) GetConProDependencies(w http.ResponseWriter, r *h
 
 func (this *DependencyService) GetProConDependencies(w http.ResponseWriter, r *http.Request) {
 	request := &pb.GetDependenciesRequest{
-		ServiceId: r.URL.Query().Get(":providerId"),
+		ServiceId:  r.URL.Query().Get(":providerId"),
+		SameDomain: r.URL.Query().Get("sameDomain") == "1",
+		NoSelf:     r.URL.Query().Get("noSelf") == "1",
 	}
 	resp, _ := core.ServiceAPI.GetProviderDependencies(r.Context(), request)
 	respInternal := resp.Response
diff --git a/server/service/service_dependency.go b/server/service/service_dependency.go
index cd986085..f1afffd3 100644
--- a/server/service/service_dependency.go
+++ b/server/service/service_dependency.go
@@ -128,7 +128,7 @@ func (s *MicroServiceService) GetProviderDependencies(ctx context.Context, in *p
 	}
 
 	dr := serviceUtil.NewProviderDependencyRelation(ctx, domainProject, provider)
-	services, err := dr.GetDependencyConsumers()
+	services, err := dr.GetDependencyConsumers(toDependencyFilterOptions(in)...)
 	if err != nil {
 		util.Logger().Errorf(err, "GetProviderDependencies failed.")
 		return &pb.GetProDependenciesResponse{
@@ -168,7 +168,7 @@ func (s *MicroServiceService) GetConsumerDependencies(ctx context.Context, in *p
 	}
 
 	dr := serviceUtil.NewConsumerDependencyRelation(ctx, domainProject, consumer)
-	services, err := dr.GetDependencyProviders()
+	services, err := dr.GetDependencyProviders(toDependencyFilterOptions(in)...)
 	if err != nil {
 		util.Logger().Errorf(err, "GetConsumerDependencies failed for get providers failed.")
 		return &pb.GetConDependenciesResponse{
@@ -182,3 +182,13 @@ func (s *MicroServiceService) GetConsumerDependencies(ctx context.Context, in *p
 		Providers: services,
 	}, nil
 }
+
+func toDependencyFilterOptions(in *pb.GetDependenciesRequest) (opts []serviceUtil.DependencyRelationFilterOption) {
+	if in.SameDomain {
+		opts = append(opts, serviceUtil.WithSameDomainProject())
+	}
+	if in.NoSelf {
+		opts = append(opts, serviceUtil.WithoutSelfDependency())
+	}
+	return opts
+}
diff --git a/server/service/service_dependency_test.go b/server/service/service_dependency_test.go
index 90803c50..d96304bb 100644
--- a/server/service/service_dependency_test.go
+++ b/server/service/service_dependency_test.go
@@ -17,10 +17,12 @@
 package service_test
 
 import (
+	"github.com/apache/incubator-servicecomb-service-center/pkg/util"
 	pb "github.com/apache/incubator-servicecomb-service-center/server/core/proto"
 	"github.com/apache/incubator-servicecomb-service-center/server/service/event"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"golang.org/x/net/context"
 )
 
 var deh event.DependencyEventHandler
@@ -287,9 +289,8 @@ var _ = Describe("'Dependency' service", func() {
 				respCreateDependency, err := serviceResource.CreateDependenciesForMicroServices(getContext(), &pb.CreateDependenciesRequest{
 					Dependencies: []*pb.ConsumerDependency{
 						{
-							Consumer: consumer,
-							Providers: []*pb.MicroServiceKey{
-							},
+							Consumer:  consumer,
+							Providers: []*pb.MicroServiceKey{},
 						},
 					},
 				})
@@ -411,6 +412,7 @@ var _ = Describe("'Dependency' service", func() {
 	Describe("execute 'get' operartion", func() {
 		var (
 			consumerId1 string
+			consumerId2 string
 			providerId1 string
 			providerId2 string
 		)
@@ -429,6 +431,21 @@ var _ = Describe("'Dependency' service", func() {
 			Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
 			consumerId1 = respCreateService.ServiceId
 
+			respCreateService, err = serviceResource.Create(util.SetDomainProject(context.Background(), "user", "user"),
+				&pb.CreateServiceRequest{
+					Service: &pb.MicroService{
+						Environment: pb.ENV_DEV,
+						AppId:       "get_dep_group",
+						ServiceName: "get_same_domain_dep_consumer",
+						Version:     "1.0.0",
+						Level:       "FRONT",
+						Status:      pb.MS_UP,
+					},
+				})
+			Expect(err).To(BeNil())
+			Expect(respCreateService.Response.Code).To(Equal(pb.Response_SUCCESS))
+			consumerId2 = respCreateService.ServiceId
+
 			respCreateService, err = serviceResource.Create(getContext(), &pb.CreateServiceRequest{
 				Service: &pb.MicroService{
 					AppId:       "get_dep_group",
@@ -520,7 +537,7 @@ var _ = Describe("'Dependency' service", func() {
 
 				Expect(deh.Handle()).To(BeNil())
 
-				By("get provider's deps")
+				By("get consumer's deps")
 				respGetP, err := serviceResource.GetProviderDependencies(getContext(), &pb.GetDependenciesRequest{
 					ServiceId: providerId1,
 				})
@@ -528,7 +545,7 @@ var _ = Describe("'Dependency' service", func() {
 				Expect(respGetP.Response.Code).To(Equal(pb.Response_SUCCESS))
 				Expect(respGetP.Consumers[0].ServiceId).To(Equal(consumerId1))
 
-				By("get consumer's deps")
+				By("get provider's deps")
 				respGetC, err := serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
 					ServiceId: consumerId1,
 				})
@@ -548,7 +565,7 @@ var _ = Describe("'Dependency' service", func() {
 
 				Expect(deh.Handle()).To(BeNil())
 
-				By("get provider again")
+				By("get consumer again")
 				respGetP, err = serviceResource.GetProviderDependencies(getContext(), &pb.GetDependenciesRequest{
 					ServiceId: providerId1,
 				})
@@ -556,13 +573,56 @@ var _ = Describe("'Dependency' service", func() {
 				Expect(respGetP.Response.Code).To(Equal(pb.Response_SUCCESS))
 				Expect(len(respGetP.Consumers)).To(Equal(0))
 
-				By("get consumer again")
+				By("get provider again")
 				respGetC, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
 					ServiceId: consumerId1,
 				})
 				Expect(err).To(BeNil())
 				Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
+				Expect(len(respGetC.Providers)).To(Equal(1))
 				Expect(respGetC.Providers[0].ServiceId).To(Equal(providerId2))
+
+				By("get self deps")
+				resp, err = instanceResource.Find(getContext(), &pb.FindInstancesRequest{
+					ConsumerServiceId: consumerId1,
+					AppId:             "get_dep_group",
+					ServiceName:       "get_dep_consumer",
+					VersionRule:       "1.0.0+",
+				})
+				Expect(err).To(BeNil())
+				Expect(resp.Response.Code).To(Equal(pb.Response_SUCCESS))
+
+				respGetC, err = serviceResource.GetConsumerDependencies(getContext(), &pb.GetDependenciesRequest{
+					ServiceId: consumerId1,
+					NoSelf:    true,
+				})
+				Expect(err).To(BeNil())
+				Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
+				Expect(len(respGetC.Providers)).To(Equal(1))
+
+				By("get same domain deps")
+				respFind, err := instanceResource.Find(
+					util.SetTargetDomainProject(
+						util.SetDomainProject(util.CloneContext(getContext()), "user", "user"),
+						"default", "default"),
+					&pb.FindInstancesRequest{
+						ConsumerServiceId: consumerId2,
+						AppId:             "default",
+						ServiceName:       "SERVICECENTER",
+						VersionRule:       "latest",
+					})
+				Expect(err).To(BeNil())
+				Expect(respFind.Response.Code).To(Equal(pb.Response_SUCCESS))
+
+				respGetC, err = serviceResource.GetConsumerDependencies(
+					util.SetDomainProject(context.Background(), "user", "user"),
+					&pb.GetDependenciesRequest{
+						ServiceId:  consumerId2,
+						SameDomain: true,
+					})
+				Expect(err).To(BeNil())
+				Expect(respGetC.Response.Code).To(Equal(pb.Response_SUCCESS))
+				Expect(len(respGetC.Providers)).To(Equal(0))
 			})
 		})
 	})
diff --git a/server/service/util/dependency.go b/server/service/util/dependency.go
index f78cd929..66261163 100644
--- a/server/service/util/dependency.go
+++ b/server/service/util/dependency.go
@@ -687,13 +687,18 @@ func NewDependencyRelation(ctx context.Context, domainProject string, consumer *
 	}
 }
 
-func (dr *DependencyRelation) GetDependencyProviders() ([]*pb.MicroService, error) {
+func (dr *DependencyRelation) GetDependencyProviders(opts ...DependencyRelationFilterOption) ([]*pb.MicroService, error) {
 	keys, err := dr.getProviderKeys()
 	if err != nil {
 		return nil, err
 	}
 	services := make([]*pb.MicroService, 0, len(keys))
+	op := toDependencyRelationFilterOpt(opts...)
 	for _, key := range keys {
+		if op.SameDomainProject && key.Tenant != dr.domainProject {
+			continue
+		}
+
 		providerIds, err := dr.parseDependencyRule(key)
 		if err != nil {
 			return nil, err
@@ -710,6 +715,9 @@ func (dr *DependencyRelation) GetDependencyProviders() ([]*pb.MicroService, erro
 					key.AppId, key.ServiceName, key.Version)
 				continue
 			}
+			if op.NonSelf && providerId == dr.consumer.ServiceId {
+				continue
+			}
 			services = append(services, provider)
 		}
 
@@ -795,15 +803,19 @@ func (dr *DependencyRelation) parseDependencyRule(dependencyRule *pb.MicroServic
 	return
 }
 
-func (dr *DependencyRelation) GetDependencyConsumers() ([]*pb.MicroService, error) {
+func (dr *DependencyRelation) GetDependencyConsumers(opts ...DependencyRelationFilterOption) ([]*pb.MicroService, error) {
 	consumerDependAllList, err := dr.getDependencyConsumersOfProvider()
 	if err != nil {
 		util.Logger().Errorf(err, "Get consumers of provider rule failed, %s", dr.provider.ServiceId)
 		return nil, err
 	}
 	consumers := make([]*pb.MicroService, 0)
-
+	op := toDependencyRelationFilterOpt(opts...)
 	for _, consumer := range consumerDependAllList {
+		if op.SameDomainProject && consumer.Tenant != dr.domainProject {
+			continue
+		}
+
 		service, err := dr.getServiceByMicroServiceKey(consumer)
 		if err != nil {
 			return nil, err
@@ -812,6 +824,11 @@ func (dr *DependencyRelation) GetDependencyConsumers() ([]*pb.MicroService, erro
 			util.Logger().Warnf(nil, "Consumer does not exist, %v", consumer)
 			continue
 		}
+
+		if op.NonSelf && service.ServiceId == dr.provider.ServiceId {
+			continue
+		}
+
 		consumers = append(consumers, service)
 	}
 	return consumers, nil
@@ -964,3 +981,30 @@ func DeleteDependencyForDeleteService(domainProject string, serviceId string, se
 	}
 	return registry.OpPut(registry.WithStrKey(key), registry.WithValue(data)), nil
 }
+
+type DependencyRelationFilterOpt struct {
+	SameDomainProject bool
+	NonSelf           bool
+}
+
+type DependencyRelationFilterOption func(opt DependencyRelationFilterOpt) DependencyRelationFilterOpt
+
+func WithSameDomainProject() DependencyRelationFilterOption {
+	return func(opt DependencyRelationFilterOpt) DependencyRelationFilterOpt {
+		opt.SameDomainProject = true
+		return opt
+	}
+}
+func WithoutSelfDependency() DependencyRelationFilterOption {
+	return func(opt DependencyRelationFilterOpt) DependencyRelationFilterOpt {
+		opt.NonSelf = true
+		return opt
+	}
+}
+
+func toDependencyRelationFilterOpt(opts ...DependencyRelationFilterOption) (op DependencyRelationFilterOpt) {
+	for _, opt := range opts {
+		op = opt(op)
+	}
+	return
+}
diff --git a/server/service/util/dependency_test.go b/server/service/util/dependency_test.go
index 52104c73..4ca26b8d 100644
--- a/server/service/util/dependency_test.go
+++ b/server/service/util/dependency_test.go
@@ -481,3 +481,14 @@ func TestDependency(t *testing.T) {
 		t.FailNow()
 	}
 }
+
+func TestDependencyRelationFilterOpt(t *testing.T) {
+	op := toDependencyRelationFilterOpt(
+		WithSameDomainProject(),
+		WithoutSelfDependency(),
+	)
+	if !op.NonSelf || !op.SameDomainProject {
+		fmt.Printf(`toDependencyRelationFilterOpt failed`)
+		t.FailNow()
+	}
+}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message