From cf5c7cc56cc1598d9cd09e74f24302132e7de036 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 30 Dec 2025 14:45:54 +0800 Subject: [PATCH 1/4] trigger code review --- modules/openapi-generator/src/main/resources/go/client.mustache | 1 + samples/client/echo_api/go-external-refs/client.go | 1 + samples/client/echo_api/go/client.go | 1 + samples/client/petstore/go/go-petstore/client.go | 1 + .../client/extensions/x-auth-id-alias/go-experimental/client.go | 1 + .../petstore/go-petstore-generateMarshalJSON-false/client.go | 1 + samples/openapi3/client/petstore/go-petstore-withXml/client.go | 1 + .../client/petstore/go/go-petstore-aws-signature/client.go | 1 + samples/openapi3/client/petstore/go/go-petstore/client.go | 1 + 9 files changed, 9 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index dea298410dc3..52cf23760d7b 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -593,6 +593,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/client/echo_api/go-external-refs/client.go b/samples/client/echo_api/go-external-refs/client.go index 0acd53304c6a..45b7e4100f32 100644 --- a/samples/client/echo_api/go-external-refs/client.go +++ b/samples/client/echo_api/go-external-refs/client.go @@ -514,6 +514,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/client/echo_api/go/client.go b/samples/client/echo_api/go/client.go index 0acd53304c6a..45b7e4100f32 100644 --- a/samples/client/echo_api/go/client.go +++ b/samples/client/echo_api/go/client.go @@ -514,6 +514,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index c47d065a79aa..cabe50724b88 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -520,6 +520,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index ef706c87728c..fe9502bfda67 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -488,6 +488,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go index 9560cb90583f..f653cdb773e6 100644 --- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go +++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go @@ -500,6 +500,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/openapi3/client/petstore/go-petstore-withXml/client.go b/samples/openapi3/client/petstore/go-petstore-withXml/client.go index 9560cb90583f..f653cdb773e6 100644 --- a/samples/openapi3/client/petstore/go-petstore-withXml/client.go +++ b/samples/openapi3/client/petstore/go-petstore-withXml/client.go @@ -500,6 +500,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go index 7d9664e41128..db3ce85365c2 100644 --- a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go @@ -542,6 +542,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 3f017c316e8e..4dbd317000a5 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -538,6 +538,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { return err } err = file.Close() + if err != nil { return err } From b35b9a26e5f4dc22c275fd10b9f450967956814c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 30 Dec 2025 14:53:07 +0800 Subject: [PATCH 2/4] fix file close --- .../openapi-generator/src/main/resources/go/client.mustache | 6 +++--- samples/client/echo_api/go-external-refs/client.go | 6 +++--- samples/client/echo_api/go/client.go | 6 +++--- samples/client/petstore/go/go-petstore/client.go | 6 +++--- .../extensions/x-auth-id-alias/go-experimental/client.go | 6 +++--- .../go-petstore-generateMarshalJSON-false/client.go | 6 +++--- .../openapi3/client/petstore/go-petstore-withXml/client.go | 6 +++--- .../client/petstore/go/go-petstore-aws-signature/client.go | 6 +++--- samples/openapi3/client/petstore/go/go-petstore/client.go | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index 52cf23760d7b..dac8a09d9143 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -592,18 +592,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/client/echo_api/go-external-refs/client.go b/samples/client/echo_api/go-external-refs/client.go index 45b7e4100f32..fa8e962bbb25 100644 --- a/samples/client/echo_api/go-external-refs/client.go +++ b/samples/client/echo_api/go-external-refs/client.go @@ -513,18 +513,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/client/echo_api/go/client.go b/samples/client/echo_api/go/client.go index 45b7e4100f32..fa8e962bbb25 100644 --- a/samples/client/echo_api/go/client.go +++ b/samples/client/echo_api/go/client.go @@ -513,18 +513,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index cabe50724b88..525a564d1dae 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -519,18 +519,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index fe9502bfda67..c7b77298b996 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -487,18 +487,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go index f653cdb773e6..e11816be4cf4 100644 --- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go +++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go @@ -499,18 +499,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go-petstore-withXml/client.go b/samples/openapi3/client/petstore/go-petstore-withXml/client.go index f653cdb773e6..e11816be4cf4 100644 --- a/samples/openapi3/client/petstore/go-petstore-withXml/client.go +++ b/samples/openapi3/client/petstore/go-petstore-withXml/client.go @@ -499,18 +499,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go index db3ce85365c2..89dd6950e382 100644 --- a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go @@ -541,18 +541,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 4dbd317000a5..76ab28795e04 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -537,18 +537,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) + _, err = io.Copy(part, file) if err != nil { return err } - _, err = io.Copy(part, file) + err = file.Close() return err } From 5abdf70d001d83b31f7fca7fb51158214be6fa0a Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 30 Dec 2025 15:06:31 +0800 Subject: [PATCH 3/4] Revert "fix file close" This reverts commit b35b9a26e5f4dc22c275fd10b9f450967956814c. --- .../openapi-generator/src/main/resources/go/client.mustache | 6 +++--- samples/client/echo_api/go-external-refs/client.go | 6 +++--- samples/client/echo_api/go/client.go | 6 +++--- samples/client/petstore/go/go-petstore/client.go | 6 +++--- .../extensions/x-auth-id-alias/go-experimental/client.go | 6 +++--- .../go-petstore-generateMarshalJSON-false/client.go | 6 +++--- .../openapi3/client/petstore/go-petstore-withXml/client.go | 6 +++--- .../client/petstore/go/go-petstore-aws-signature/client.go | 6 +++--- samples/openapi3/client/petstore/go/go-petstore/client.go | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index dac8a09d9143..52cf23760d7b 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -592,18 +592,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/client/echo_api/go-external-refs/client.go b/samples/client/echo_api/go-external-refs/client.go index fa8e962bbb25..45b7e4100f32 100644 --- a/samples/client/echo_api/go-external-refs/client.go +++ b/samples/client/echo_api/go-external-refs/client.go @@ -513,18 +513,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/client/echo_api/go/client.go b/samples/client/echo_api/go/client.go index fa8e962bbb25..45b7e4100f32 100644 --- a/samples/client/echo_api/go/client.go +++ b/samples/client/echo_api/go/client.go @@ -513,18 +513,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index 525a564d1dae..cabe50724b88 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -519,18 +519,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index c7b77298b996..fe9502bfda67 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -487,18 +487,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go index e11816be4cf4..f653cdb773e6 100644 --- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go +++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go @@ -499,18 +499,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go-petstore-withXml/client.go b/samples/openapi3/client/petstore/go-petstore-withXml/client.go index e11816be4cf4..f653cdb773e6 100644 --- a/samples/openapi3/client/petstore/go-petstore-withXml/client.go +++ b/samples/openapi3/client/petstore/go-petstore-withXml/client.go @@ -499,18 +499,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go index 89dd6950e382..db3ce85365c2 100644 --- a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go @@ -541,18 +541,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 76ab28795e04..4dbd317000a5 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -537,18 +537,18 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } + err = file.Close() - part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } - _, err = io.Copy(part, file) + part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { return err } + _, err = io.Copy(part, file) - err = file.Close() return err } From 6ca94d0621c2f09b7fdebad97f71f269e1767137 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 30 Dec 2025 15:07:35 +0800 Subject: [PATCH 4/4] defer file close --- .../openapi-generator/src/main/resources/go/client.mustache | 6 +----- samples/client/echo_api/go-external-refs/client.go | 6 +----- samples/client/echo_api/go/client.go | 6 +----- samples/client/petstore/go/go-petstore/client.go | 6 +----- .../extensions/x-auth-id-alias/go-experimental/client.go | 6 +----- .../go-petstore-generateMarshalJSON-false/client.go | 6 +----- .../openapi3/client/petstore/go-petstore-withXml/client.go | 6 +----- .../client/petstore/go/go-petstore-aws-signature/client.go | 6 +----- samples/openapi3/client/petstore/go/go-petstore/client.go | 6 +----- 9 files changed, 9 insertions(+), 45 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache index 52cf23760d7b..9c189b8dc212 100644 --- a/modules/openapi-generator/src/main/resources/go/client.mustache +++ b/modules/openapi-generator/src/main/resources/go/client.mustache @@ -592,11 +592,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/client/echo_api/go-external-refs/client.go b/samples/client/echo_api/go-external-refs/client.go index 45b7e4100f32..01f4055c6cfe 100644 --- a/samples/client/echo_api/go-external-refs/client.go +++ b/samples/client/echo_api/go-external-refs/client.go @@ -513,11 +513,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/client/echo_api/go/client.go b/samples/client/echo_api/go/client.go index 45b7e4100f32..01f4055c6cfe 100644 --- a/samples/client/echo_api/go/client.go +++ b/samples/client/echo_api/go/client.go @@ -513,11 +513,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go index cabe50724b88..82ace87a5306 100644 --- a/samples/client/petstore/go/go-petstore/client.go +++ b/samples/client/petstore/go/go-petstore/client.go @@ -519,11 +519,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go index fe9502bfda67..9b0df1df106f 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go +++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go @@ -487,11 +487,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go index f653cdb773e6..2747d3b9714f 100644 --- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go +++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go @@ -499,11 +499,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/openapi3/client/petstore/go-petstore-withXml/client.go b/samples/openapi3/client/petstore/go-petstore-withXml/client.go index f653cdb773e6..2747d3b9714f 100644 --- a/samples/openapi3/client/petstore/go-petstore-withXml/client.go +++ b/samples/openapi3/client/petstore/go-petstore-withXml/client.go @@ -499,11 +499,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go index db3ce85365c2..79d1274dfd0c 100644 --- a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/client.go @@ -541,11 +541,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil { diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go index 4dbd317000a5..259fda811873 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/client.go +++ b/samples/openapi3/client/petstore/go/go-petstore/client.go @@ -537,11 +537,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error { if err != nil { return err } - err = file.Close() - - if err != nil { - return err - } + defer file.Close() part, err := w.CreateFormFile(fieldName, filepath.Base(path)) if err != nil {