BUG/MINOR: acme: ensure ordering when serializing vars

Author: mjuraga

Makefile

@@ -34,7 +34,7 @@ spec:
 
 .PHONY: models
 models: gentypes spec swagger-check go-method-gen-check
-	rm -rf models/
+	rm -rf models/*.go
 	./bin/swagger generate model --additional-initialism=FCGI -f ${PROJECT_PATH}/specification/build/haproxy_spec.yaml -r ${PROJECT_PATH}/specification/copyright.txt -m models -t ${PROJECT_PATH}
 	./bin/go-method-gen --header-file=specification/copyright.txt --scan=models --debug --overrides=models/funcs/overrides.yaml && find ./generated -name "*.go" -exec cp {} ./models \; && rm -rf generated
 	go run cmd/struct_equal_generator/*.go -l ${PROJECT_PATH}/specification/copyright.txt ${PROJECT_PATH}/models

configuration/acme_provider.go

@@ -18,6 +18,7 @@ package configuration
 import (
 	"errors"
 	"fmt"
+	"sort"
 	"strings"
 
 	strfmt "github.com/go-openapi/strfmt"
@@ -271,12 +272,19 @@ func serializeAcmeVars(vars map[string]string) (string, error) {
 	if len(vars) == 0 {
 		return "", nil
 	}
-
 	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

@@ -58,7 +58,7 @@ func Test_ParseAcmeVars(t *testing.T) {
 		want map[string]string
 	}{
 		{
-			vars: `"foo=bar,ApiKey=FEFF\,==\""`,
+			vars: `"ApiKey=FEFF\,==\",foo=bar"`,
 			want: map[string]string{"foo": "bar", "ApiKey": "FEFF,==\""},
 		},
 	}