Fix misc in client

Signed-off-by: Pierre-Emmanuel Jacquier <15922119+pierre-emmanuelJ@users.noreply.github.com>

v3/generator/client/client.go

@@ -32,7 +32,6 @@ func Generate(doc libopenapi.Document, path, packageName string) error {
 		"context"
 		"runtime"
 		"time"
-		"errors"
 
 		"github.com/exoscale/egoscale/v3/credentials"
 		"github.com/exoscale/egoscale/version"

v3/generator/client/client.tmpl

@@ -16,7 +16,6 @@ type Client struct {
 	apiSecret       string
 	serverURL       string
 	httpClient      *http.Client
-	timeout         time.Duration
 	pollingInterval time.Duration
 	trace           bool
 
@@ -40,18 +39,6 @@ const pollingInterval = 3 * time.Second
 // ClientOpt represents a function setting Exoscale API client option.
 type ClientOpt func(*Client) error
 
-// ClientOptWithTimeout returns a ClientOpt overriding the default client timeout.
-func ClientOptWithTimeout(v time.Duration) ClientOpt {
-	return func(c *Client) error {
-		if v <= 0 {
-			return errors.New("timeout value must be greater than 0")
-		}
-		c.timeout = v
-
-		return nil
-	}
-}
-
 // ClientOptWithTrace returns a ClientOpt enabling HTTP request/response tracing.
 func ClientOptWithTrace() ClientOpt {
 	return func(c *Client) error {
@@ -122,6 +109,7 @@ func (c *Client) WithURL(url URL) *Client {
 		httpClient:      c.httpClient,
 		requestInterceptors:  c.requestInterceptors,
 		pollingInterval: c.pollingInterval,
+		trace:           c.trace,
 	}
 }
 
@@ -147,6 +135,7 @@ func (c *Client) WithHttpClient(client *http.Client) *Client {
 		httpClient:      client,
 		requestInterceptors:  c.requestInterceptors,
 		pollingInterval: c.pollingInterval,
+		trace:           c.trace,
 	}
 }
 
@@ -159,6 +148,7 @@ func (c *Client) WithRequestInterceptor(f ...RequestInterceptorFn) *Client {
 		httpClient:      c.httpClient,
 		requestInterceptors:  append(c.requestInterceptors, f...),
 		pollingInterval: c.pollingInterval,
+		trace:           c.trace,
 	}
 }