Merge pull request #480 from zoncoen/config

fix: keep orders of protocol options
zoncoen · Dec 22, 2024 · daba67b · daba67b
2 parents bfc1fda + c557b0a
commit daba67b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/schema/config_test.go b/schema/config_test.go
@@ -38,12 +38,6 @@ func TestLoadConfig(t *testing.T) {
 							Position: yaml.CommentLinePosition,
 						},
 					},
-					"$.protocols.grpc.request.auth": {
-						{
-							Texts:    []string{" TODO: fix order issue", " proto:", "   imports:", "   - proto"},
-							Position: yaml.CommentHeadPosition,
-						},
-					},
 				},
 			},
 		}
@@ -100,11 +94,11 @@ func TestLoadConfig(t *testing.T) {
 							{
 								Key: "grpc",
 								Value: RawMessage(`request:
-  auth:
-    insecure: true
   proto:
     imports:
-    - proto`),
+    - proto
+  auth:
+    insecure: true`),
 							},
 						},
 					},

diff --git a/schema/testdata/config/valid-with-comment.yaml b/schema/testdata/config/valid-with-comment.yaml
@@ -15,15 +15,11 @@ plugins:
 protocols:
   grpc:
     request:
-      # TODO: fix order issue
-      # proto:
-      #   imports:
-      #   - proto
-      auth:
-        insecure: true
       proto:
         imports:
         - proto
+      auth:
+        insecure: true
 input:
   excludes:
   - .ytt.yaml$

diff --git a/schema/testdata/config/valid.yaml b/schema/testdata/config/valid.yaml
@@ -13,11 +13,11 @@ plugins:
 protocols:
   grpc:
     request:
-      auth:
-        insecure: true
       proto:
         imports:
         - proto
+      auth:
+        insecure: true
 input:
   excludes:
   - .ytt.yaml$

diff --git a/schema/yaml.go b/schema/yaml.go
@@ -91,7 +91,7 @@ func (m OrderedMap[K, V]) ToSlice() []OrderedMapItem[K, V] {
 // UnmarshalYAML implements yaml.BytesUnmarshaler interface.
 func (m *OrderedMap[K, V]) UnmarshalYAML(b []byte) error {
 	var s yaml.MapSlice
-	if err := yaml.Unmarshal(b, &s); err != nil {
+	if err := yaml.UnmarshalWithOptions(b, &s, yaml.UseOrderedMap()); err != nil {
 		return err
 	}
 	if len(s) == 0 {