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
 	}