fix: consul catalog constraints.

pkg/provider/consulcatalog/config.go

@@ -80,7 +80,7 @@ func (p *Provider) keepContainer(ctx context.Context, item itemData) bool {
 		return false
 	}
 
-	matches, err := constraints.Match(item.Labels, p.Constraints)
+	matches, err := constraints.MatchTags(item.Tags, p.Constraints)
 	if err != nil {
 		logger.Errorf("Error matching constraints expression: %v", err)
 		return false

pkg/provider/consulcatalog/config_test.go

@@ -2,6 +2,7 @@ package consulcatalog
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/containous/traefik/v2/pkg/config/dynamic"
@@ -1541,7 +1542,7 @@ func Test_buildConfiguration(t *testing.T) {
 					Status:  api.HealthPassing,
 				},
 			},
-			constraints: `Label("traefik.tags", "bar")`,
+			constraints: `Tag("traefik.tags=bar")`,
 			expected: &dynamic.Configuration{
 				TCP: &dynamic.TCPConfiguration{
 					Routers:  map[string]*dynamic.TCPRouter{},
@@ -1568,7 +1569,7 @@ func Test_buildConfiguration(t *testing.T) {
 					Status:  api.HealthPassing,
 				},
 			},
-			constraints: `Label("traefik.tags", "foo")`,
+			constraints: `Tag("traefik.tags=foo")`,
 			expected: &dynamic.Configuration{
 				TCP: &dynamic.TCPConfiguration{
 					Routers:  map[string]*dynamic.TCPRouter{},
@@ -1955,6 +1956,12 @@ func Test_buildConfiguration(t *testing.T) {
 				var err error
 				test.items[i].ExtraConf, err = p.getConfiguration(test.items[i])
 				require.NoError(t, err)
+
+				var tags []string
+				for k, v := range test.items[i].Labels {
+					tags = append(tags, fmt.Sprintf("%s=%s", k, v))
+				}
+				test.items[i].Tags = tags
 			}
 
 			configuration := p.buildConfiguration(context.Background(), test.items)

pkg/provider/consulcatalog/consul_catalog.go

@@ -30,6 +30,7 @@ type itemData struct {
 	Port      string
 	Status    string
 	Labels    map[string]string
+	Tags      []string
 	ExtraConf configuration
 }
 
@@ -157,7 +158,6 @@ func (p *Provider) getConsulServicesData(ctx context.Context) ([]itemData, error
 		}
 
 		for _, consulService := range consulServices {
-			labels := tagsToNeutralLabels(consulService.ServiceTags, p.Prefix)
 			address := consulService.ServiceAddress
 			if address == "" {
 				address = consulService.Address
@@ -169,7 +169,8 @@ func (p *Provider) getConsulServicesData(ctx context.Context) ([]itemData, error
 				Name:    consulService.ServiceName,
 				Address: address,
 				Port:    strconv.Itoa(consulService.ServicePort),
-				Labels:  labels,
+				Labels:  tagsToNeutralLabels(consulService.ServiceTags, p.Prefix),
+				Tags:    consulService.ServiceTags,
 				Status:  consulService.Checks.AggregatedStatus(),
 			}
 

pkg/provider/consulcatalog/convert_types_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestTagsToNeutralLabels(t *testing.T) {
+func Test_tagsToNeutralLabels(t *testing.T) {
 	testCases := []struct {
 		desc     string
 		tags     []string