web: sort custom annotations keys for deterministic tests

tsuru · Dec 14, 2022 · 9b1bc05 · 9b1bc05
1 parent b224357
commit 9b1bc05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/internal/pkg/rpaas/k8s_test.go b/internal/pkg/rpaas/k8s_test.go
@@ -3153,7 +3153,7 @@ func Test_k8sRpaasManager_CreateInstance(t *testing.T) {
 			name:          "with custom annotations and forbidden prefixes",
 			args:          CreateArgs{Name: "r1", Team: "t1", Parameters: map[string]interface{}{"annotations": "{\"my-custom-annotation\": \"my-value\", \"rpaas.extensions.tsuru.io/tags\": \"tag1,tag2\", \"rpaas.extensions.tsuru.io/description\": \"my description\"}"}},
 			extraConfig:   config.RpaasConfig{ForbiddenAnnotationsPrefixes: []string{"rpaas.extensions.tsuru.io"}},
-			expectedError: `annotation "rpaas.extensions.tsuru.io/tags" is not allowed`,
+			expectedError: `annotation "rpaas.extensions.tsuru.io/description" is not allowed`,
 		},
 	}
 	for _, tt := range tests {

diff --git a/internal/pkg/rpaas/manager.go b/internal/pkg/rpaas/manager.go
@@ -277,7 +277,12 @@ func getAnnotations(params map[string]interface{}) (map[string]string, error) {
 		return nil, err
 	}
 	forbiddenAnnotationsPrefixes := config.Get().ForbiddenAnnotationsPrefixes
+	var sortedAnnotationsKeys []string
 	for k := range annotations {
+		sortedAnnotationsKeys = append(sortedAnnotationsKeys, k)
+	}
+	sort.Strings(sortedAnnotationsKeys)
+	for _, k := range sortedAnnotationsKeys {
 		// check if annotation complies with allowed k8s annotations
 		annotationParts := strings.Split(k, "/")
 		if len(annotationParts) > 1 {