Ensure added host entries are sorted

crc-org · Nov 25, 2020 · 2f8a4c1 · 2f8a4c1
1 parent 3a1d7cb
commit 2f8a4c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/hosts/hosts.go b/pkg/hosts/hosts.go
@@ -2,6 +2,7 @@ package hosts
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/goodhosts/hostsfile"
@@ -35,6 +36,8 @@ func (h *Hosts) Add(ip string, hosts []string) error {
 		hostEntries = append(hostEntries, key)
 	}
 
+	sort.Strings(hostEntries)
+
 	if err := h.File.Add(ip, hostEntries...); err != nil {
 		return err
 	}

diff --git a/pkg/hosts/hosts_test.go b/pkg/hosts/hosts_test.go
@@ -20,12 +20,12 @@ func TestAdd(t *testing.T) {
 
 	host := hosts(t, hostsFile)
 
-	assert.NoError(t, host.Add("127.0.0.1", []string{"entry1", "entry2"}))
-	assert.NoError(t, host.Add("127.0.0.2", []string{"entry3"}))
+	assert.NoError(t, host.Add("127.0.0.1", []string{"entry1", "entry2", "entry3"}))
+	assert.NoError(t, host.Add("127.0.0.2", []string{"entry4"}))
 
 	content, err := ioutil.ReadFile(hostsFile)
 	assert.NoError(t, err)
-	assert.Equal(t, "127.0.0.1 entry1 entry2\n127.0.0.2 entry3\n", string(content))
+	assert.Equal(t, "127.0.0.1 entry1 entry2 entry3\n127.0.0.2 entry4\n", string(content))
 }
 
 func TestRemove(t *testing.T) {