fix

oapi-codegen · May 6, 2024 · 52f6cdc · 52f6cdc
1 parent bee2e99
commit 52f6cdc
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 76 deletions.
diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go
diff --git a/internal/test/issues/issue-1168/api.gen.go b/internal/test/issues/issue-1168/api.gen.go
diff --git a/internal/test/issues/issue-1219/issue.gen.go b/internal/test/issues/issue-1219/issue.gen.go
diff --git a/internal/test/issues/issue193/issue.gen.go b/internal/test/issues/issue193/issue.gen.go
diff --git a/pkg/codegen/templates/additional-properties.tmpl b/pkg/codegen/templates/additional-properties.tmpl
@@ -60,15 +60,16 @@ func (a {{.TypeName}}) MarshalJSON() ([]byte, error) {
     }
 {{if not .Required}} }{{end}}
 {{end}}
-    var joinedError error
+    var errs []error
     for fieldName, field := range a.AdditionalProperties {
 		object[fieldName], err = json.Marshal(field)
 		if err != nil {
-            joinedError = errors.Join(joinedError, fmt.Errorf("'%s': %w", fieldName, err))
+            errs = append(errs, fmt.Errorf("'%s': %w", fieldName, err))
 		}
 	}
-    if joinedError != nil {
-        return nil, fmt.Errorf("error marshaling %w", joinedError)
+    err = errors.Join(errs...)
+    if err != nil {
+        return nil, fmt.Errorf("error marshaling %w", err)
     }
 
 	return json.Marshal(object)