review: sort tags

traefik · Aug 1, 2022 · ef66aad · ef66aad
1 parent c164acc
commit ef66aad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/pkg/provider/consulcatalog/config.go b/pkg/provider/consulcatalog/config.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"hash/fnv"
 	"net"
+	"sort"
 	"strings"
 
 	"github.com/hashicorp/consul/api"
@@ -299,7 +300,12 @@ func getName(i itemData) string {
 		return provider.Normalize(i.Name)
 	}
 
+	tags := make([]string, len(i.Tags))
+	copy(tags, i.Tags)
+
+	sort.Strings(tags)
+
 	hasher := fnv.New64()
-	hasher.Write([]byte(strings.Join(i.Tags, ",")))
+	hasher.Write([]byte(strings.Join(tags, ",")))
 	return provider.Normalize(fmt.Sprintf("%s-%d", i.Name, hasher.Sum64()))
 }
diff --git a/pkg/provider/consulcatalog/config_test.go b/pkg/provider/consulcatalog/config_test.go
@@ -3,7 +3,6 @@ package consulcatalog
 import (
 	"context"
 	"fmt"
-	"sort"
 	"testing"
 
 	"github.com/hashicorp/consul/api"
@@ -2888,7 +2887,6 @@ func Test_buildConfiguration(t *testing.T) {
 				for k, v := range test.items[i].Labels {
 					tags = append(tags, fmt.Sprintf("%s=%s", k, v))
 				}
-				sort.Strings(tags)
 				test.items[i].Tags = tags
 			}
 

diff --git a/pkg/provider/nomad/config.go b/pkg/provider/nomad/config.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"hash/fnv"
 	"net"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -273,7 +274,12 @@ func getName(i item) string {
 		return provider.Normalize(i.Name)
 	}
 
+	tags := make([]string, len(i.Tags))
+	copy(tags, i.Tags)
+
+	sort.Strings(tags)
+
 	hasher := fnv.New64()
-	hasher.Write([]byte(strings.Join(i.Tags, ",")))
+	hasher.Write([]byte(strings.Join(tags, ",")))
 	return provider.Normalize(fmt.Sprintf("%s-%d", i.Name, hasher.Sum64()))
 }