fix after getkin#870: make sure Bis does not surface up

Signed-off-by: Pierre Fenoll <pierrefenoll@gmail.com>
fenollp · Nov 28, 2023 · f68d8cf · f68d8cf
1 parent 0cc5e22
commit f68d8cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openapi2/marsh.go b/openapi2/marsh.go
@@ -9,9 +9,9 @@ import (
 )
 
 func unmarshalError(jsonUnmarshalErr error) error {
-	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis."); found && before != "" && after != "" {
+	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {
 		before = strings.ReplaceAll(before, " Go struct ", " ")
-		return fmt.Errorf("%s.%s", before, after)
+		return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))
 	}
 	return jsonUnmarshalErr
 }

diff --git a/openapi3/marsh.go b/openapi3/marsh.go
@@ -9,9 +9,9 @@ import (
 )
 
 func unmarshalError(jsonUnmarshalErr error) error {
-	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis."); found && before != "" && after != "" {
+	if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {
 		before = strings.ReplaceAll(before, " Go struct ", " ")
-		return fmt.Errorf("%s.%s", before, after)
+		return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))
 	}
 	return jsonUnmarshalErr
 }