TEST/MINOR: sort acme vars when serializing

This fixes some tests flakiness

Author: hdurand0710

configuration/acme_provider.go

@@ -18,6 +18,7 @@ package configuration
 import (
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 
 	strfmt "github.com/go-openapi/strfmt"
@@ -275,8 +276,17 @@ func serializeAcmeVars(vars map[string]string) (string, error) {
 	var sb strings.Builder
 	first := true
 
+	// Extract and sort the keys
+	keys := make([]string, 0, len(vars))
+	for name := range vars {
+		keys = append(keys, name)
+	}
+	sort.Strings(keys)
+
 	sb.WriteByte('"')
-	for k, v := range vars {
+	for _, k := range keys {
+		v := vars[k]
+
 		if len(k) == 0 {
 			continue
 		}

configuration/acme_provider_test.go

@@ -24,28 +24,22 @@ import (
 func Test_serializeAcmeVars(t *testing.T) {
 	tests := []struct {
 		vars    map[string]string
-		want    []string
+		want    string
 		wantErr bool
 	}{
 		{
 			vars:    map[string]string{"foo": "bar", "ApiKey": "FEFF,==\""},
-			want:    []string{`"foo=bar,ApiKey=FEFF\,==\""`, `"ApiKey=FEFF\,==\",foo=bar"`},
+			want:    `"ApiKey=FEFF\,==\",foo=bar"`,
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
-		t.Run(tt.want[0], func(t *testing.T) {
+		t.Run(tt.want, func(t *testing.T) {
 			got, err := serializeAcmeVars(tt.vars)
 			if tt.wantErr != (err != nil) {
 				t.Errorf("serializeAcmeVars() got error '%v', wantErr=%v", err, tt.wantErr)
 			}
-			ok := false
-			for _, wanted := range tt.want {
-				if !ok {
-					ok = (got == wanted)
-				}
-			}
-			if !ok {
+			if got != tt.want {
 				t.Errorf("serializeAcmeVars() = %v, want %v", got, tt.want)
 			}
 		})