feat: support multiple tags

Author: jialeicui

consul.go

@@ -33,7 +33,7 @@ func (r *resolvr) Close() {
 
 //go:generate ./bin/moq -out mocks_test.go . servicer
 type servicer interface {
-	Service(string, string, bool, *api.QueryOptions) ([]*api.ServiceEntry, *api.QueryMeta, error)
+	ServiceMultipleTags(string, []string, bool, *api.QueryOptions) ([]*api.ServiceEntry, *api.QueryMeta, error)
 }
 
 func watchConsulService(ctx context.Context, s servicer, tgt target, out chan<- []string) {
@@ -48,9 +48,9 @@ func watchConsulService(ctx context.Context, s servicer, tgt target, out chan<-
 	go func() {
 		var lastIndex uint64
 		for {
-			ss, meta, err := s.Service(
+			ss, meta, err := s.ServiceMultipleTags(
 				tgt.Service,
-				tgt.Tag,
+				tgt.Tags,
 				tgt.Healthy,
 				&api.QueryOptions{
 					WaitIndex:         lastIndex,

consul_test.go

@@ -62,7 +62,7 @@ func TestWatchConsulService(t *testing.T) {
 		errorFromService error
 		want             []string
 	}{
-		{"simple", target{Service: "svc", Wait: time.Second},
+		{"simple", target{Service: "svc", Tags: []string{"foo", "bar"}, Wait: time.Second},
 			[]*api.ServiceEntry{
 				{
 					Service: &api.AgentService{Address: "127.0.0.1", Port: 1024},
@@ -92,9 +92,9 @@ func TestWatchConsulService(t *testing.T) {
 				}
 			}()
 			fconsul := &servicerMock{
-				ServiceFunc: func(s1, s2 string, b bool, queryOptions *api.QueryOptions) ([]*api.ServiceEntry, *api.QueryMeta, error) {
+				ServiceMultipleTagsFunc: func(s1 string, s2 []string, b bool, queryOptions *api.QueryOptions) ([]*api.ServiceEntry, *api.QueryMeta, error) {
 					require.Equal(t, tt.tgt.Service, s1)
-					require.Equal(t, tt.tgt.Tag, s2)
+					require.Equal(t, tt.tgt.Tags, s2)
 					require.Equal(t, tt.tgt.Healthy, b)
 					require.Equal(t, tt.tgt.Near, queryOptions.Near)
 					require.Equal(t, tt.tgt.Wait, queryOptions.WaitTime)

mocks_test.go

@@ -20,7 +20,7 @@ type target struct {
 	Wait              time.Duration `form:"wait"`
 	Timeout           time.Duration `form:"timeout"`
 	MaxBackoff        time.Duration `form:"max-backoff"`
-	Tag               string        `form:"tag"`
+	Tags              []string      `form:"tag"`
 	Near              string        `form:"near"`
 	Limit             int           `form:"limit"`
 	Healthy           bool          `form:"healthy"`
@@ -34,10 +34,11 @@ type target struct {
 }
 
 func (t *target) String() string {
-	return fmt.Sprintf("service='%s' healthy='%t' tag='%s'", t.Service, t.Healthy, t.Tag)
+	return fmt.Sprintf("service='%s' healthy='%t' tag='%+v'", t.Service, t.Healthy, t.Tags)
 }
 
-//  parseURL with parameters
+//	parseURL with parameters
+//
 // see README.md for the actual format
 // URL schema will stay stable in the future for backward compatibility
 func parseURL(u string) (target, error) {

target.go

@@ -24,7 +24,7 @@ func Test_parseURL(t *testing.T) {
 			},
 			false,
 		},
-		{"all-args", "consul://user:password@127.0.0.127:8555/my-service?wait=14s&near=host&insecure=true&limit=1&tag=production&token=test_token&max-backoff=2s&dc=xx&allow-stale=true&require-consistent=true",
+		{"all-args", "consul://user:password@127.0.0.127:8555/my-service?wait=14s&near=host&insecure=true&limit=1&tag=production&tag=extra_tag&token=test_token&max-backoff=2s&dc=xx&allow-stale=true&require-consistent=true",
 			target{
 				Addr:              "127.0.0.127:8555",
 				User:              "user",
@@ -34,7 +34,7 @@ func Test_parseURL(t *testing.T) {
 				Wait:              14 * time.Second,
 				TLSInsecure:       true,
 				Limit:             1,
-				Tag:               "production",
+				Tags:              []string{"production", "extra_tag"},
 				Token:             "test_token",
 				MaxBackoff:        2 * time.Second,
 				Dc:                "xx",