WIP on making SF labels match docker provider

labels.go

@@ -12,14 +12,38 @@ func getFuncBoolLabel(labelName string, defaultValue bool) func(service ServiceI
 	}
 }
 
-func getFuncServiceStringLabel(service ServiceItemExtended, labelName string, defaultValue string) string {
+func getServiceStringLabel(service ServiceItemExtended, labelName string, defaultValue string) string {
 	return label.GetStringValue(service.Labels, labelName, defaultValue)
 }
 
-func hasFuncService(service ServiceItemExtended, labelName string) bool {
+func getFuncServiceStringLabel(labelName string, defaultValue string) func(service ServiceItemExtended) string {
+	return func(service ServiceItemExtended) string {
+		return label.GetStringValue(service.Labels, labelName, defaultValue)
+	}
+}
+
+func hasService(service ServiceItemExtended, labelName string) bool {
 	return label.Has(service.Labels, labelName)
 }
 
+func hasFuncService(labelName string) func(service ServiceItemExtended) bool {
+	return func(service ServiceItemExtended) bool {
+		return label.Has(service.Labels, labelName)
+	}
+}
+
+func getFuncServiceSliceStringLabel(labelName string) func(service ServiceItemExtended) []string {
+	return func(service ServiceItemExtended) []string {
+		return label.GetSliceStringValue(service.Labels, labelName)
+	}
+}
+
+func getFuncServiceMapLabel(labelName string) func(service ServiceItemExtended) map[string]string {
+	return func(service ServiceItemExtended) map[string]string {
+		return label.GetMapValue(service.Labels, labelName)
+	}
+}
+
 func getServiceLabelsWithPrefix(service ServiceItemExtended, prefix string) map[string]string {
 	results := make(map[string]string)
 	for k, v := range service.Labels {

servicefabric.go

@@ -12,6 +12,7 @@ import (
 	"github.com/containous/traefik/job"
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/provider"
+	"github.com/containous/traefik/provider/label"
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/types"
 	sf "github.com/jjcollinge/servicefabric"
@@ -96,17 +97,23 @@ func (p *Provider) updateConfig(configurationChan chan<- types.ConfigMessage, po
 func (p *Provider) buildConfiguration(sfClient sfClient) (*types.Configuration, error) {
 	var sfFuncMap = template.FuncMap{
 		"getServices":                getServices,
-		"hasLabel":                   hasFuncService,
-		"getLabelValue":              getFuncServiceStringLabel,
+		"hasLabel":                   hasService,
+		"getLabelValue":              getServiceStringLabel,
 		"getLabelsWithPrefix":        getServiceLabelsWithPrefix,
 		"isPrimary":                  isPrimary,
-		"isExposed":                  getFuncBoolLabel("expose", false),
+		"isEnabled":                  getFuncBoolLabel(label.SuffixEnable, false),
 		"getBackendName":             getBackendName,
 		"getDefaultEndpoint":         getDefaultEndpoint,
 		"getNamedEndpoint":           getNamedEndpoint,           // FIXME unused
 		"getApplicationParameter":    getApplicationParameter,    // FIXME unused
 		"doesAppParamContain":        doesAppParamContain,        // FIXME unused
 		"filterServicesByLabelValue": filterServicesByLabelValue, // FIXME unused
+
+		"getPassTLSCert":      getFuncBoolLabel(label.SuffixFrontendPassTLSCert, false),
+		"hasRequestHeaders":   hasFuncService(label.SuffixFrontendRequestHeaders),
+		"getRequestHeaders":   getFuncServiceMapLabel(label.SuffixFrontendRequestHeaders),
+		"hasFrameDenyHeaders": hasFuncService(label.SuffixFrontendHeadersFrameDeny),
+		"getFrameDenyHeaders": getFuncBoolLabel(label.SuffixFrontendHeadersFrameDeny, false),
 	}
 
 	services, err := getClusterServices(sfClient)