Merge remote-tracking branch 'origin/master' into 5.0.x

samples/client/petstore/go/go-petstore-withXml/api_fake.go

@@ -1217,14 +1217,16 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context
 	localVarQueryParams.Add("ioutil", parameterToString(ioutil, "csv"))
 	localVarQueryParams.Add("http", parameterToString(http, "space"))
 	localVarQueryParams.Add("url", parameterToString(url, "csv"))
-	t:=context
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
-		s := reflect.ValueOf(t)
-		for i := 0; i < s.Len(); i++ {
-			localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+	{
+		t:=context
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+			}
+		} else {
+			localVarQueryParams.Add("context", parameterToString(t, "multi"))
 		}
-	} else {
-		localVarQueryParams.Add("context", parameterToString(t, "multi"))
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

samples/client/petstore/go/go-petstore/api_fake.go

@@ -1216,14 +1216,16 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context
 	localVarQueryParams.Add("ioutil", parameterToString(ioutil, "csv"))
 	localVarQueryParams.Add("http", parameterToString(http, "space"))
 	localVarQueryParams.Add("url", parameterToString(url, "csv"))
-	t:=context
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
-		s := reflect.ValueOf(t)
-		for i := 0; i < s.Len(); i++ {
-			localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+	{
+		t:=context
+		if reflect.TypeOf(t).Kind() == reflect.Slice {
+			s := reflect.ValueOf(t)
+			for i := 0; i < s.Len(); i++ {
+				localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+			}
+		} else {
+			localVarQueryParams.Add("context", parameterToString(t, "multi"))
 		}
-	} else {
-		localVarQueryParams.Add("context", parameterToString(t, "multi"))
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

samples/client/petstore/go/pet_api_test.go

@@ -142,7 +142,10 @@ func TestFindPetsByStatus(t *testing.T) {
 }
 
 func TestUploadFile(t *testing.T) {
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFile(context.Background(), 12830, &sw.UploadFileOpts{
 		AdditionalMetadata: optional.NewString("golang"),
@@ -160,7 +163,10 @@ func TestUploadFile(t *testing.T) {
 
 func TestUploadFileRequired(t *testing.T) {
 	return // remove when server supports this endpoint
-	file, _ := os.Open("../python/testfiles/foo.png")
+	file, err1 := os.Open("testfiles/foo.png")
+	if err1 != nil {
+		t.Fatalf("Error opening file: %v", err1)
+	}
 
 	_, r, err := client.PetApi.UploadFileWithRequiredFile(context.Background(), 12830,
 		file,