feat!: allow passing of base URL as string (#74)

redhat-developer · Jun 3, 2021 · 478ac73 · 478ac73
1 parent 76ca85f
commit 478ac73
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 25 deletions.
diff --git a/examples/kafkainstance/kafka_instance.go b/examples/kafkainstance/kafka_instance.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1internal/client"
 	"context"
 	"fmt"
 	"os"
@@ -19,10 +18,10 @@ func main() {
 
 	apiClient := kafkainstanceapi.NewAPIClient(&kafkainstanceapi.Config{
 		HTTPClient: tc,
+		Debug:      true,
+		BaseURL:    "http://localhost:9000/custom/path/to/rest",
 	})
 
-	x := kafkainstance.Topic{}
-
 	res, _, err := apiClient.DefaultApi.GetTopics(context.Background()).Execute()
 	if err != nil {
 		panic(err)

diff --git a/internal/api_config.go b/internal/api_config.go
@@ -2,7 +2,6 @@ package internal
 
 import (
 	"net/http"
-	"net/url"
 )
 
 // APIConfig defines the available configuration options
@@ -11,7 +10,7 @@ type APIConfig struct {
 	// HTTPClient is a custom HTTP client
 	HTTPClient *http.Client
 	// Debug enables debug-level logging
-	Debug      bool
-	// ServerURL sets a custom API server base URL
-	ServerURL  *url.URL
-}
+	Debug bool
+	// BaseURL sets a custom API server base URL
+	BaseURL string
+}
diff --git a/kafkainstance/apiv1internal/README.md b/kafkainstance/apiv1internal/README.md
@@ -39,11 +39,10 @@ kafkas, resp, err := client.DefaultApi.GetTopics(context.Background()).Execute()
 You can override the default configuration options:
 
 ```go
-baseURL, _ := url.Parse("http://localhost:8001")
 cfg := kafkainstance.Config{
     HTTPClient: yourHTTPClient,
     Debug: true,
-    ServerURL: baseURL,
+    BaseURL: "http://localhost:8001/rest",
 }
 
 client := kafkainstance.NewAPIClient(&cfg)

diff --git a/kafkainstance/apiv1internal/api_client.go b/kafkainstance/apiv1internal/api_client.go
@@ -21,9 +21,12 @@ func NewAPIClient(cfg *Config) *apiv1.APIClient {
 	if cfg.HTTPClient != nil {
 		apiCfg.HTTPClient = cfg.HTTPClient
 	}
-	if cfg.ServerURL != nil {
-		apiCfg.Host = cfg.ServerURL.Host
-		apiCfg.Scheme = cfg.ServerURL.Scheme
+	if cfg.BaseURL != "" {
+		apiCfg.Servers = []apiv1.ServerConfiguration{
+			{
+				URL: cfg.BaseURL,
+			},
+		}
 	}
 
 	apiCfg.Debug = cfg.Debug

diff --git a/kafkamgmt/apiv1/README.md b/kafkamgmt/apiv1/README.md
@@ -39,11 +39,10 @@ kafkas, resp, err := client.DefaultApi.GetKafkas(context.Background()).Execute()
 You can override the default configuration options:
 
 ```go
-baseURL, _ := url.Parse("http://localhost:8001")
 cfg := kafkamgmt.Config{
     HTTPClient: yourHTTPClient,
     Debug: true,
-    ServerURL: baseURL,
+    BaseURL: "http://localhost:8080",
 }
 
 client := kafkamgmt.NewAPIClient(&cfg)

diff --git a/kafkamgmt/apiv1/api_client.go b/kafkamgmt/apiv1/api_client.go
@@ -21,14 +21,17 @@ func NewAPIClient(cfg *Config) *apiv1.APIClient {
 	if cfg.HTTPClient != nil {
 		apiCfg.HTTPClient = cfg.HTTPClient
 	}
-	if cfg.ServerURL != nil {
-		apiCfg.Host = cfg.ServerURL.Host
-		apiCfg.Scheme = cfg.ServerURL.Scheme
+	if cfg.BaseURL != "" {
+		apiCfg.Servers = []apiv1.ServerConfiguration{
+			{
+				URL: cfg.BaseURL,
+			},
+		}
 	}
 
 	apiCfg.Debug = cfg.Debug
 
 	client := apiv1.NewAPIClient(apiCfg)
 
 	return client
-}
+}
diff --git a/serviceregistrymgmt/apiv1/README.md b/serviceregistrymgmt/apiv1/README.md
@@ -39,11 +39,10 @@ registries, resp, err := client.DefaultApi.GetRegistries(context.Background()).E
 You can override the default configuration options:
 
 ```go
-baseURL, _ := url.Parse("http://localhost:8001")
 cfg := serviceregistrymgmt.Config{
     HTTPClient: yourHTTPClient,
     Debug: true,
-    ServerURL: baseURL,
+    BaseURL: "http://localhost:8080",
 }
 
 client := serviceregistrymgmt.NewAPIClient(&cfg)

diff --git a/serviceregistrymgmt/apiv1/client.go b/serviceregistrymgmt/apiv1/client.go
@@ -21,14 +21,17 @@ func NewAPIClient(cfg *Config) *apiClient.APIClient {
 	if cfg.HTTPClient != nil {
 		apiCfg.HTTPClient = cfg.HTTPClient
 	}
-	if cfg.ServerURL != nil {
-		apiCfg.Host = cfg.ServerURL.Host
-		apiCfg.Scheme = cfg.ServerURL.Scheme
+	if cfg.BaseURL != "" {
+		apiCfg.Servers = []apiClient.ServerConfiguration{
+			{
+				URL: cfg.BaseURL,
+			},
+		}
 	}
 
 	apiCfg.Debug = cfg.Debug
 
 	client := apiClient.NewAPIClient(apiCfg)
 
 	return client
-}
+}