openapi{2,3}: surface both json/yaml unmarshal errors (#950)

getkin · Jun 2, 2024 · 2cf1262 · 2cf1262
1 parent 03281ec
commit 2cf1262
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/openapi2/marsh.go b/openapi2/marsh.go
@@ -17,10 +17,18 @@ func unmarshalError(jsonUnmarshalErr error) error {
 }
 
 func unmarshal(data []byte, v interface{}) error {
+	var jsonErr, yamlErr error
+
 	// See https://github.com/getkin/kin-openapi/issues/680
-	if err := json.Unmarshal(data, v); err != nil {
-		// UnmarshalStrict(data, v) TODO: investigate how ymlv3 handles duplicate map keys
-		return yaml.Unmarshal(data, v)
+	if jsonErr = json.Unmarshal(data, v); jsonErr == nil {
+		return nil
+	}
+
+	// UnmarshalStrict(data, v) TODO: investigate how ymlv3 handles duplicate map keys
+	if yamlErr = yaml.Unmarshal(data, v); yamlErr == nil {
+		return nil
 	}
-	return nil
+
+	// If both unmarshaling attempts fail, return a new error that includes both errors
+	return fmt.Errorf("failed to unmarshal data: json error: %v, yaml error: %v", jsonErr, yamlErr)
 }
diff --git a/openapi3/marsh.go b/openapi3/marsh.go
@@ -17,10 +17,18 @@ func unmarshalError(jsonUnmarshalErr error) error {
 }
 
 func unmarshal(data []byte, v interface{}) error {
+	var jsonErr, yamlErr error
+
 	// See https://github.com/getkin/kin-openapi/issues/680
-	if err := json.Unmarshal(data, v); err != nil {
-		// UnmarshalStrict(data, v) TODO: investigate how ymlv3 handles duplicate map keys
-		return yaml.Unmarshal(data, v)
+	if jsonErr = json.Unmarshal(data, v); jsonErr == nil {
+		return nil
+	}
+
+	// UnmarshalStrict(data, v) TODO: investigate how ymlv3 handles duplicate map keys
+	if yamlErr = yaml.Unmarshal(data, v); yamlErr == nil {
+		return nil
 	}
-	return nil
+
+	// If both unmarshaling attempts fail, return a new error that includes both errors
+	return fmt.Errorf("failed to unmarshal data: json error: %v, yaml error: %v", jsonErr, yamlErr)
 }