[Go][Client] Use configured Scheme and Host in requests

Previously we were simply setting the Host header and
completely ignoring the configured scheme.

Author: johanbrandhorst

modules/openapi-generator/src/main/resources/go/client.mustache

@@ -244,6 +244,16 @@ func (c *APIClient) prepareRequest(
 		return nil, err
 	}
 
+	// Override request host, if applicable
+	if c.cfg.Host != "" {
+		url.Host = c.cfg.Host
+	}
+
+	// Override request scheme, if applicable
+	if c.cfg.Scheme != "" {
+		url.Scheme = c.cfg.Scheme
+	}
+
 	// Adding Query Param
 	query := url.Query()
 	for k, v := range queryParams {
@@ -274,11 +284,6 @@ func (c *APIClient) prepareRequest(
 		localVarRequest.Header = headers
 	}
 
-	// Override request host, if applicable
-	if c.cfg.Host != "" {
-		localVarRequest.Host = c.cfg.Host
-	}
-
 	// Add the user agent to the request.
 	localVarRequest.Header.Add("User-Agent", c.cfg.UserAgent)
 

samples/client/petstore/go/auth_test.go

@@ -229,11 +229,23 @@ func TestHostOverride(t *testing.T) {
 		t.Fatalf("Error while finding pets by status: %v", err)
 	}
 
-	if r.Request.Host != testHost {
+	if r.Request.URL.Host != testHost {
 		t.Errorf("Request Host is %v, expected %v", r.Request.Host, testHost)
 	}
 }
 
+func TestSchemeOverride(t *testing.T) {
+	_, r, err := client.PetApi.FindPetsByStatus(context.Background(), nil)
+
+	if err != nil {
+		t.Fatalf("Error while finding pets by status: %v", err)
+	}
+
+	if r.Request.URL.Scheme != testScheme {
+		t.Errorf("Request Scheme is %v, expected %v", r.Request.URL.Scheme, testScheme)
+	}
+}
+
 // Add custom clients to the context.
 func createContext(httpClient *http.Client) context.Context {
 	parent := oauth2.NoContext

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

@@ -255,6 +255,16 @@ func (c *APIClient) prepareRequest(
 		return nil, err
 	}
 
+	// Override request host, if applicable
+	if c.cfg.Host != "" {
+		url.Host = c.cfg.Host
+	}
+
+	// Override request scheme, if applicable
+	if c.cfg.Scheme != "" {
+		url.Scheme = c.cfg.Scheme
+	}
+
 	// Adding Query Param
 	query := url.Query()
 	for k, v := range queryParams {
@@ -285,11 +295,6 @@ func (c *APIClient) prepareRequest(
 		localVarRequest.Header = headers
 	}
 
-	// Override request host, if applicable
-	if c.cfg.Host != "" {
-		localVarRequest.Host = c.cfg.Host
-	}
-
 	// Add the user agent to the request.
 	localVarRequest.Header.Add("User-Agent", c.cfg.UserAgent)
 

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

@@ -14,12 +14,14 @@ import (
 
 var client *sw.APIClient
 
-const testHost = "testhost"
+const testHost = "petstore.swagger.io:80"
+const testScheme = "http"
 
 func TestMain(m *testing.M) {
 	cfg := sw.NewConfiguration()
 	cfg.AddDefaultHeader("testheader", "testvalue")
 	cfg.Host = testHost
+	cfg.Scheme = testScheme
 	client = sw.NewAPIClient(cfg)
 	retCode := m.Run()
 	os.Exit(retCode)

samples/client/petstore/go/pet_api_test.go

@@ -1 +1 @@
-4.0.0-SNAPSHOT
+4.0.2-SNAPSHOT

samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION

@@ -12,14 +12,16 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 ## Installation
 
 Install the following dependencies:
-```
+
+```shell
 go get github.com/stretchr/testify/assert
 go get golang.org/x/oauth2
 go get golang.org/x/net/context
 go get github.com/antihax/optional
 ```
 
 Put the package under your project folder and add the following in import:
+
 ```golang
 import "./petstore"
 ```
@@ -79,10 +81,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
@@ -104,6 +108,7 @@ Class | Method | HTTP request | Description
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [Model200Response](docs/Model200Response.md)
  - [Name](docs/Name.md)
+ - [NullableClass](docs/NullableClass.md)
  - [NumberOnly](docs/NumberOnly.md)
  - [Order](docs/Order.md)
  - [OuterComposite](docs/OuterComposite.md)
@@ -121,51 +126,71 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Authorization
 
+
+
 ## api_key
-- **Type**: API key 
+
+- **Type**: API key
 
 Example
+
 ```golang
 auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
-	Key: "APIKEY",
-	Prefix: "Bearer", // Omit if not necessary.
+    Key: "APIKEY",
+    Prefix: "Bearer", // Omit if not necessary.
 })
 r, err := client.Service.Operation(auth, args)
 ```
+
+
 ## api_key_query
-- **Type**: API key 
+
+- **Type**: API key
 
 Example
+
 ```golang
 auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{
-	Key: "APIKEY",
-	Prefix: "Bearer", // Omit if not necessary.
+    Key: "APIKEY",
+    Prefix: "Bearer", // Omit if not necessary.
 })
 r, err := client.Service.Operation(auth, args)
 ```
+
+
 ## bearer_test
+
 - **Type**: HTTP basic authentication
 
 Example
+
 ```golang
 auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-	UserName: "username",
-	Password: "password",
+    UserName: "username",
+    Password: "password",
 })
 r, err := client.Service.Operation(auth, args)
 ```
+
+
 ## http_basic_test
+
 - **Type**: HTTP basic authentication
 
 Example
+
 ```golang
 auth := context.WithValue(context.Background(), sw.ContextBasicAuth, sw.BasicAuth{
-	UserName: "username",
-	Password: "password",
+    UserName: "username",
+    Password: "password",
 })
 r, err := client.Service.Operation(auth, args)
 ```
+
+
 ## petstore_auth
+
+
 - **Type**: OAuth
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
@@ -174,12 +199,14 @@ r, err := client.Service.Operation(auth, args)
  - **read:pets**: read your pets
 
 Example
+
 ```golang
 auth := context.WithValue(context.Background(), sw.ContextAccessToken, "ACCESSTOKENSTRING")
 r, err := client.Service.Operation(auth, args)
 ```
 
 Or via OAuth2 module to automatically refresh tokens and perform user authentication.
+
 ```golang
 import "golang.org/x/oauth2"
 
@@ -190,6 +217,7 @@ auth := context.WithValue(oauth2.NoContext, sw.ContextOAuth2, tokenSource)
 r, err := client.Service.Operation(auth, args)
 ```
 
+
 ## Author